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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.618 by root, Mon Aug 10 18:48:41 2015 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 ();
57use IO::AIO (); 62use IO::AIO ();
58use Time::HiRes;
59use Compress::LZF; 63use Compress::LZF;
60use Digest::MD5 (); 64use Digest::MD5 ();
61 65
62AnyEvent::detect; 66AnyEvent::detect;
63 67
64# configure various modules to our taste 68# configure various modules to our taste
65# 69#
66$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 78
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 81
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83
84our @ORIG_INC;
73 85
74our %COMMAND = (); 86our %COMMAND = ();
75our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
76 88
77our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
79our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
82 96
83our $RELOAD; # number of reloads so far 97our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
85 101
86our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
87our $DATADIR = datadir; 104our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
91our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 117
100our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
101 125
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 128our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 129our $USE_FSYNC = 1; # use fsync to write maps - default on
106 130
107our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 134our $DB_ENV;
111 135
136our @EXTRA_MODULES = qw(pod match mapscript incloader);
137
112our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
113 140
114our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
116our $NOW; 144our $NOW;
117 145
118our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
119our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
120our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
124 152
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 153our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 154our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 155our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 156our $TICK_START; # for load detecting purposes
157
158our @POST_INIT;
159
160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
129 165
130binmode STDOUT; 166binmode STDOUT;
131binmode STDERR; 167binmode STDERR;
132 168
133# read virtual server time, if available 169# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 171 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 172 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 173 $RUNTIME = <$fh> + 0.;
138} 174}
139 175
176eval "sub TICK() { $TICK } 1" or die;
177
140mkdir $_ 178mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 179 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 180
143our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
144 182
145sub cf::map::normalise; 183sub cf::map::normalise;
146 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
147############################################################################# 189#############################################################################
148 190
191%REFLECT = ();
192for (@REFLECT) {
193 my $reflect = JSON::XS::decode_json $_;
194 $REFLECT{$reflect->{class}} = $reflect;
195}
196
197# this is decidedly evil
198$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
199
200#############################################################################
201
149=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
150 203
151=over 4 204=over 4
152 205
153=item $cf::UPTIME 206=item $cf::UPTIME
154 207
155The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
156 224
157=item $cf::RUNTIME 225=item $cf::RUNTIME
158 226
159The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
160every server tick. 228every server tick.
161 229
162=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
163$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
164$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
165 233
166Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
167directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
168unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
169database environment. 237database environment.
170 238
171=item $cf::NOW
172
173The time of the last (current) server tick.
174
175=item $cf::TICK
176
177The interval between server ticks, in seconds.
178
179=item $cf::LOADAVG 239=item $cf::LOADAVG
180 240
181The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
182(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
183objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
191Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
192from wherever your confdir points to. 252from wherever your confdir points to.
193 253
194=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
195 255
196These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
197returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
198per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
199 277
200=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
201 279
202This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
203C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 282that call.
205 283
284=item %cf::REFLECT
285
286Contains, for each (C++) class name, a hash reference with information
287about object members (methods, scalars, arrays and flags) and other
288metadata, which is useful for introspection.
289
206=back 290=back
207 291
208=cut 292=cut
209 293
210BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
211 *CORE::GLOBAL::warn = sub { 295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
299
300$Coro::State::WARNHOOK = sub {
212 my $msg = join "", @_; 301 my $msg = join "", @_;
213 302
214 $msg .= "\n" 303 $msg .= "\n"
215 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
216 305
217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218 307
219 LOG llevError, $msg; 308 LOG llevWarn, $msg;
220 }; 309};
221}
222 310
223$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
225 313
226 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 318 return;#d#
229 }#d# 319 }#d#
230 320
231 # kill coroutine otherwise 321 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 322 Coro::terminate
234}; 323};
235
236$SIG{__DIE__} = sub { }; #d#?
237 324
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 342)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 344}
258 345
259$EV::DIED = sub { 346$EV::DIED = sub {
260 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
261}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
262 354
263############################################################################# 355#############################################################################
264 356
265=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
266 358
287 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
288 $d 380 $d
289 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
290} 382}
291 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
292=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
293 437
294Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
295 439
296=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 447
304sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
306 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
482=item cf::post_init { BLOCK }
483
484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
485but I<before> the server starts ticking again.
486
487The codeblock will have a single boolean argument to indicate whether this
488is a reload or not.
489
490=cut
491
492sub post_init(&) {
493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
511}
512
307=item cf::lock_wait $string 513=item cf::lock_wait $string
308 514
309Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
310 516
311=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
312 518
313Wait until the given lock is available and then acquires it and returns 519Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 520a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 521for example when the coroutine gets canceled), the lock is automatically
316returned. 522returned.
317 523
318Locks are *not* recursive, locking from the same coro twice results in a 524Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 525deadlocked coro.
325 531
326Return true if the lock is currently active, i.e. somebody has locked it. 532Return true if the lock is currently active, i.e. somebody has locked it.
327 533
328=cut 534=cut
329 535
330our %LOCK; 536our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 537
333sub lock_wait($) { 538sub lock_wait($) {
334 my ($key) = @_; 539 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 540}
347 541
348sub lock_acquire($) { 542sub lock_acquire($) {
349 my ($key) = @_; 543 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 544}
363 545
364sub lock_active($) { 546sub lock_active($) {
365 my ($key) = @_; 547 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 548}
369 549
370sub freeze_mainloop { 550sub freeze_mainloop {
371 tick_inhibit_inc; 551 tick_inhibit_inc;
372 552
373 Coro::guard \&tick_inhibit_dec; 553 &Guard::guard (\&tick_inhibit_dec);
374} 554}
375 555
376=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
377 557
378Like EV::periodic, but randomly selects a starting point so that the actions 558Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer. 559get spread over time.
380 560
381=cut 561=cut
382 562
383sub periodic($$) { 563sub periodic($$) {
384 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
388 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
389} 569}
390 570
391=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
392 572
393Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
394This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
395of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
396 580
397The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
398used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
399 583
400Useful for short background jobs. 584Useful for short background jobs.
401 585
402=cut 586=cut
403 587
404our @SLOT_QUEUE; 588our @SLOT_QUEUE;
405our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
406 591
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
410 595
411 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
412 598
413 while () { 599 while () {
414 next_job: 600 next_job:
601
602 Coro::cede;
603
415 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 605
417 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
608 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 610 $job->[2]->send;
421 Coro::cede;
422 goto next_job; 611 goto next_job;
423 } 612 } else {
613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 614 }
425 } 615 }
426 616
427 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
428 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
429 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait;
431 } else { 619 } else {
620 $busy = 0;
432 Coro::schedule; 621 Coro::schedule;
433 } 622 }
434 } 623 }
435}; 624};
436 625
437sub get_slot($;$$) { 626sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
439 628
440 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
441 630
442 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
443 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
444 634
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
473=cut 663=cut
474 664
475sub sync_job(&) { 665sub sync_job(&) {
476 my ($job) = @_; 666 my ($job) = @_;
477 667
478 if ($Coro::current == $Coro::main) { 668 if (in_main) {
479 my $time = EV::time; 669 my $time = AE::time;
480 670
481 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
483 673
484 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
485 675
486 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
487 677
488 my $busy = 1; 678 my $busy = 1;
489 my @res; 679 my @res;
490 680
491 (async { 681 (async {
492 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
493 @res = eval { $job->() }; 683 @res = eval { $job->() };
494 warn $@ if $@; 684 error $@ if $@;
495 undef $busy; 685 undef $busy;
496 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
497 687
498 while ($busy) { 688 while ($busy) {
499 if (Coro::nready) { 689 if (Coro::nready) {
500 Coro::cede_notself; 690 Coro::cede_notself;
501 } else { 691 } else {
502 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
503 } 693 }
504 } 694 }
505 695
506 my $time = EV::time - $time; 696 my $time = AE::time - $time;
507 697
508 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
509 699
510 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
511 } else { 701 } else {
533 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
534 724
535 $coro 725 $coro
536} 726}
537 727
538=item fork_call { }, $args 728=item fork_call { }, @args
539 729
540Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
541process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
542Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
543never block itself or use any form of event handling. 733never block itself or use any form of event handling.
544 734
545=cut 735=cut
546 736
737sub post_fork {
738 reset_signals;
739}
740
547sub fork_call(&@) { 741sub fork_call(&@) {
548 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
549 743
550 # we seemingly have to make a local copy of the whole thing,
551 # otherwise perl prematurely frees the stuff :/
552 # TODO: investigate and fix (likely this will be rather laborious)
553
554 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
555 reset_signals; 745 cf::post_fork;
556 &$cb 746 &$cb
557 }, @args; 747 } @args;
558 748
559 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
750}
751
752sub objinfo {
753 (
754 "counter value" => cf::object::object_count,
755 "objects created" => cf::object::create_count,
756 "objects destroyed" => cf::object::destroy_count,
757 "freelist size" => cf::object::free_count,
758 "allocated objects" => cf::object::objects_size,
759 "active objects" => cf::object::actives_size,
760 )
560} 761}
561 762
562=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
563 764
564=cut 765=cut
601within each server. 802within each server.
602 803
603=cut 804=cut
604 805
605sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
606 my ($name) = @_; 810 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
608 812
609 eval { 813 eval {
610 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
620} 824}
621 825
622our $DB; 826our $DB;
623 827
624sub db_init { 828sub db_init {
625 cf::sync_job {
626 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
627 };
628} 830}
629 831
630sub db_get($$) { 832sub db_get($$) {
631 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
632 834
633 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
634 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
635 839
636 $! ? () 840 $! ? ()
637 : $data 841 : $data
638 }
639} 842}
640 843
641sub db_put($$$) { 844sub db_put($$$) {
642 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
643 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
671 874
672 my @data; 875 my @data;
673 my $md5; 876 my $md5;
674 877
675 for (0 .. $#$src) { 878 for (0 .. $#$src) {
676 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
677 or Carp::croak "$src->[$_]: $!";
678 } 880 }
679 881
680 # if processing is expensive, check 882 # if processing is expensive, check
681 # checksum first 883 # checksum first
682 if (1) { 884 if (1) {
695 897
696 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
697 } 899 }
698 } 900 }
699 901
700 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
701 my $data = $process->(\@data); 903 my $data = $process->(\@data);
702 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
703 905
704 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705 907
706 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
707 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
708 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
709 911
719 921
720=cut 922=cut
721 923
722sub datalog($@) { 924sub datalog($@) {
723 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
724 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725} 927}
726 928
727=back 929=back
728 930
729=cut 931=cut
924 1126
925 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
926 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927 1129
928 } elsif (ref $type) { 1130 } elsif (ref $type) {
929 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
930 1132
931 } else { 1133 } else {
932 shift @arg; 1134 shift @arg;
933 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
934 } 1136 }
935 } 1137 }
936} 1138}
937 1139
938sub _object_attach { 1140sub _object_attach {
948 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
949 } 1151 }
950 1152
951 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
952 } else { 1154 } else {
953 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
954 } 1156 }
955 1157
956 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
957} 1159}
958 1160
1017 1219
1018 for (@$callbacks) { 1220 for (@$callbacks) {
1019 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1020 1222
1021 if ($@) { 1223 if ($@) {
1022 warn "$@";
1023 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024 override; 1225 override;
1025 } 1226 }
1026 1227
1027 return 1 if $override; 1228 return 1 if $override;
1028 } 1229 }
1107 for (@$attach) { 1308 for (@$attach) {
1108 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1109 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1110 } 1311 }
1111 } else { 1312 } else {
1112 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1113 } 1314 }
1114 } 1315 }
1115} 1316}
1116 1317
1117cf::attachable->attach ( 1318cf::attachable->attach (
1144 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1145 1346
1146 sync_job { 1347 sync_job {
1147 if (length $$rdata) { 1348 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1151 1353
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1357 if ($cf::USE_FSYNC) {
1358 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;
1359 aio_fsync $fh;
1360 }
1156 aio_close $fh; 1361 aio_close $fh;
1157 1362
1158 if (@$objs) { 1363 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1364 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1365 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1368 if ($cf::USE_FSYNC) {
1369 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;
1370 aio_fsync $fh;
1371 }
1164 aio_close $fh; 1372 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1374 }
1167 } else { 1375 } else {
1168 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1169 } 1377 }
1170 1378
1171 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1380
1381 $filename =~ s%/[^/]+$%%;
1382 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1383 } else {
1173 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1174 } 1385 }
1175 } else { 1386 } else {
1176 aio_unlink $filename; 1387 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1178 } 1389 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1414 $av = $st->{objs};
1204 } 1415 }
1205 1416
1206 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1209 1421
1210 ($data, $av) 1422 ($data, $av)
1211} 1423}
1212 1424
1213=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1217=cut 1429=cut
1218 1430
1219############################################################################# 1431#############################################################################
1220# command handling &c 1432# command handling &c
1221 1433
1222=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1223 1435
1224Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1225$name. 1437$name.
1226 1438
1227=cut 1439=cut
1233 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1234 1446
1235 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1236} 1448}
1237 1449
1238=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1239 1451
1240Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1241extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1242received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1243the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1244has logged in successfully. 1456has logged in successfully.
1245 1457
1246If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1247called.
1248 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1249=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1250 1466
1251Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1252exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1253are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1254is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1255log-in. 1471log-in.
1256 1472
1257If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1258called.
1259 1474
1260=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1261 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1262sub register_extcmd { 1482sub register_extcmd($$) {
1263 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1264 1484
1265 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1266} 1486}
1267 1487
1268sub register_exticmd { 1488sub register_async_extcmd($$) {
1269 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1270 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1271 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1272} 1498}
1273 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1274cf::player->attach ( 1508cf::player->attach (
1275 on_command => sub { 1509 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1277 1511
1278 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1279 or return; 1513 or return;
1280 1514
1288 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1289 1523
1290 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1291 1525
1292 if (ref $msg) { 1526 if (ref $msg) {
1293 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1294 "ARRAY" eq ref $msg
1295 ? @$msg
1296 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1297 1528
1298 my @reply;
1299
1300 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1301 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1302 } 1547 }
1303 1548
1304 $pl->ext_reply ($reply, @reply)
1305 if $reply;
1306
1307 } else { 1549 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1551 }
1310 1552
1311 cf::override; 1553 cf::override;
1312 }, 1554 },
1313); 1555);
1314 1556
1557# "readahead" all extensions
1558sub cache_extensions {
1559 my $grp = IO::AIO::aio_group;
1560
1561 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1562 for (grep /\.ext$/, @{$_[0]}) {
1563 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1564 }
1565 };
1566
1567 $grp
1568}
1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1315sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1316 cf::sync_job { 1586 cf::sync_job {
1317 my %todo; 1587 my %todo;
1318 1588
1319 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1590 next unless -r $path;
1338 1608
1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341 1611
1342 $ext{source} = 1612 $ext{source} =
1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1344 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1345 . $source 1615 . $source
1346 . "\n};\n1"; 1616 . "\n};\n1";
1347 1617
1348 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1349 } 1619 }
1350 1620
1621 my $pass = 0;
1351 my %done; 1622 my %done;
1352 while (%todo) { 1623 while (%todo) {
1353 my $progress; 1624 my $progress;
1354 1625
1626 ++$pass;
1627
1628 ext:
1355 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1631 next ext
1358 unless exists $done{$_}; 1632 unless exists $done{$_};
1359 } 1633 }
1360 1634
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1636
1363 unless (eval $v->{source}) { 1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1646 my $active = eval $source;
1647
1648 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1650
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1652 if exists $v->{meta}{mandatory};
1371 1653
1372 warn $msg; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1655 delete $todo{$k};
1656 } else {
1657 $done{$k} = delete $todo{$k};
1658 push @EXTS, $v->{pkg};
1659 $progress = 1;
1660
1661 info "$v->{base}: extension inactive.\n"
1662 unless $active;
1373 } 1663 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1664 }
1379 1665
1380 skip: 1666 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1668
1669 while (my ($k, $v) = each %todo) {
1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1671 if exists $v->{meta}{mandatory};
1672 }
1673
1674 last;
1675 }
1383 } 1676 }
1384 }; 1677 };
1385} 1678}
1386 1679
1387############################################################################# 1680#############################################################################
1441 1734
1442sub exists($) { 1735sub exists($) {
1443 my ($login) = @_; 1736 my ($login) = @_;
1444 1737
1445 $cf::PLAYER{$login} 1738 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1739 or !aio_stat path $login
1447} 1740}
1448 1741
1449sub find($) { 1742sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1743 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1744 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1472 } 1765 }
1473 } 1766 }
1474} 1767}
1475 1768
1769cf::player->attach (
1770 on_load => sub {
1771 my ($pl, $path) = @_;
1772
1773 # restore slots saved in save, below
1774 my $slots = delete $pl->{_slots};
1775
1776 $pl->ob->current_weapon ($slots->[0]);
1777 $pl->combat_ob ($slots->[1]);
1778 $pl->ranged_ob ($slots->[2]);
1779 },
1780);
1781
1476sub save($) { 1782sub save($) {
1477 my ($pl) = @_; 1783 my ($pl) = @_;
1478 1784
1479 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1480 1786
1485 1791
1486 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1488 1794
1489 cf::get_slot 0.01; 1795 cf::get_slot 0.01;
1796
1797 # save slots, to be restored later
1798 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1799
1491 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1801 cf::cede_to_tick;
1493} 1802}
1494 1803
1528 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1529 1838
1530 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1841
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1534 $pl->deactivate; 1843 $pl->deactivate;
1844
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1538 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1539 1850
1540 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1542 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1596 \@logins 1907 \@logins
1597} 1908}
1598 1909
1599=item $player->maps 1910=item $player->maps
1600 1911
1912=item cf::player::maps $login
1913
1601Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1602player. May block. 1915player. May block.
1603 1916
1604=cut 1917=cut
1605 1918
1626 1939
1627=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1941
1629Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1630 1943
1631=item $player->ext_reply ($msgid, @msg)
1632
1633Sends an ext reply to the player.
1634
1635=cut
1636
1637sub ext_reply($$@) {
1638 my ($self, $id, @msg) = @_;
1639
1640 $self->ns->ext_reply ($id, @msg)
1641}
1642
1643=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1644 1945
1645Sends an ext event to the client. 1946Sends an ext event to the client.
1646 1947
1647=cut 1948=cut
1666 1967
1667=cut 1968=cut
1668 1969
1669sub find_by_path($) { 1970sub find_by_path($) {
1670 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1671 1974
1672 my ($match, $specificity); 1975 my ($match, $specificity);
1673 1976
1674 for my $region (list) { 1977 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1704sub generate_random_map { 2007sub generate_random_map {
1705 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1706 2009
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 2011
1709 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1718 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1719 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1720 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1721 (cf::region::find $rmp->{region}), $rmp->{custom}
1722 )
1723} 2013}
1724 2014
1725=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1726 2016
1727Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1732 2022
1733sub register { 2023sub register {
1734 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 2025 my $pkg = caller;
1736 2026
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 2028
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 2030}
1742 2031
1743# also paths starting with '/' 2032# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 2034
1746sub thawer_merge { 2035sub thawer_merge {
1747 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1748 2037
1749 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1754} 2043}
1755 2044
1756sub normalise { 2045sub normalise {
1757 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1758 2047
1759 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1760 2049
1761 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1762 2051
1763 # map plan: 2052 # map plan:
1764 # 2053 #
1779 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1780 $path = "$base/$path"; 2069 $path = "$base/$path";
1781 } 2070 }
1782 2071
1783 for ($path) { 2072 for ($path) {
1784 redo if s{//}{/};
1785 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1786 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1787 } 2075 }
1788 2076
1789 $path 2077 $path
1803 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1804 return $self; 2092 return $self;
1805 } 2093 }
1806 } 2094 }
1807 2095
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 2097 ()
1810} 2098}
1811 2099
2100# may re-bless or do other evil things
1812sub init { 2101sub init {
1813 my ($self) = @_; 2102 my ($self) = @_;
1814 2103
1815 $self 2104 $self
1816} 2105}
1847 2136
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1850} 2139}
1851 2140
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 2141sub decay_objects {
1862 my ($self) = @_; 2142 my ($self) = @_;
1863 2143
1864 return if $self->{deny_reset}; 2144 return if $self->{deny_reset};
1865 2145
1890 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1891 2171
1892 1 2172 1
1893} 2173}
1894 2174
2175# used to laod the header of an original map
1895sub load_header_orig { 2176sub load_header_orig {
1896 my ($self) = @_; 2177 my ($self) = @_;
1897 2178
1898 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1899} 2180}
1900 2181
2182# used to laod the header of an instantiated map
1901sub load_header_temp { 2183sub load_header_temp {
1902 my ($self) = @_; 2184 my ($self) = @_;
1903 2185
1904 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1905} 2187}
1906 2188
2189# called after loading the header from an instantiated map
1907sub prepare_temp { 2190sub prepare_temp {
1908 my ($self) = @_; 2191 my ($self) = @_;
1909 2192
1910 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1911 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1912 # safety 2195 # safety
1913 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1914 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1915} 2198}
1916 2199
2200# called after loading the header from an original map
1917sub prepare_orig { 2201sub prepare_orig {
1918 my ($self) = @_; 2202 my ($self) = @_;
1919 2203
1920 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1921 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1945 2229
1946sub find; 2230sub find;
1947sub find { 2231sub find {
1948 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1949 2233
2234 cf::cede_to_tick;
2235
1950 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1951 2237
1952 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2240
1955 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
1960 or return; 2243 or return;
1961 2244
1962 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
1963 2246
1975 2258
1976 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1977 } 2260 }
1978} 2261}
1979 2262
1980sub pre_load { } 2263sub pre_load { }
1981sub post_load { } 2264#sub post_load { } # XS
1982 2265
1983sub load { 2266sub load {
1984 my ($self) = @_; 2267 my ($self) = @_;
1985 2268
1986 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
1989 2272
1990 { 2273 {
1991 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
1992 2275
1993 return unless $self->valid; 2276 return unless $self->valid;
1994 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
1995
1996 $self->in_memory (cf::MAP_LOADING);
1997 2278
1998 $self->alloc; 2279 $self->alloc;
1999 2280
2000 $self->pre_load; 2281 $self->pre_load;
2001 cf::cede_to_tick; 2282 cf::cede_to_tick;
2002 2283
2284 if (exists $self->{load_path}) {
2003 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2004 $f->skip_block; 2286 $f->skip_block;
2005 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2006 or return; 2288 or return;
2007 2289
2008 $self->post_load_original 2290 $self->post_load_original
2009 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2010 2292
2011 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2012 utf8::encode $uniq; 2294 utf8::encode $uniq;
2013 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2014 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2015 $self->clear_unique_items; 2297 $self->clear_unique_items;
2016 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2017 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2018 } 2301 }
2019 } 2302 }
2020 }
2021 2303
2022 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2023 2311
2024 cf::cede_to_tick; 2312 cf::cede_to_tick;
2025 # now do the right thing for maps 2313 # now do the right thing for maps
2026 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2027 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2031 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2320 $self->decay_objects;
2033 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2034 $self->update_buttons; 2322 $self->update_buttons;
2035 cf::cede_to_tick; 2323 cf::cede_to_tick;
2036 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2037 cf::cede_to_tick;
2038 $self->activate;
2039 } 2325 }
2040 2326
2041 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2043
2044 $self->in_memory (cf::MAP_ACTIVE);
2045 } 2329 }
2046 2330
2047 $self->post_load; 2331 $self->post_load;
2048}
2049 2332
2333 1
2334}
2335
2336# customize the map for a given player, i.e.
2337# return the _real_ map. used by e.g. per-player
2338# maps to change the path to ~playername/mappath
2050sub customise_for { 2339sub customise_for {
2051 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2052 2341
2053 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2343 if $self->per_player;
2057# if $self->per_party; 2346# if $self->per_party;
2058 2347
2059 $self 2348 $self
2060} 2349}
2061 2350
2062# find and load all maps in the 3x3 area around a map
2063sub load_neighbours {
2064 my ($map) = @_;
2065
2066 my @neigh; # diagonal neighbours
2067
2068 for (0 .. 3) {
2069 my $neigh = $map->tile_path ($_)
2070 or next;
2071 $neigh = find $neigh, $map
2072 or next;
2073 $neigh->load;
2074
2075 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 }
2079
2080 for (grep defined $_->[0], @neigh) {
2081 my ($path, $origin) = @$_;
2082 my $neigh = find $path, $origin
2083 or next;
2084 $neigh->load;
2085 }
2086}
2087
2088sub find_sync { 2351sub find_sync {
2089 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2090 2353
2091 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2092} 2359}
2093 2360
2094sub do_load_sync { 2361sub do_load_sync {
2095 my ($map) = @_; 2362 my ($map) = @_;
2096 2363
2364 # it's a bug to call this from the main context
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2099 2367
2100 cf::sync_job { $map->load }; 2368 $map->load;
2101} 2369}
2102 2370
2103our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2105 2373
2106sub find_async { 2374sub find_async {
2107 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2108 2376
2109 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2110 2378
2111 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2113 } 2381 }
2114 2382
2115 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2116 2384
2117 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2131 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2132 2400
2133 () 2401 ()
2134} 2402}
2135 2403
2404# common code, used by both ->save and ->swapout
2136sub save { 2405sub _save {
2137 my ($self) = @_; 2406 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2407
2141 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2142 2409
2143 return unless $self->dirty; 2410 return unless $self->dirty;
2144 2411
2164 } else { 2431 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2432 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2433 }
2167} 2434}
2168 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2169sub swap_out { 2444sub swap_out {
2170 my ($self) = @_; 2445 my ($self) = @_;
2171 2446
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2177 return if $self->players; 2451 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2452
2453 # first deactivate the map and "unlink" it from the core
2454 $self->deactivate;
2455 $_->clear_links_to ($self) for values %cf::MAP;
2456 $self->state (cf::MAP_SWAPPED);
2457
2458 # then atomically save
2459 $self->_save;
2460
2461 # then free the map
2462 $self->clear;
2463}
2464
2465sub reset_at {
2466 my ($self) = @_;
2467
2468 # TODO: safety, remove and allow resettable per-player maps
2179 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2180 2470
2471 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2472 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2473
2474 $time + $to
2475}
2476
2477sub should_reset {
2478 my ($self) = @_;
2479
2480 $self->reset_at <= $cf::RUNTIME
2481}
2482
2483sub reset {
2484 my ($self) = @_;
2485
2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2487
2488 return if $self->players;
2489
2490 cf::trace "resetting map ", $self->path, "\n";
2491
2181 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2493
2494 # need to save uniques path
2495 unless ($self->{deny_save}) {
2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2497
2498 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2499 if $uniq;
2500 }
2501
2502 delete $cf::MAP{$self->path};
2182 2503
2183 $self->deactivate; 2504 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2506 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2507
2231 $self->unlink_save; 2508 $self->unlink_save;
2232 $self->destroy; 2509 $self->destroy;
2233} 2510}
2234 2511
2242 2519
2243 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2244 2521
2245 $self->unlink_save; 2522 $self->unlink_save;
2246 2523
2247 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2529
2309 : normalise $_ 2586 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2588 ]
2312} 2589}
2313 2590
2591=item cf::map::static_maps
2592
2593Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2594file in the shared directory excluding F</styles> and F</editor>). May
2595block.
2596
2597=cut
2598
2599sub static_maps() {
2600 my @dirs = "";
2601 my @maps;
2602
2603 while (@dirs) {
2604 my $dir = shift @dirs;
2605
2606 next if $dir eq "/styles" || $dir eq "/editor";
2607
2608 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2609 or return;
2610
2611 for (@$files) {
2612 s/\.map$// or next;
2613 utf8::decode $_;
2614 push @maps, "$dir/$_";
2615 }
2616
2617 push @dirs, map "$dir/$_", @$dirs;
2618 }
2619
2620 \@maps
2621}
2622
2314=back 2623=back
2315 2624
2316=head3 cf::object 2625=head3 cf::object
2317 2626
2318=cut 2627=cut
2341 2650
2342Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2343 2652
2344=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2345 2654
2346returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2347even if the object actually exists. May block. 2656even if the object actually exists. May block.
2348 2657
2349=cut 2658=cut
2350 2659
2351sub deref { 2660sub deref {
2383 2692
2384our $SAY_CHANNEL = { 2693our $SAY_CHANNEL = {
2385 id => "say", 2694 id => "say",
2386 title => "Map", 2695 title => "Map",
2387 reply => "say ", 2696 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2697 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2698};
2390 2699
2391our $CHAT_CHANNEL = { 2700our $CHAT_CHANNEL = {
2392 id => "chat", 2701 id => "chat",
2393 title => "Chat", 2702 title => "Chat",
2433=item $player_object->may ("access") 2742=item $player_object->may ("access")
2434 2743
2435Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2436(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2437 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2438=cut 2772=cut
2439 2773
2440sub cf::object::player::may { 2774sub cf::object::player::may {
2441 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2442 2776
2443 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2444 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2445 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2446 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2447} 2781}
2448 2782
2449=item $player_object->enter_link 2783=item $player_object->enter_link
2450 2784
2451Freezes the player and moves him/her to a special map (C<{link}>). 2785Freezes the player and moves him/her to a special map (C<{link}>).
2452 2786
2453The player should be reasonably safe there for short amounts of time (e.g. 2787The player should be reasonably safe there for short amounts of time (e.g.
2454for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link 2789though, as the player cannot control the character while it is on the link
2456map. 2790map.
2457 2791
2458Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2459 2799
2460=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2461 2801
2462Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2463map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
2481sub cf::object::player::enter_link { 2821sub cf::object::player::enter_link {
2482 my ($self) = @_; 2822 my ($self) = @_;
2483 2823
2484 $self->deactivate_recursive; 2824 $self->deactivate_recursive;
2485 2825
2826 ++$self->{_link_recursion};
2827
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2828 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2829
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2830 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2831 if $self->map && $self->map->{path} ne "{link}";
2490 2832
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2833 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2834}
2493 2835
2494sub cf::object::player::leave_link { 2836sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2837 my ($self, $map, $x, $y) = @_;
2496 2838
2513 ($x, $y) = (-1, -1) 2855 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2856 unless (defined $x) && (defined $y);
2515 2857
2516 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2519 2861
2520 $map->load; 2862 $map->load;
2521 $map->load_neighbours;
2522 2863
2523 return unless $self->contr->active; 2864 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2865
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2867 if ($self->enter_map ($map, $x, $y)) {
2529} 2868 # entering was successful
2869 delete $self->{_link_recursion};
2870 # only activate afterwards, to support waiting in hooks
2871 $self->activate_recursive;
2872 }
2530 2873
2874}
2875
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2876=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2877
2533Moves the player to the given map-path and coordinates by first freezing 2878Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2879her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2880that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2881the new (success) or old (failed) map position. In either case, $done will
2543 2888
2544our $GOTOGEN; 2889our $GOTOGEN;
2545 2890
2546sub cf::object::player::goto { 2891sub cf::object::player::goto {
2547 my ($self, $path, $x, $y, $check, $done) = @_; 2892 my ($self, $path, $x, $y, $check, $done) = @_;
2893
2894 if ($self->{_link_recursion} >= $MAX_LINKS) {
2895 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2896 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2897 ($path, $x, $y) = @$EMERGENCY_POSITION;
2898 }
2548 2899
2549 # do generation counting so two concurrent goto's will be executed in-order 2900 # do generation counting so two concurrent goto's will be executed in-order
2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2901 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551 2902
2552 $self->enter_link; 2903 $self->enter_link;
2572 ($path, $x, $y) = (undef, undef, undef); 2923 ($path, $x, $y) = (undef, undef, undef);
2573 } 2924 }
2574 } 2925 }
2575 2926
2576 my $map = eval { 2927 my $map = eval {
2577 my $map = defined $path ? cf::map::find $path : undef; 2928 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2578 2929
2579 if ($map) { 2930 if ($map) {
2580 $map = $map->customise_for ($self); 2931 $map = $map->customise_for ($self);
2581 $map = $check->($map) if $check && $map; 2932 $map = $check->($map, $x, $y, $self) if $check && $map;
2582 } else { 2933 } else {
2583 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2934 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2584 } 2935 }
2585 2936
2586 $map 2937 $map
2594 if ($gen == $self->{_goto_generation}) { 2945 if ($gen == $self->{_goto_generation}) {
2595 delete $self->{_goto_generation}; 2946 delete $self->{_goto_generation};
2596 $self->leave_link ($map, $x, $y); 2947 $self->leave_link ($map, $x, $y);
2597 } 2948 }
2598 2949
2599 $done->() if $done; 2950 $done->($self) if $done;
2600 })->prio (1); 2951 })->prio (1);
2601} 2952}
2602 2953
2603=item $player_object->enter_exit ($exit_object) 2954=item $player_object->enter_exit ($exit_object)
2604 2955
2672 $Coro::current->{desc} = "enter_exit"; 3023 $Coro::current->{desc} = "enter_exit";
2673 3024
2674 unless (eval { 3025 unless (eval {
2675 $self->deactivate_recursive; # just to be sure 3026 $self->deactivate_recursive; # just to be sure
2676 3027
2677 # random map handling
2678 {
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 prepare_random_map $exit
2682 if $exit->slaying eq "/!";
2683 }
2684
2685 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3028 my $map = cf::map::normalise $exit->slaying, $exit->map;
2686 my $x = $exit->stats->hp; 3029 my $x = $exit->stats->hp;
2687 my $y = $exit->stats->sp; 3030 my $y = $exit->stats->sp;
3031
3032 # special map handling
3033 my $slaying = $exit->slaying;
3034
3035 # special map handling
3036 if ($slaying eq "/!") {
3037 my $guard = cf::lock_acquire "exit_prepare:$exit";
3038
3039 prepare_random_map $exit
3040 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3041
3042 $map = $exit->slaying;
3043
3044 } elsif ($slaying eq '!up') {
3045 $map = $exit->map->tile_path (cf::TILE_UP);
3046 $x = $exit->x;
3047 $y = $exit->y;
3048
3049 } elsif ($slaying eq '!down') {
3050 $map = $exit->map->tile_path (cf::TILE_DOWN);
3051 $x = $exit->x;
3052 $y = $exit->y;
3053 }
2688 3054
2689 $self->goto ($map, $x, $y); 3055 $self->goto ($map, $x, $y);
2690 3056
2691 # if exit is damned, update players death & WoR home-position 3057 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y) 3058 $self->contr->savebed ($map, $x, $y)
2697 $self->message ("Something went wrong deep within the deliantra server. " 3063 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "I'll try to bring you back to the map you were before. " 3064 . "I'll try to bring you back to the map you were before. "
2699 . "Please report this to the dungeon master!", 3065 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 3066 cf::NDI_UNIQUE | cf::NDI_RED);
2701 3067
2702 warn "ERROR in enter_exit: $@"; 3068 error "ERROR in enter_exit: $@";
2703 $self->leave_link; 3069 $self->leave_link;
2704 } 3070 }
2705 })->prio (1); 3071 })->prio (1);
2706} 3072}
2707 3073
2708=head3 cf::client 3074=head3 cf::client
2709 3075
2710=over 4 3076=over 4
2711 3077
2712=item $client->send_drawinfo ($text, $flags) 3078=item $client->send_big_packet ($pkt)
2713 3079
2714Sends a drawinfo packet to the client. Circumvents output buffering so 3080Like C<send_packet>, but tries to compress large packets, and fragments
2715should not be used under normal circumstances. 3081them as required.
2716 3082
2717=cut 3083=cut
2718 3084
3085our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3086
2719sub cf::client::send_drawinfo { 3087sub cf::client::send_big_packet {
2720 my ($self, $text, $flags) = @_; 3088 my ($self, $pkt) = @_;
2721 3089
2722 utf8::encode $text; 3090 # try lzf for large packets
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3091 $pkt = "lzf " . Compress::LZF::compress $pkt
3092 if 1024 <= length $pkt and $self->{can_lzf};
3093
3094 # split very large packets
3095 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3096 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3097 $pkt = "frag";
3098 }
3099
3100 $self->send_packet ($pkt);
2724} 3101}
2725 3102
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 3104
2728Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
2729client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
2730the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
2731the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
2732 3109
2733=cut 3110=cut
2734 3111
2735# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 3113our %CHANNEL = (
3114 "c/motd" => {
3115 id => "infobox",
3116 title => "MOTD",
3117 reply => undef,
3118 tooltip => "The message of the day",
3119 },
2737 "c/identify" => { 3120 "c/identify" => {
2738 id => "infobox", 3121 id => "infobox",
2739 title => "Identify", 3122 title => "Identify",
2740 reply => undef, 3123 reply => undef,
2741 tooltip => "Items recently identified", 3124 tooltip => "Items recently identified",
2743 "c/examine" => { 3126 "c/examine" => {
2744 id => "infobox", 3127 id => "infobox",
2745 title => "Examine", 3128 title => "Examine",
2746 reply => undef, 3129 reply => undef,
2747 tooltip => "Signs and other items you examined", 3130 tooltip => "Signs and other items you examined",
3131 },
3132 "c/shopinfo" => {
3133 id => "infobox",
3134 title => "Shop Info",
3135 reply => undef,
3136 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 3137 },
2749 "c/book" => { 3138 "c/book" => {
2750 id => "infobox", 3139 id => "infobox",
2751 title => "Book", 3140 title => "Book",
2752 reply => undef, 3141 reply => undef,
2768 id => "infobox", 3157 id => "infobox",
2769 title => "Body Parts", 3158 title => "Body Parts",
2770 reply => undef, 3159 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 3160 tooltip => "Shows which body parts you posess and are available",
2772 }, 3161 },
3162 "c/statistics" => {
3163 id => "infobox",
3164 title => "Statistics",
3165 reply => undef,
3166 tooltip => "Shows your primary statistics",
3167 },
3168 "c/skills" => {
3169 id => "infobox",
3170 title => "Skills",
3171 reply => undef,
3172 tooltip => "Shows your experience per skill and item power",
3173 },
3174 "c/shopitems" => {
3175 id => "infobox",
3176 title => "Shop Items",
3177 reply => undef,
3178 tooltip => "Shows the items currently for sale in this shop",
3179 },
3180 "c/resistances" => {
3181 id => "infobox",
3182 title => "Resistances",
3183 reply => undef,
3184 tooltip => "Shows your resistances",
3185 },
3186 "c/pets" => {
3187 id => "infobox",
3188 title => "Pets",
3189 reply => undef,
3190 tooltip => "Shows information abotu your pets/a specific pet",
3191 },
3192 "c/perceiveself" => {
3193 id => "infobox",
3194 title => "Perceive Self",
3195 reply => undef,
3196 tooltip => "You gained detailed knowledge about yourself",
3197 },
2773 "c/uptime" => { 3198 "c/uptime" => {
2774 id => "infobox", 3199 id => "infobox",
2775 title => "Uptime", 3200 title => "Uptime",
2776 reply => undef, 3201 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 3202 tooltip => "How long the server has been running since last restart",
2786 id => "party", 3211 id => "party",
2787 title => "Party", 3212 title => "Party",
2788 reply => "gsay ", 3213 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 3214 tooltip => "Messages and chat related to your party",
2790 }, 3215 },
3216 "c/death" => {
3217 id => "death",
3218 title => "Death",
3219 reply => undef,
3220 tooltip => "Reason for and more info about your most recent death",
3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3228 "c/say" => $SAY_CHANNEL,
3229 "c/chat" => $CHAT_CHANNEL,
2791); 3230);
2792 3231
2793sub cf::client::send_msg { 3232sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3233 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3234
2800 3239
2801 # check predefined channels, for the benefit of C 3240 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 3241 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 3242 $channel = $CHANNEL{$channel};
2804 3243
2805 $self->ext_msg (channel_info => $channel) 3244 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3245 $channel = $channel->{id};
2809 3246
2810 } elsif (ref $channel) { 3247 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3248 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3249 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3250 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3251 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3252 }
2817 3253
2818 $channel = $channel->{id}; 3254 $channel = $channel->{id};
2819 } 3255 }
2820 3256
2821 return unless @extra || length $msg; 3257 return unless @extra || length $msg;
2822 3258
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3259 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3260 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3261 if $color & cf::NDI_DEF;
2827 3262
2828 my $pkt = "msg " 3263 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3264 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3265 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3266 );
2832 3267
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt); 3268 $self->send_big_packet ($pkt);
2844 } else {
2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2863 } else {
2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865 $self->send_packet ("drawinfo $color $msg")
2866 }
2867 }
2868 }
2869} 3269}
2870 3270
2871=item $client->ext_msg ($type, @msg) 3271=item $client->ext_msg ($type, @msg)
2872 3272
2873Sends an ext event to the client. 3273Sends an ext event to the client.
2875=cut 3275=cut
2876 3276
2877sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
2879 3279
2880 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 }
2886}
2887
2888=item $client->ext_reply ($msgid, @msg)
2889
2890Sends an ext reply to the client.
2891
2892=cut
2893
2894sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_;
2896
2897 if ($self->extcmd == 2) {
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 }
2904} 3281}
2905 3282
2906=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
2907 3284
2908Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
2928 3305
2929 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
2930 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
2931 3308
2932 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
2933} 3349}
2934 3350
2935cf::client->attach ( 3351cf::client->attach (
2936 on_connect => sub { 3352 on_connect => sub {
2937 my ($ns) = @_; 3353 my ($ns) = @_;
2963 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
2964 3380
2965 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2966 3382
2967 if (ref $msg) { 3383 if (ref $msg) {
2968 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2969 "ARRAY" eq ref $msg
2970 ? @$msg
2971 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2972 3385
2973 my @reply;
2974
2975 if (my $cb = $EXTICMD{$type}) { 3386 if (my $cb = $EXTIACMD{$type}) {
3387 $cb->(
3388 $ns,
3389 sub {
3390 $ns->ext_msg ("reply-$reply", @_)
3391 if $reply;
3392 },
3393 @payload
3394 );
3395 } else {
3396 my @reply;
3397
3398 if (my $cb = $EXTICMD{$type}) {
2976 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
2977 } 3404 }
2978
2979 $ns->ext_reply ($reply, @reply)
2980 if $reply;
2981
2982 } else { 3405 } else {
2983 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3406 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2984 } 3407 }
2985 3408
2986 cf::override; 3409 cf::override;
2987 }, 3410 },
2988); 3411);
3008 3431
3009 $coro 3432 $coro
3010} 3433}
3011 3434
3012cf::client->attach ( 3435cf::client->attach (
3013 on_destroy => sub { 3436 on_client_destroy => sub {
3014 my ($ns) = @_; 3437 my ($ns) = @_;
3015 3438
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3439 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3440 },
3018); 3441);
3034our $safe_hole = new Safe::Hole; 3457our $safe_hole = new Safe::Hole;
3035 3458
3036$SIG{FPE} = 'IGNORE'; 3459$SIG{FPE} = 'IGNORE';
3037 3460
3038$safe->permit_only (Opcode::opset qw( 3461$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3462 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3463 grepstart grepwhile mapstart mapwhile
3041 sort time 3464 sort time
3042)); 3465));
3043 3466
3044# here we export the classes and methods available to script code 3467# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3471The following functions and methods are available within a safe environment:
3049 3472
3050 cf::object 3473 cf::object
3051 contr pay_amount pay_player map x y force_find force_add destroy 3474 contr pay_amount pay_player map x y force_find force_add destroy
3052 insert remove name archname title slaying race decrease split 3475 insert remove name archname title slaying race decrease split
3476 value
3053 3477
3054 cf::object::player 3478 cf::object::player
3055 player 3479 player
3056 3480
3057 cf::player 3481 cf::player
3063=cut 3487=cut
3064 3488
3065for ( 3489for (
3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3490 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3067 insert remove inv nrof name archname title slaying race 3491 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3492 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3493 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3494 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3495 ["cf::map" => qw(trigger)],
3072) { 3496) {
3073 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3497 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3498 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 for @funs; 3499 for @funs;
3077} 3500}
3078 3501
3093 3516
3094 my $qcode = $code; 3517 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3518 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3519 $qcode =~ s/\n/\\n/g;
3097 3520
3521 %vars = (_dummy => 0) unless %vars;
3522
3523 my @res;
3098 local $_; 3524 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3525
3101 my $eval = 3526 my $eval =
3102 "do {\n" 3527 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3528 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3529 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3530 . $code
3106 . "\n}" 3531 . "\n}"
3107 ; 3532 ;
3108 3533
3534 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3535 sub_generation_inc;
3536 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3537 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 sub_generation_inc; 3538 sub_generation_inc;
3539 } else {
3540 local @cf::_safe_eval_args = values %vars;
3541 @res = wantarray ? eval eval : scalar eval $eval;
3542 }
3112 3543
3113 if ($@) { 3544 if ($@) {
3114 warn "$@"; 3545 warn "$@",
3115 warn "while executing safe code '$code'\n"; 3546 "while executing safe code '$code'\n",
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3547 "with arguments " . (join " ", %vars) . "\n";
3117 } 3548 }
3118 3549
3119 wantarray ? @res : $res[0] 3550 wantarray ? @res : $res[0]
3120} 3551}
3121 3552
3135=cut 3566=cut
3136 3567
3137sub register_script_function { 3568sub register_script_function {
3138 my ($fun, $cb) = @_; 3569 my ($fun, $cb) = @_;
3139 3570
3140 no strict 'refs'; 3571 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3572 *$fun = $safe_hole->wrap ($cb);
3142} 3573}
3143 3574
3144=back 3575=back
3145 3576
3146=cut 3577=cut
3147 3578
3148############################################################################# 3579#############################################################################
3149# the server's init and main functions 3580# the server's init and main functions
3150 3581
3582{
3583 package cf::face;
3584
3585 our %HASH; # hash => idx
3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3592 # internal api, not finalised
3593 sub set {
3594 my ($name, $type, $data) = @_;
3595
3596 my $idx = cf::face::find $name;
3597
3598 if ($idx) {
3599 delete $HASH{cf::face::get_csum $idx};
3600 } else {
3601 $idx = cf::face::alloc $name;
3602 }
3603
3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3605
3606 cf::face::set_type $idx, $type;
3607 cf::face::set_csum $idx, 0, $hash;
3608
3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3616 $HASH{$hash} = $idx;#d#
3617
3618 $idx
3619 }
3620
3621 sub _get_data($$$) {
3622 my ($idx, $set, $cb) = @_;
3623
3624 if (defined $DATA[$set][$idx]) {
3625 $cb->($DATA[$set][$idx]);
3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3641
3642 # rather ineffient
3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3645
3646 _get_data $idx, $set, Coro::rouse_cb;
3647 Coro::rouse_wait
3648 }
3649
3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3652
3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3657}
3658
3151sub load_facedata($) { 3659sub load_facedata($) {
3152 my ($path) = @_; 3660 my ($path) = @_;
3153 3661
3154 # HACK to clear player env face cache, we need some signal framework
3155 # for this (global event?)
3156 %ext::player_env::MUSIC_FACE_CACHE = ();
3157
3158 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3159 3663
3160 warn "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3161 3665
3162 my $facedata; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3163 0 < aio_load $path, $facedata
3164 or die "$path: $!";
3165
3166 $facedata = Coro::Storable::thaw $facedata;
3167 3667
3168 $facedata->{version} == 2 3668 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3170 3670
3171 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3172 $facedata->{resource}{"res/exp_table"} = { 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3173 type => FT_RSRC, 3673
3174 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3175 }; 3675
3176 cf::cede_to_tick; 3676 # BEGIN ATOMIC
3677 # from here on, everything must be atomic - no thread switch allowed
3678 my $t1 = EV::time;
3177 3679
3178 { 3680 {
3179 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3180 3682
3181 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3686
3184 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3188 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3189 cf::cede_to_tick; 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3693 delete $cf::face::META[$idx];
3190 } 3694 }
3191 3695
3192 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3193 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3194 3698
3197 3701
3198 if (my $smooth = cf::face::find $info->{smooth}) { 3702 if (my $smooth = cf::face::find $info->{smooth}) {
3199 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3201 } else { 3705 } else {
3202 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3203 } 3707 }
3204
3205 cf::cede_to_tick;
3206 } 3708 }
3207 } 3709 }
3208 3710
3209 { 3711 {
3210 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3211 3713
3212 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3213 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3214 cf::cede_to_tick;
3215 } 3716 }
3216 3717
3217 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3218 } 3719 }
3219 3720
3220 { 3721 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3224 3723
3225 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3725 if (defined (my $type = $info->{type})) {
3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3728
3230 if ($info->{type} & 1) {
3231 # prepend meta info
3232
3233 my $meta = $enc->encode ({
3234 name => $name,
3235 %{ $info->{meta} || {} },
3236 });
3237
3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type}; 3729 cf::face::set_type $idx, $type;
3730 cf::face::set_csum $idx, 0, $info->{hash};
3731 $cf::face::SIZE[0][$idx] = $info->{size};
3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3734 $cf::face::HASH{$info->{hash}} = $idx;
3245 } else { 3735 } else {
3246 $RESOURCE{$name} = $info; 3736# $RESOURCE{$name} = $info; # unused
3247 } 3737 }
3248
3249 cf::cede_to_tick;
3250 } 3738 }
3251 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3252 3750
3253 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3254 3752
3753 aio_close $fh if $fh; # close old facedata
3754
3255 1 3755 1
3256} 3756}
3257
3258cf::global->attach (on_resource_update => sub {
3259 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3260 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3261
3262 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3263 my $sound = $soundconf->{compat}[$_]
3264 or next;
3265
3266 my $face = cf::face::find "sound/$sound->[1]";
3267 cf::sound::set $sound->[0] => $face;
3268 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3269 }
3270
3271 while (my ($k, $v) = each %{$soundconf->{event}}) {
3272 my $face = cf::face::find "sound/$v";
3273 cf::sound::set $k => $face;
3274 }
3275 }
3276});
3277 3757
3278register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3279 my ($ns, $want) = @_; 3759 my ($ns, $want) = @_;
3280 3760
3281 while (my ($k, $v) = each %$want) { 3761 while (my ($k, $v) = each %$want) {
3289 my $status = load_resource_file_ $_[0]; 3769 my $status = load_resource_file_ $_[0];
3290 get_slot 0.1, 100; 3770 get_slot 0.1, 100;
3291 cf::arch::commit_load; 3771 cf::arch::commit_load;
3292 3772
3293 $status 3773 $status
3774}
3775
3776sub reload_exp_table {
3777 _reload_exp_table;
3778
3779 cf::face::set
3780 "res/exp_table" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3783 );
3784}
3785
3786sub reload_materials {
3787 _reload_materials;
3294} 3788}
3295 3789
3296sub reload_regions { 3790sub reload_regions {
3297 # HACK to clear player env face cache, we need some signal framework 3791 # HACK to clear player env face cache, we need some signal framework
3298 # for this (global event?) 3792 # for this (global event?)
3306 if exists $_->{match}; 3800 if exists $_->{match};
3307 } 3801 }
3308} 3802}
3309 3803
3310sub reload_facedata { 3804sub reload_facedata {
3311 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3312 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3313} 3807}
3314 3808
3315sub reload_archetypes { 3809sub reload_archetypes {
3316 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3317 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3812
3813 cf::face::set
3814 "res/skill_info" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3817 );
3818
3819 cf::face::set
3820 "res/spell_paths" => FT_RSRC,
3821 JSON::XS->new->utf8->canonical->encode (
3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3318} 3838}
3319 3839
3320sub reload_treasures { 3840sub reload_treasures {
3321 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3322 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3323} 3843}
3324 3844
3845sub reload_sound {
3846 trace "loading sound config from $DATADIR/sound\n";
3847
3848 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3849
3850 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3851 my $sound = $soundconf->{compat}[$_]
3852 or next;
3853
3854 my $face = cf::face::find "sound/$sound->[1]";
3855 cf::sound::set $sound->[0] => $face;
3856 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3857 }
3858
3859 while (my ($k, $v) = each %{$soundconf->{event}}) {
3860 my $face = cf::face::find "sound/$v";
3861 cf::sound::set $k => $face;
3862 }
3863}
3864
3325sub reload_resources { 3865sub reload_resources {
3326 warn "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3327 3867
3868 reload_materials;
3328 reload_facedata; 3869 reload_facedata;
3870 reload_exp_table;
3871 reload_sound;
3329 reload_archetypes; 3872 reload_archetypes;
3330 reload_regions; 3873 reload_regions;
3331 reload_treasures; 3874 reload_treasures;
3332 3875
3333 warn "finished reloading resource files\n"; 3876 trace "finished reloading resource files\n";
3334}
3335
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342} 3877}
3343 3878
3344sub reload_config { 3879sub reload_config {
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3880 trace "reloading config file...\n";
3346 or return;
3347 3881
3348 local $/; 3882 my $config = load_file "$CONFDIR/config";
3349 *CFG = YAML::Load <$fh>; 3883 utf8::decode $config;
3884 *CFG = decode_yaml $config;
3350 3885
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3886 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3352 3887
3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3888 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3889 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3355 3890
3356 if (exists $CFG{mlockall}) { 3891 if (exists $CFG{mlockall}) {
3379 3914
3380 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3381 print $fh $$; 3916 print $fh $$;
3382} 3917}
3383 3918
3919sub main_loop {
3920 trace "EV::run starting\n";
3921 if (1) {
3922 EV::run;
3923 }
3924 trace "EV::run returned\n";
3925 goto &main_loop unless $REALLY_UNLOOP;
3926}
3927
3384sub main { 3928sub main {
3385 atomic; 3929 cf::init_globals; # initialise logging
3930
3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3932 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3935
3936 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3937
3387 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3941 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3393 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3394 }; 3945 };
3395 3946
3396 { 3947 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3948
3949 cf::sync_job {
3950 cf::incloader::init ();
3951
3952 db_init;
3953
3954 cf::init_anim;
3955 cf::init_attackmess;
3956 cf::init_dynamic;
3957
3958 cf::load_settings;
3959
3960 reload_resources;
3398 reload_config; 3961 reload_config;
3399 db_init; 3962
3963 cf::init_uuid;
3964 cf::init_signals;
3965 cf::init_skills;
3966
3967 cf::init_beforeplay;
3968
3969 atomic;
3970
3400 load_extensions; 3971 load_extensions;
3401 3972
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3973 utime time, time, $RUNTIMEFILE;
3406 3974
3407 # no (long-running) fork's whatsoever before this point(!) 3975 # no (long-running) fork's whatsoever before this point(!)
3976 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3977 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3978
3410 EV::loop; 3979 cf::_post_init 0;
3980 };
3981
3982 cf::object::thawer::errors_are_fatal 0;
3983 info "parse errors in files are no longer fatal from this point on.\n";
3984
3985 AE::postpone {
3986 undef &main; # free gobs of memory :)
3987 };
3988
3989 goto &main_loop;
3411} 3990}
3412 3991
3413############################################################################# 3992#############################################################################
3414# initialisation and cleanup 3993# initialisation and cleanup
3415 3994
3416# install some emergency cleanup handlers 3995# install some emergency cleanup handlers
3417BEGIN { 3996BEGIN {
3418 our %SIGWATCHER = (); 3997 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3998 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3999 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 4000 cf::cleanup "SIG$signal";
3422 }; 4001 };
3423 } 4002 }
3424} 4003}
3425 4004
3426sub write_runtime_sync { 4005sub write_runtime_sync {
4006 my $t0 = AE::time;
4007
3427 # first touch the runtime file to show we are still running: 4008 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 4009 # the fsync below can take a very very long time.
3429 4010
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4011 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 4012
3432 my $guard = cf::lock_acquire "write_runtime"; 4013 my $guard = cf::lock_acquire "write_runtime";
3433 4014
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4015 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 4016 or return;
3436 4017
3437 my $value = $cf::RUNTIME + 90 + 10; 4018 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 4019 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 4020 # 60 allows for the watchdog to kill the server.
3452 or return; 4033 or return;
3453 4034
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4035 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 4036 and return;
3456 4037
3457 warn "runtime file written.\n"; 4038 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 4039
3459 1 4040 1
3460} 4041}
3461 4042
3462our $uuid_lock; 4043our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 4052 my $uuid = "$LOCALDIR/uuid";
3472 4053
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 4054 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 4055 or return;
3475 4056
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 4057 my $value = uuid_seq uuid_cur;
4058
4059 unless ($value) {
4060 info "cowardly refusing to write zero uuid value!\n";
4061 return;
4062 }
4063
4064 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 4065 $uuid_skip = 0;
3478 4066
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 4067 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 4068 and return;
3481 4069
3487 or return; 4075 or return;
3488 4076
3489 aio_rename "$uuid~", $uuid 4077 aio_rename "$uuid~", $uuid
3490 and return; 4078 and return;
3491 4079
3492 warn "uuid file written ($value).\n"; 4080 trace "uuid file written ($value).\n";
3493 4081
3494 1 4082 1
3495 4083
3496} 4084}
3497 4085
3503} 4091}
3504 4092
3505sub emergency_save() { 4093sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 4094 my $freeze_guard = cf::freeze_mainloop;
3507 4095
3508 warn "enter emergency perl save\n"; 4096 info "emergency_perl_save: enter\n";
4097
4098 # this is a trade-off: we want to be very quick here, so
4099 # save all maps without fsync, and later call a global sync
4100 # (which in turn might be very very slow)
4101 local $USE_FSYNC = 0;
3509 4102
3510 cf::sync_job { 4103 cf::sync_job {
4104 cf::write_runtime_sync; # external watchdog should not bark
4105
3511 # use a peculiar iteration method to avoid tripping on perl 4106 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 4107 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 4108 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 4109 info "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 4110 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 4111 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 4112 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4113 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 4114 $pl->save;
3520 } 4115 }
3521 warn "end emergency player save\n"; 4116 info "emergency_perl_save: end player save\n";
3522 4117
3523 warn "begin emergency map save\n"; 4118 cf::write_runtime_sync; # external watchdog should not bark
4119
4120 info "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 4121 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 4122 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 4123 $map->valid or next;
3527 $map->save; 4124 $map->save;
3528 } 4125 }
3529 warn "end emergency map save\n"; 4126 info "emergency_perl_save: end map save\n";
3530 4127
3531 warn "begin emergency database checkpoint\n"; 4128 cf::write_runtime_sync; # external watchdog should not bark
4129
4130 info "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 4131 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 4132 info "emergency_perl_save: end database checkpoint\n";
3534 4133
3535 warn "begin write uuid\n"; 4134 info "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 4135 write_uuid_sync 1;
3537 warn "end write uuid\n"; 4136 info "emergency_perl_save: end write uuid\n";
4137
4138 cf::write_runtime_sync; # external watchdog should not bark
4139
4140 trace "emergency_perl_save: syncing database to disk";
4141 BDB::db_env_txn_checkpoint $DB_ENV;
4142
4143 info "emergency_perl_save: starting sync\n";
4144 IO::AIO::aio_sync sub {
4145 info "emergency_perl_save: finished sync\n";
4146 };
4147
4148 cf::write_runtime_sync; # external watchdog should not bark
4149
4150 trace "emergency_perl_save: flushing outstanding aio requests";
4151 while (IO::AIO::nreqs || BDB::nreqs) {
4152 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4153 }
4154
4155 cf::write_runtime_sync; # external watchdog should not bark
3538 }; 4156 };
3539 4157
3540 warn "leave emergency perl save\n"; 4158 info "emergency_perl_save: leave\n";
3541} 4159}
3542 4160
3543sub post_cleanup { 4161sub post_cleanup {
3544 my ($make_core) = @_; 4162 my ($make_core) = @_;
3545 4163
4164 IO::AIO::flush;
4165
3546 warn Carp::longmess "post_cleanup backtrace" 4166 error Carp::longmess "post_cleanup backtrace"
3547 if $make_core; 4167 if $make_core;
3548 4168
3549 my $fh = pidfile; 4169 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$; 4170 unlink $PIDFILE if <$fh> == $$;
3551} 4171}
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4191 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 4192 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 4193 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4194# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 4195 }
3576 warn "cleared package #$pkg\n";#d#
3577} 4196}
3578
3579our $RELOAD; # how many times to reload
3580 4197
3581sub do_reload_perl() { 4198sub do_reload_perl() {
3582 # can/must only be called in main 4199 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 4200 unless (in_main) {
3584 warn "can only reload from main coroutine"; 4201 error "can only reload from main coroutine";
3585 return; 4202 return;
3586 } 4203 }
3587 4204
3588 return if $RELOAD++; 4205 return if $RELOAD++;
3589 4206
4207 my $t1 = AE::time;
4208
3590 while ($RELOAD) { 4209 while ($RELOAD) {
3591 warn "reloading..."; 4210 cf::get_slot 0.1, -1, "reload_perl";
4211 info "perl_reload: reloading...";
3592 4212
3593 warn "entering sync_job"; 4213 trace "perl_reload: entering sync_job";
3594 4214
3595 cf::sync_job { 4215 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 4216 #cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 4217
3600 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV;
3602
3603 # if anything goes wrong in here, we should simply crash as we already saved
3604
3605 warn "flushing outstanding aio requests";
3606 while (IO::AIO::nreqs || BDB::nreqs) {
3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3608 }
3609
3610 warn "cancelling all extension coros"; 4218 trace "perl_reload: cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO; 4219 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = (); 4220 %EXT_CORO = ();
3613 4221
3614 warn "removing commands"; 4222 trace "perl_reload: removing commands";
3615 %COMMAND = (); 4223 %COMMAND = ();
3616 4224
3617 warn "removing ext/exti commands"; 4225 trace "perl_reload: removing ext/exti commands";
3618 %EXTCMD = (); 4226 %EXTCMD = ();
3619 %EXTICMD = (); 4227 %EXTICMD = ();
3620 4228
3621 warn "unloading/nuking all extensions"; 4229 trace "perl_reload: unloading/nuking all extensions";
3622 for my $pkg (@EXTS) { 4230 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg"; 4231 trace "... unloading $pkg";
3624 4232
3625 if (my $cb = $pkg->can ("unload")) { 4233 if (my $cb = $pkg->can ("unload")) {
3626 eval { 4234 eval {
3627 $cb->($pkg); 4235 $cb->($pkg);
3628 1 4236 1
3629 } or warn "$pkg unloaded, but with errors: $@"; 4237 } or error "$pkg unloaded, but with errors: $@";
3630 } 4238 }
3631 4239
3632 warn "... clearing $pkg"; 4240 trace "... clearing $pkg";
3633 clear_package $pkg; 4241 clear_package $pkg;
3634 } 4242 }
3635 4243
3636 warn "unloading all perl modules loaded from $LIBDIR"; 4244 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) { 4245 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 4247
3640 warn "... unloading $k"; 4248 trace "... unloading $k";
3641 delete $INC{$k}; 4249 delete $INC{$k};
3642 4250
3643 $k =~ s/\.pm$//; 4251 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g; 4252 $k =~ s/\//::/g;
3645 4253
3648 } 4256 }
3649 4257
3650 clear_package $k; 4258 clear_package $k;
3651 } 4259 }
3652 4260
3653 warn "getting rid of safe::, as good as possible"; 4261 trace "perl_reload: getting rid of safe::, as good as possible";
3654 clear_package "safe::$_" 4262 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4263 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 4264
3657 warn "unloading cf.pm \"a bit\""; 4265 trace "perl_reload: unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 4266 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 4267 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 4268
3661 # don't, removes xs symbols, too, 4269 # don't, removes xs symbols, too,
3662 # and global variables created in xs 4270 # and global variables created in xs
3663 #clear_package __PACKAGE__; 4271 #clear_package __PACKAGE__;
3664 4272
3665 warn "unload completed, starting to reload now"; 4273 info "perl_reload: unload completed, starting to reload now";
3666 4274
3667 warn "reloading cf.pm"; 4275 trace "perl_reload: reloading cf.pm";
3668 require cf; 4276 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4277 cf::_connect_to_perl_1;
3670 4278
3671 warn "loading config and database again"; 4279 trace "perl_reload: loading config and database again";
3672 cf::reload_config; 4280 cf::reload_config;
3673 4281
3674 warn "loading extensions"; 4282 trace "perl_reload: loading extensions";
3675 cf::load_extensions; 4283 cf::load_extensions;
3676 4284
4285 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 4286 trace "perl_reload: reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 4287 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 4288 trace "perl_reload: reattaching attachments to maps";
3680 reattach $_ for values %MAP; 4289 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 4290 trace "perl_reload: reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 4291 reattach $_ for values %PLAYER;
4292 }
3683 4293
3684 warn "leaving sync_job"; 4294 cf::_post_init 1;
4295
4296 trace "perl_reload: leaving sync_job";
3685 4297
3686 1 4298 1
3687 } or do { 4299 } or do {
3688 warn $@; 4300 error $@;
3689 cf::cleanup "error while reloading, exiting."; 4301 cf::cleanup "perl_reload: error, exiting.";
3690 }; 4302 };
3691 4303
3692 warn "reloaded";
3693 --$RELOAD; 4304 --$RELOAD;
3694 } 4305 }
4306
4307 $t1 = AE::time - $t1;
4308 info "perl_reload: completed in ${t1}s\n";
3695}; 4309};
3696 4310
3697our $RELOAD_WATCHER; # used only during reload 4311our $RELOAD_WATCHER; # used only during reload
3698 4312
3699sub reload_perl() { 4313sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 4314 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 4315 # coro crashes during coro_state_free->destroy here.
3702 4316
4317 $RELOAD_WATCHER ||= cf::async {
4318 Coro::AIO::aio_wait cache_extensions;
4319
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4320 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 4321 do_reload_perl;
3705 undef $RELOAD_WATCHER; 4322 undef $RELOAD_WATCHER;
4323 };
3706 }; 4324 };
3707} 4325}
3708 4326
3709register_command "reload" => sub { 4327register_command "reload" => sub {
3710 my ($who, $arg) = @_; 4328 my ($who, $arg) = @_;
3716 reload_perl; 4334 reload_perl;
3717 }; 4335 };
3718 } 4336 }
3719}; 4337};
3720 4338
3721unshift @INC, $LIBDIR; 4339#############################################################################
3722 4340
3723my $bug_warning = 0; 4341my $bug_warning = 0;
3724 4342
3725our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN;
3727
3728sub wait_for_tick { 4343sub wait_for_tick() {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3730 4345
3731 my $signal = new Coro::Signal; 4346 $WAIT_FOR_TICK->wait;
3732 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait;
3734} 4347}
3735 4348
3736sub wait_for_tick_begin { 4349sub wait_for_tick_begin() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4350 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3738 4351
3739 my $signal = new Coro::Signal; 4352 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 4353 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 4354 $signal->wait;
3742} 4355}
3746 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4359 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3747 unless ++$bug_warning > 10; 4360 unless ++$bug_warning > 10;
3748 return; 4361 return;
3749 } 4362 }
3750 4363
3751 cf::server_tick; # one server iteration 4364 cf::one_tick; # one server iteration
4365
4366 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3752 4367
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4368 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4369 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 4370 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 4371 $Coro::current->{desc} = "runtime saver";
3757 write_runtime_sync 4372 write_runtime_sync
3758 or warn "ERROR: unable to write runtime file: $!"; 4373 or error "ERROR: unable to write runtime file: $!";
3759 }; 4374 };
3760 } 4375 }
3761 4376
3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4377 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3763 $sig->send; 4378 $sig->send;
3764 } 4379 }
3765 while (my $sig = shift @WAIT_FOR_TICK) { 4380 $WAIT_FOR_TICK->broadcast;
3766 $sig->send;
3767 }
3768 4381
3769 $LOAD = ($NOW - $TICK_START) / $TICK; 4382 $LOAD = ($NOW - $TICK_START) / $TICK;
3770 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3771 4384
3772 if (0) { 4385 if (0) {
3773 if ($NEXT_TICK) { 4386 if ($NEXT_TICK) {
3774 my $jitter = $TICK_START - $NEXT_TICK; 4387 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4388 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d# 4389 debug "jitter $JITTER\n";#d#
3777 } 4390 }
3778 } 4391 }
3779} 4392}
3780 4393
3781{ 4394{
3782 # configure BDB 4395 # configure BDB
4396 info "initialising database";
3783 4397
3784 BDB::min_parallel 8; 4398 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
3787 4401
3788 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
3790 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3791 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4405 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3816 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3817 }; 4431 };
3818 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3819 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3820 }; 4434 };
4435
4436 info "database initialised";
3821} 4437}
3822 4438
3823{ 4439{
3824 # configure IO::AIO 4440 # configure IO::AIO
3825 4441
4442 info "initialising aio";
3826 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
3827 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
3828 undef $AnyEvent::AIO::WATCHER; 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
3829} 4447}
3830 4448
3831my $_log_backtrace; 4449our $_log_backtrace;
4450our $_log_backtrace_last;
3832 4451
3833sub _log_backtrace { 4452sub _log_backtrace {
3834 my ($msg, @addr) = @_; 4453 my ($msg, @addr) = @_;
3835 4454
3836 $msg =~ s/\n//; 4455 $msg =~ s/\n$//;
3837 4456
4457 if ($_log_backtrace_last eq $msg) {
4458 LOG llevInfo, "[ABT] $msg\n";
4459 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3838 # limit the # of concurrent backtraces 4460 # limit the # of concurrent backtraces
3839 if ($_log_backtrace < 2) { 4461 } elsif ($_log_backtrace < 2) {
4462 $_log_backtrace_last = $msg;
3840 ++$_log_backtrace; 4463 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg; 4464 my $perl_bt = Carp::longmess $msg;
3842 async { 4465 async {
3843 $Coro::current->{desc} = "abt $msg"; 4466 $Coro::current->{desc} = "abt $msg";
3844 4467
3864 LOG llevInfo, "[ABT] $_\n" for @bt; 4487 LOG llevInfo, "[ABT] $_\n" for @bt;
3865 --$_log_backtrace; 4488 --$_log_backtrace;
3866 }; 4489 };
3867 } else { 4490 } else {
3868 LOG llevInfo, "[ABT] $msg\n"; 4491 LOG llevInfo, "[ABT] $msg\n";
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4492 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3870 } 4493 }
3871} 4494}
3872 4495
3873# load additional modules 4496# load additional modules
3874use cf::pod; 4497require "cf/$_.pm" for @EXTRA_MODULES;
4498cf::_connect_to_perl_2;
3875 4499
3876END { cf::emergency_save } 4500END { cf::emergency_save }
3877 4501
38781 45021
3879 4503

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines