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.455 by root, Sat Sep 27 08:17:40 2008 UTC vs.
Revision 1.614 by root, Mon Nov 26 15:12:16 2012 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
70 74
71# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
74 78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83
84our @ORIG_INC;
76 85
77our %COMMAND = (); 86our %COMMAND = ();
78our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
79 88
80our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
81our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
82our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
85 96
86our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
88 101
89our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
90our $DATADIR = datadir; 104our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
94our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 117
103our %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;
104 125
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 128our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 129our $USE_FSYNC = 1; # use fsync to write maps - default on
109 130
110our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 134our $DB_ENV;
114 135
136our @EXTRA_MODULES = qw(pod match mapscript incloader);
137
115our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
116 140
117our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
119our $NOW; 144our $NOW;
120 145
121our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
122our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
123our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
129our $LOADAVG; # same thing, but with alpha-smoothing 154our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 155our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 156our $TICK_START; # for load detecting purposes
132 157
133our @POST_INIT; 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;
134 165
135binmode STDOUT; 166binmode STDOUT;
136binmode STDERR; 167binmode STDERR;
137 168
138# read virtual server time, if available 169# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 171 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 172 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 173 $RUNTIME = <$fh> + 0.;
143} 174}
144 175
176eval "sub TICK() { $TICK } 1" or die;
177
145mkdir $_ 178mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 179 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 180
148our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
149 182
150sub cf::map::normalise; 183sub cf::map::normalise;
151 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
152############################################################################# 189#############################################################################
153 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
154=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
155 203
156=over 4 204=over 4
157 205
158=item $cf::UPTIME 206=item $cf::UPTIME
159 207
160The 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.
161 224
162=item $cf::RUNTIME 225=item $cf::RUNTIME
163 226
164The 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
165every server tick. 228every server tick.
166 229
167=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
168$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
169$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
170 233
171Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
172directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
173unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
174database environment. 237database environment.
175 238
176=item $cf::NOW
177
178The time of the last (current) server tick.
179
180=item $cf::TICK
181
182The interval between server ticks, in seconds.
183
184=item $cf::LOADAVG 239=item $cf::LOADAVG
185 240
186The 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
187(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
188objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
196Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
197from wherever your confdir points to. 252from wherever your confdir points to.
198 253
199=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
200 255
201These 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.
202returns 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
203per 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();
204 277
205=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
206 279
207This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 282that call.
210 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
211=back 290=back
212 291
213=cut 292=cut
214 293
215BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
216 *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 {
217 my $msg = join "", @_; 301 my $msg = join "", @_;
218 302
219 $msg .= "\n" 303 $msg .= "\n"
220 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
221 305
222 $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;
223 307
224 LOG llevError, $msg; 308 LOG llevWarn, $msg;
225 }; 309};
226}
227 310
228$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
230 313
231 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 318 return;#d#
234 }#d# 319 }#d#
235 320
236 # kill coroutine otherwise 321 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 322 Coro::terminate
239}; 323};
240
241$SIG{__DIE__} = sub { }; #d#?
242 324
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 342)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 344}
263 345
264$EV::DIED = sub { 346$EV::DIED = sub {
265 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
266}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
267 354
268############################################################################# 355#############################################################################
269 356
270=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
271 358
292 $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;
293 $d 380 $d
294 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
295} 382}
296 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
297=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
298 437
299Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
300 439
301=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
307our $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
308 447
309sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
311 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
312=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
313 483
314Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
316 486
317The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
318is a reload or not. 488is a reload or not.
319 489
320=cut 490=cut
321 491
322sub post_init(&) { 492sub post_init(&) {
323 push @POST_INIT, shift; 493 push @POST_INIT, shift;
324} 494}
325 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
326=item cf::lock_wait $string 513=item cf::lock_wait $string
327 514
328Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
329 516
330=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
331 518
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 521for example when the coroutine gets canceled), the lock is automatically
335returned. 522returned.
336 523
337Locks 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
338deadlocked coro. 525deadlocked coro.
344 531
345Return 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.
346 533
347=cut 534=cut
348 535
349our %LOCK; 536our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 537
352sub lock_wait($) { 538sub lock_wait($) {
353 my ($key) = @_; 539 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 540}
367 541
368sub lock_acquire($) { 542sub lock_acquire($) {
369 my ($key) = @_; 543 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 544}
383 545
384sub lock_active($) { 546sub lock_active($) {
385 my ($key) = @_; 547 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 548}
389 549
390sub freeze_mainloop { 550sub freeze_mainloop {
391 tick_inhibit_inc; 551 tick_inhibit_inc;
392 552
393 Coro::guard \&tick_inhibit_dec; 553 &Guard::guard (\&tick_inhibit_dec);
394} 554}
395 555
396=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
397 557
398Like 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
399get spread over timer. 559get spread over time.
400 560
401=cut 561=cut
402 562
403sub periodic($$) { 563sub periodic($$) {
404 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
408 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
409} 569}
410 570
411=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
412 572
413Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
414This 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
415of 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.
416 580
417The 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
418used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
419 583
420Useful for short background jobs. 584Useful for short background jobs.
421 585
422=cut 586=cut
423 587
424our @SLOT_QUEUE; 588our @SLOT_QUEUE;
425our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
426 591
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
430 595
431 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
432 598
433 while () { 599 while () {
434 next_job: 600 next_job:
601
602 Coro::cede;
603
435 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 605
437 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
608 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 610 $job->[2]->send;
441 Coro::cede;
442 goto next_job; 611 goto next_job;
443 } 612 } else {
613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 614 }
445 } 615 }
446 616
447 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
449 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait;
451 } else { 619 } else {
620 $busy = 0;
452 Coro::schedule; 621 Coro::schedule;
453 } 622 }
454 } 623 }
455}; 624};
456 625
457sub get_slot($;$$) { 626sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
459 628
460 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
461 630
462 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
463 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
464 634
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
493=cut 663=cut
494 664
495sub sync_job(&) { 665sub sync_job(&) {
496 my ($job) = @_; 666 my ($job) = @_;
497 667
498 if ($Coro::current == $Coro::main) { 668 if (in_main) {
499 my $time = EV::time; 669 my $time = AE::time;
500 670
501 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
503 673
504 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
505 675
506 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
507 677
508 my $busy = 1; 678 my $busy = 1;
509 my @res; 679 my @res;
510 680
511 (async { 681 (async {
512 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 683 @res = eval { $job->() };
514 warn $@ if $@; 684 error $@ if $@;
515 undef $busy; 685 undef $busy;
516 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
517 687
518 while ($busy) { 688 while ($busy) {
519 if (Coro::nready) { 689 if (Coro::nready) {
521 } else { 691 } else {
522 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
523 } 693 }
524 } 694 }
525 695
526 my $time = EV::time - $time; 696 my $time = AE::time - $time;
527 697
528 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
529 699
530 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
531 } else { 701 } else {
553 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
554 724
555 $coro 725 $coro
556} 726}
557 727
558=item fork_call { }, $args 728=item fork_call { }, @args
559 729
560Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
561process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 733never block itself or use any form of event handling.
564 734
565=cut 735=cut
566 736
737sub post_fork {
738 reset_signals;
739}
740
567sub fork_call(&@) { 741sub fork_call(&@) {
568 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
569 743
570 # we seemingly have to make a local copy of the whole thing,
571 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious)
573
574 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
575 reset_signals; 745 cf::post_fork;
576 &$cb 746 &$cb
577 }, @args; 747 } @args;
578 748
579 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 )
580} 761}
581 762
582=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
583 764
584=cut 765=cut
621within each server. 802within each server.
622 803
623=cut 804=cut
624 805
625sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
626 my ($name) = @_; 810 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
628 812
629 eval { 813 eval {
630 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
640} 824}
641 825
642our $DB; 826our $DB;
643 827
644sub db_init { 828sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
647 };
648} 830}
649 831
650sub db_get($$) { 832sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
652 834
653 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
654 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
655 839
656 $! ? () 840 $! ? ()
657 : $data 841 : $data
658 }
659} 842}
660 843
661sub db_put($$$) { 844sub db_put($$$) {
662 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 874
692 my @data; 875 my @data;
693 my $md5; 876 my $md5;
694 877
695 for (0 .. $#$src) { 878 for (0 .. $#$src) {
696 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
697 or Carp::croak "$src->[$_]: $!";
698 } 880 }
699 881
700 # if processing is expensive, check 882 # if processing is expensive, check
701 # checksum first 883 # checksum first
702 if (1) { 884 if (1) {
715 897
716 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
717 } 899 }
718 } 900 }
719 901
720 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
721 my $data = $process->(\@data); 903 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
723 905
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 907
726 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
729 911
739 921
740=cut 922=cut
741 923
742sub datalog($@) { 924sub datalog($@) {
743 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 927}
746 928
747=back 929=back
748 930
749=cut 931=cut
944 1126
945 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1129
948 } elsif (ref $type) { 1130 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
950 1132
951 } else { 1133 } else {
952 shift @arg; 1134 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
954 } 1136 }
955 } 1137 }
956} 1138}
957 1139
958sub _object_attach { 1140sub _object_attach {
968 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
969 } 1151 }
970 1152
971 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
972 } else { 1154 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1156 }
975 1157
976 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
977} 1159}
978 1160
1037 1219
1038 for (@$callbacks) { 1220 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1040 1222
1041 if ($@) { 1223 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1225 override;
1045 } 1226 }
1046 1227
1047 return 1 if $override; 1228 return 1 if $override;
1048 } 1229 }
1127 for (@$attach) { 1308 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1130 } 1311 }
1131 } else { 1312 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1314 }
1134 } 1315 }
1135} 1316}
1136 1317
1137cf::attachable->attach ( 1318cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1165 1346
1166 sync_job { 1347 sync_job {
1167 if (length $$rdata) { 1348 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1171 1353
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1361 aio_close $fh;
1177 1362
1178 if (@$objs) { 1363 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1365 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1372 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1374 }
1187 } else { 1375 } else {
1188 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1189 } 1377 }
1190 1378
1191 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1380
1381 $filename =~ s%/[^/]+$%%;
1382 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1383 } else {
1193 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1194 } 1385 }
1195 } else { 1386 } else {
1196 aio_unlink $filename; 1387 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1198 } 1389 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1414 $av = $st->{objs};
1224 } 1415 }
1225 1416
1226 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1229 1421
1230 ($data, $av) 1422 ($data, $av)
1231} 1423}
1232 1424
1233=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1237=cut 1429=cut
1238 1430
1239############################################################################# 1431#############################################################################
1240# command handling &c 1432# command handling &c
1241 1433
1242=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1243 1435
1244Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1245$name. 1437$name.
1246 1438
1247=cut 1439=cut
1253 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1254 1446
1255 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1256} 1448}
1257 1449
1258=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1259 1451
1260Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1261extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1262received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1263the 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
1264has logged in successfully. 1456has logged in successfully.
1265 1457
1266If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1267called.
1268 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
1269=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1270 1466
1271Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1272exticmd 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
1273are 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
1274is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1275log-in. 1471log-in.
1276 1472
1277If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1278called.
1279 1474
1280=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1281 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
1282sub register_extcmd { 1482sub register_extcmd($$) {
1283 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1284 1484
1285 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1286} 1486}
1287 1487
1288sub register_exticmd { 1488sub register_async_extcmd($$) {
1289 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1290 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1291 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1292} 1498}
1293 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1294cf::player->attach ( 1508cf::player->attach (
1295 on_command => sub { 1509 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1297 1511
1298 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1299 or return; 1513 or return;
1300 1514
1308 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1309 1523
1310 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1311 1525
1312 if (ref $msg) { 1526 if (ref $msg) {
1313 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1314 "ARRAY" eq ref $msg
1315 ? @$msg
1316 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1317 1528
1318 my @reply;
1319
1320 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}) {
1321 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1322 } 1547 }
1323 1548
1324 $pl->ext_reply ($reply, @reply)
1325 if $reply;
1326
1327 } else { 1549 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1551 }
1330 1552
1331 cf::override; 1553 cf::override;
1332 }, 1554 },
1333); 1555);
1334 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
1335sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1336 cf::sync_job { 1586 cf::sync_job {
1337 my %todo; 1587 my %todo;
1338 1588
1339 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1590 next unless -r $path;
1358 1608
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1611
1362 $ext{source} = 1612 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1365 . $source 1615 . $source
1366 . "\n};\n1"; 1616 . "\n};\n1";
1367 1617
1368 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1369 } 1619 }
1370 1620
1621 my $pass = 0;
1371 my %done; 1622 my %done;
1372 while (%todo) { 1623 while (%todo) {
1373 my $progress; 1624 my $progress;
1374 1625
1626 ++$pass;
1627
1628 ext:
1375 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1631 next ext
1378 unless exists $done{$_}; 1632 unless exists $done{$_};
1379 } 1633 }
1380 1634
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1636
1383 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 $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1650
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1652 if exists $v->{meta}{mandatory};
1391 1653
1392 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;
1393 } 1663 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1664 }
1399 1665
1400 skip: 1666 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1676 }
1404 }; 1677 };
1405} 1678}
1406 1679
1407############################################################################# 1680#############################################################################
1491 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1492 } 1765 }
1493 } 1766 }
1494} 1767}
1495 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
1496sub save($) { 1782sub save($) {
1497 my ($pl) = @_; 1783 my ($pl) = @_;
1498 1784
1499 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1500 1786
1505 1791
1506 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1508 1794
1509 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];
1510 1799
1511 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1801 cf::cede_to_tick;
1513} 1802}
1514 1803
1548 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1549 1838
1550 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1551 $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
1552 1841
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1554 $pl->deactivate; 1843 $pl->deactivate;
1844
1555 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;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1558 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1559 1850
1560 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1562 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1616 \@logins 1907 \@logins
1617} 1908}
1618 1909
1619=item $player->maps 1910=item $player->maps
1620 1911
1912=item cf::player::maps $login
1913
1621Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1622player. May block. 1915player. May block.
1623 1916
1624=cut 1917=cut
1625 1918
1646 1939
1647=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1648 1941
1649Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1650 1943
1651=item $player->ext_reply ($msgid, @msg)
1652
1653Sends an ext reply to the player.
1654
1655=cut
1656
1657sub ext_reply($$@) {
1658 my ($self, $id, @msg) = @_;
1659
1660 $self->ns->ext_reply ($id, @msg)
1661}
1662
1663=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1664 1945
1665Sends an ext event to the client. 1946Sends an ext event to the client.
1666 1947
1667=cut 1948=cut
1686 1967
1687=cut 1968=cut
1688 1969
1689sub find_by_path($) { 1970sub find_by_path($) {
1690 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1691 1974
1692 my ($match, $specificity); 1975 my ($match, $specificity);
1693 1976
1694 for my $region (list) { 1977 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1724sub generate_random_map { 2007sub generate_random_map {
1725 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1726 2009
1727 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
1728 2011
1729 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1738 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1739 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1740 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1741 (cf::region::find $rmp->{region}), $rmp->{custom}
1742 )
1743} 2013}
1744 2014
1745=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1746 2016
1747Register 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
1752 2022
1753sub register { 2023sub register {
1754 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 2025 my $pkg = caller;
1756 2026
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 2028
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 2030}
1762 2031
1763# also paths starting with '/' 2032# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 2034
1766sub thawer_merge { 2035sub thawer_merge {
1767 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1768 2037
1769 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1774} 2043}
1775 2044
1776sub normalise { 2045sub normalise {
1777 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1778 2047
1779 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1780 2049
1781 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1782 2051
1783 # map plan: 2052 # map plan:
1784 # 2053 #
1799 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1800 $path = "$base/$path"; 2069 $path = "$base/$path";
1801 } 2070 }
1802 2071
1803 for ($path) { 2072 for ($path) {
1804 redo if s{//}{/};
1805 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1806 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1807 } 2075 }
1808 2076
1809 $path 2077 $path
1823 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1824 return $self; 2092 return $self;
1825 } 2093 }
1826 } 2094 }
1827 2095
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 2097 ()
1830} 2098}
1831 2099
2100# may re-bless or do other evil things
1832sub init { 2101sub init {
1833 my ($self) = @_; 2102 my ($self) = @_;
1834 2103
1835 $self 2104 $self
1836} 2105}
1867 2136
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1870} 2139}
1871 2140
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 2141sub decay_objects {
1882 my ($self) = @_; 2142 my ($self) = @_;
1883 2143
1884 return if $self->{deny_reset}; 2144 return if $self->{deny_reset};
1885 2145
1910 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1911 2171
1912 1 2172 1
1913} 2173}
1914 2174
2175# used to laod the header of an original map
1915sub load_header_orig { 2176sub load_header_orig {
1916 my ($self) = @_; 2177 my ($self) = @_;
1917 2178
1918 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1919} 2180}
1920 2181
2182# used to laod the header of an instantiated map
1921sub load_header_temp { 2183sub load_header_temp {
1922 my ($self) = @_; 2184 my ($self) = @_;
1923 2185
1924 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1925} 2187}
1926 2188
2189# called after loading the header from an instantiated map
1927sub prepare_temp { 2190sub prepare_temp {
1928 my ($self) = @_; 2191 my ($self) = @_;
1929 2192
1930 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1932 # safety 2195 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2198}
1936 2199
2200# called after loading the header from an original map
1937sub prepare_orig { 2201sub prepare_orig {
1938 my ($self) = @_; 2202 my ($self) = @_;
1939 2203
1940 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1965 2229
1966sub find; 2230sub find;
1967sub find { 2231sub find {
1968 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1969 2233
2234 cf::cede_to_tick;
2235
1970 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1971 2237
1972 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2240
1975 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
1980 or return; 2243 or return;
1981 2244
1982 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
1983 2246
1995 2258
1996 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1997 } 2260 }
1998} 2261}
1999 2262
2000sub pre_load { } 2263sub pre_load { }
2001sub post_load { } 2264#sub post_load { } # XS
2002 2265
2003sub load { 2266sub load {
2004 my ($self) = @_; 2267 my ($self) = @_;
2005 2268
2006 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2009 2272
2010 { 2273 {
2011 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2012 2275
2013 return unless $self->valid; 2276 return unless $self->valid;
2014 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2015
2016 $self->in_memory (cf::MAP_LOADING);
2017 2278
2018 $self->alloc; 2279 $self->alloc;
2019 2280
2020 $self->pre_load; 2281 $self->pre_load;
2021 cf::cede_to_tick; 2282 cf::cede_to_tick;
2022 2283
2284 if (exists $self->{load_path}) {
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2286 $f->skip_block;
2025 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2026 or return; 2288 or return;
2027 2289
2028 $self->post_load_original 2290 $self->post_load_original
2029 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2030 2292
2031 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2294 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2035 $self->clear_unique_items; 2297 $self->clear_unique_items;
2036 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2038 } 2301 }
2039 } 2302 }
2040 }
2041 2303
2042 $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);
2043 2311
2044 cf::cede_to_tick; 2312 cf::cede_to_tick;
2045 # now do the right thing for maps 2313 # now do the right thing for maps
2046 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2047 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2051 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2320 $self->decay_objects;
2053 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2054 $self->update_buttons; 2322 $self->update_buttons;
2055 cf::cede_to_tick; 2323 cf::cede_to_tick;
2056 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2057 cf::cede_to_tick;
2058 $self->activate;
2059 } 2325 }
2060 2326
2061 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2063
2064 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2329 }
2066 2330
2067 $self->post_load; 2331 $self->post_load;
2068}
2069 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
2070sub customise_for { 2339sub customise_for {
2071 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2072 2341
2073 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2343 if $self->per_player;
2077# if $self->per_party; 2346# if $self->per_party;
2078 2347
2079 $self 2348 $self
2080} 2349}
2081 2350
2082# find and load all maps in the 3x3 area around a map
2083sub load_neighbours {
2084 my ($map) = @_;
2085
2086 my @neigh; # diagonal neighbours
2087
2088 for (0 .. 3) {
2089 my $neigh = $map->tile_path ($_)
2090 or next;
2091 $neigh = find $neigh, $map
2092 or next;
2093 $neigh->load;
2094
2095 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 }
2099
2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
2102 my $neigh = find $path, $origin
2103 or next;
2104 $neigh->load;
2105 }
2106}
2107
2108sub find_sync { 2351sub find_sync {
2109 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2110 2353
2111 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
2112} 2359}
2113 2360
2114sub do_load_sync { 2361sub do_load_sync {
2115 my ($map) = @_; 2362 my ($map) = @_;
2116 2363
2364 # it's a bug to call this from the main context
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2119 2367
2120 cf::sync_job { $map->load }; 2368 $map->load;
2121} 2369}
2122 2370
2123our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2125 2373
2126sub find_async { 2374sub find_async {
2127 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2128 2376
2129 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2130 2378
2131 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2133 } 2381 }
2134 2382
2135 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2136 2384
2137 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2151 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2152 2400
2153 () 2401 ()
2154} 2402}
2155 2403
2404# common code, used by both ->save and ->swapout
2156sub save { 2405sub _save {
2157 my ($self) = @_; 2406 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2407
2161 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2162 2409
2163 return unless $self->dirty; 2410 return unless $self->dirty;
2164 2411
2184 } else { 2431 } else {
2185 $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);
2186 } 2433 }
2187} 2434}
2188 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2189sub swap_out { 2444sub swap_out {
2190 my ($self) = @_; 2445 my ($self) = @_;
2191 2446
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2197 return if $self->players; 2451 return if $self->players;
2198 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
2199 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2200 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
2201 $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};
2202 2503
2203 $self->deactivate; 2504 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2506 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2507
2251 $self->unlink_save; 2508 $self->unlink_save;
2252 $self->destroy; 2509 $self->destroy;
2253} 2510}
2254 2511
2262 2519
2263 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2264 2521
2265 $self->unlink_save; 2522 $self->unlink_save;
2266 2523
2267 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2529
2329 : normalise $_ 2586 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2588 ]
2332} 2589}
2333 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
2334=back 2623=back
2335 2624
2336=head3 cf::object 2625=head3 cf::object
2337 2626
2338=cut 2627=cut
2361 2650
2362Creates 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.
2363 2652
2364=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2365 2654
2366returns 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,
2367even if the object actually exists. May block. 2656even if the object actually exists. May block.
2368 2657
2369=cut 2658=cut
2370 2659
2371sub deref { 2660sub deref {
2403 2692
2404our $SAY_CHANNEL = { 2693our $SAY_CHANNEL = {
2405 id => "say", 2694 id => "say",
2406 title => "Map", 2695 title => "Map",
2407 reply => "say ", 2696 reply => "say ",
2408 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.",
2409}; 2698};
2410 2699
2411our $CHAT_CHANNEL = { 2700our $CHAT_CHANNEL = {
2412 id => "chat", 2701 id => "chat",
2413 title => "Chat", 2702 title => "Chat",
2453=item $player_object->may ("access") 2742=item $player_object->may ("access")
2454 2743
2455Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2456(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2457 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
2458=cut 2772=cut
2459 2773
2460sub cf::object::player::may { 2774sub cf::object::player::may {
2461 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2462 2776
2463 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2464 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2465 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2466 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2467} 2781}
2468 2782
2469=item $player_object->enter_link 2783=item $player_object->enter_link
2470 2784
2471Freezes 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}>).
2472 2786
2473The 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.
2474for 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,
2475though, 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
2476map. 2790map.
2477 2791
2478Will never block. 2792Will never block.
2479 2793
2480=item $player_object->leave_link ($map, $x, $y) 2794=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2815sub cf::object::player::enter_link {
2502 my ($self) = @_; 2816 my ($self) = @_;
2503 2817
2504 $self->deactivate_recursive; 2818 $self->deactivate_recursive;
2505 2819
2820 ++$self->{_link_recursion};
2821
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2822 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2823
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2824 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2825 if $self->map && $self->map->{path} ne "{link}";
2510 2826
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2827 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2828}
2513 2829
2514sub cf::object::player::leave_link { 2830sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2831 my ($self, $map, $x, $y) = @_;
2516 2832
2533 ($x, $y) = (-1, -1) 2849 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2850 unless (defined $x) && (defined $y);
2535 2851
2536 # use -1 or undef as default coordinates, not 0, 0 2852 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2853 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2854 if $x <= 0 && $y <= 0;
2539 2855
2540 $map->load; 2856 $map->load;
2541 $map->load_neighbours;
2542 2857
2543 return unless $self->contr->active; 2858 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2859
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2860 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2861 if ($self->enter_map ($map, $x, $y)) {
2549} 2862 # entering was successful
2863 delete $self->{_link_recursion};
2864 # only activate afterwards, to support waiting in hooks
2865 $self->activate_recursive;
2866 }
2550 2867
2868}
2869
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2870=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2552 2871
2553Moves the player to the given map-path and coordinates by first freezing 2872Moves the player to the given map-path and coordinates by first freezing
2554her, loading and preparing them map, calling the provided $check callback 2873her, loading and preparing them map, calling the provided $check callback
2555that has to return the map if sucecssful, and then unfreezes the player on 2874that has to return the map if sucecssful, and then unfreezes the player on
2556the new (success) or old (failed) map position. In either case, $done will 2875the new (success) or old (failed) map position. In either case, $done will
2563 2882
2564our $GOTOGEN; 2883our $GOTOGEN;
2565 2884
2566sub cf::object::player::goto { 2885sub cf::object::player::goto {
2567 my ($self, $path, $x, $y, $check, $done) = @_; 2886 my ($self, $path, $x, $y, $check, $done) = @_;
2887
2888 if ($self->{_link_recursion} >= $MAX_LINKS) {
2889 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2890 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2891 ($path, $x, $y) = @$EMERGENCY_POSITION;
2892 }
2568 2893
2569 # do generation counting so two concurrent goto's will be executed in-order 2894 # do generation counting so two concurrent goto's will be executed in-order
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2895 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2896
2572 $self->enter_link; 2897 $self->enter_link;
2592 ($path, $x, $y) = (undef, undef, undef); 2917 ($path, $x, $y) = (undef, undef, undef);
2593 } 2918 }
2594 } 2919 }
2595 2920
2596 my $map = eval { 2921 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2922 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2598 2923
2599 if ($map) { 2924 if ($map) {
2600 $map = $map->customise_for ($self); 2925 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2926 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2927 } else {
2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2928 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2604 } 2929 }
2605 2930
2606 $map 2931 $map
2614 if ($gen == $self->{_goto_generation}) { 2939 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2940 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2941 $self->leave_link ($map, $x, $y);
2617 } 2942 }
2618 2943
2619 $done->() if $done; 2944 $done->($self) if $done;
2620 })->prio (1); 2945 })->prio (1);
2621} 2946}
2622 2947
2623=item $player_object->enter_exit ($exit_object) 2948=item $player_object->enter_exit ($exit_object)
2624 2949
2692 $Coro::current->{desc} = "enter_exit"; 3017 $Coro::current->{desc} = "enter_exit";
2693 3018
2694 unless (eval { 3019 unless (eval {
2695 $self->deactivate_recursive; # just to be sure 3020 $self->deactivate_recursive; # just to be sure
2696 3021
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3022 my $map = cf::map::normalise $exit->slaying, $exit->map;
2706 my $x = $exit->stats->hp; 3023 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp; 3024 my $y = $exit->stats->sp;
3025
3026 # special map handling
3027 my $slaying = $exit->slaying;
3028
3029 # special map handling
3030 if ($slaying eq "/!") {
3031 my $guard = cf::lock_acquire "exit_prepare:$exit";
3032
3033 prepare_random_map $exit
3034 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3035
3036 $map = $exit->slaying;
3037
3038 } elsif ($slaying eq '!up') {
3039 $map = $exit->map->tile_path (cf::TILE_UP);
3040 $x = $exit->x;
3041 $y = $exit->y;
3042
3043 } elsif ($slaying eq '!down') {
3044 $map = $exit->map->tile_path (cf::TILE_DOWN);
3045 $x = $exit->x;
3046 $y = $exit->y;
3047 }
2708 3048
2709 $self->goto ($map, $x, $y); 3049 $self->goto ($map, $x, $y);
2710 3050
2711 # if exit is damned, update players death & WoR home-position 3051 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y) 3052 $self->contr->savebed ($map, $x, $y)
2717 $self->message ("Something went wrong deep within the deliantra server. " 3057 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "I'll try to bring you back to the map you were before. " 3058 . "I'll try to bring you back to the map you were before. "
2719 . "Please report this to the dungeon master!", 3059 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 3060 cf::NDI_UNIQUE | cf::NDI_RED);
2721 3061
2722 warn "ERROR in enter_exit: $@"; 3062 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 3063 $self->leave_link;
2724 } 3064 }
2725 })->prio (1); 3065 })->prio (1);
2726} 3066}
2727 3067
2728=head3 cf::client 3068=head3 cf::client
2729 3069
2730=over 4 3070=over 4
2731 3071
2732=item $client->send_drawinfo ($text, $flags) 3072=item $client->send_big_packet ($pkt)
2733 3073
2734Sends a drawinfo packet to the client. Circumvents output buffering so 3074Like C<send_packet>, but tries to compress large packets, and fragments
2735should not be used under normal circumstances. 3075them as required.
2736 3076
2737=cut 3077=cut
2738 3078
3079our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3080
2739sub cf::client::send_drawinfo { 3081sub cf::client::send_big_packet {
2740 my ($self, $text, $flags) = @_; 3082 my ($self, $pkt) = @_;
2741 3083
2742 utf8::encode $text; 3084 # try lzf for large packets
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3085 $pkt = "lzf " . Compress::LZF::compress $pkt
3086 if 1024 <= length $pkt and $self->{can_lzf};
3087
3088 # split very large packets
3089 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3090 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3091 $pkt = "frag";
3092 }
3093
3094 $self->send_packet ($pkt);
2744} 3095}
2745 3096
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 3097=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 3098
2748Send a drawinfo or msg packet to the client, formatting the msg for the 3099Send a msg packet to the client, formatting the msg for the client if
2749client if neccessary. C<$type> should be a string identifying the type of 3100necessary. C<$type> should be a string identifying the type of the
2750the message, with C<log> being the default. If C<$color> is negative, suppress 3101message, with C<log> being the default. If C<$color> is negative, suppress
2751the message unless the client supports the msg packet. 3102the message unless the client supports the msg packet.
2752 3103
2753=cut 3104=cut
2754 3105
2755# non-persistent channels (usually the info channel) 3106# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 3107our %CHANNEL = (
3108 "c/motd" => {
3109 id => "infobox",
3110 title => "MOTD",
3111 reply => undef,
3112 tooltip => "The message of the day",
3113 },
2757 "c/identify" => { 3114 "c/identify" => {
2758 id => "infobox", 3115 id => "infobox",
2759 title => "Identify", 3116 title => "Identify",
2760 reply => undef, 3117 reply => undef,
2761 tooltip => "Items recently identified", 3118 tooltip => "Items recently identified",
2763 "c/examine" => { 3120 "c/examine" => {
2764 id => "infobox", 3121 id => "infobox",
2765 title => "Examine", 3122 title => "Examine",
2766 reply => undef, 3123 reply => undef,
2767 tooltip => "Signs and other items you examined", 3124 tooltip => "Signs and other items you examined",
3125 },
3126 "c/shopinfo" => {
3127 id => "infobox",
3128 title => "Shop Info",
3129 reply => undef,
3130 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 3131 },
2769 "c/book" => { 3132 "c/book" => {
2770 id => "infobox", 3133 id => "infobox",
2771 title => "Book", 3134 title => "Book",
2772 reply => undef, 3135 reply => undef,
2788 id => "infobox", 3151 id => "infobox",
2789 title => "Body Parts", 3152 title => "Body Parts",
2790 reply => undef, 3153 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 3154 tooltip => "Shows which body parts you posess and are available",
2792 }, 3155 },
3156 "c/statistics" => {
3157 id => "infobox",
3158 title => "Statistics",
3159 reply => undef,
3160 tooltip => "Shows your primary statistics",
3161 },
2793 "c/skills" => { 3162 "c/skills" => {
2794 id => "infobox", 3163 id => "infobox",
2795 title => "Skills", 3164 title => "Skills",
2796 reply => undef, 3165 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 3166 tooltip => "Shows your experience per skill and item power",
3167 },
3168 "c/shopitems" => {
3169 id => "infobox",
3170 title => "Shop Items",
3171 reply => undef,
3172 tooltip => "Shows the items currently for sale in this shop",
3173 },
3174 "c/resistances" => {
3175 id => "infobox",
3176 title => "Resistances",
3177 reply => undef,
3178 tooltip => "Shows your resistances",
3179 },
3180 "c/pets" => {
3181 id => "infobox",
3182 title => "Pets",
3183 reply => undef,
3184 tooltip => "Shows information abotu your pets/a specific pet",
3185 },
3186 "c/perceiveself" => {
3187 id => "infobox",
3188 title => "Perceive Self",
3189 reply => undef,
3190 tooltip => "You gained detailed knowledge about yourself",
2798 }, 3191 },
2799 "c/uptime" => { 3192 "c/uptime" => {
2800 id => "infobox", 3193 id => "infobox",
2801 title => "Uptime", 3194 title => "Uptime",
2802 reply => undef, 3195 reply => undef,
2812 id => "party", 3205 id => "party",
2813 title => "Party", 3206 title => "Party",
2814 reply => "gsay ", 3207 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3208 tooltip => "Messages and chat related to your party",
2816 }, 3209 },
3210 "c/death" => {
3211 id => "death",
3212 title => "Death",
3213 reply => undef,
3214 tooltip => "Reason for and more info about your most recent death",
3215 },
3216 "c/fatal" => {
3217 id => "fatal",
3218 title => "Fatal Error",
3219 reply => undef,
3220 tooltip => "Reason for the server disconnect",
3221 },
3222 "c/say" => $SAY_CHANNEL,
3223 "c/chat" => $CHAT_CHANNEL,
2817); 3224);
2818 3225
2819sub cf::client::send_msg { 3226sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3227 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3228
2826 3233
2827 # check predefined channels, for the benefit of C 3234 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3235 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3236 $channel = $CHANNEL{$channel};
2830 3237
2831 $self->ext_msg (channel_info => $channel) 3238 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3239 $channel = $channel->{id};
2835 3240
2836 } elsif (ref $channel) { 3241 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3242 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3243 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3244 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3245 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3246 }
2843 3247
2844 $channel = $channel->{id}; 3248 $channel = $channel->{id};
2845 } 3249 }
2846 3250
2847 return unless @extra || length $msg; 3251 return unless @extra || length $msg;
2848 3252
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3253 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3254 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3255 if $color & cf::NDI_DEF;
2853 3256
2854 my $pkt = "msg " 3257 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3258 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3259 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3260 );
2858 3261
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3262 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3263}
2896 3264
2897=item $client->ext_msg ($type, @msg) 3265=item $client->ext_msg ($type, @msg)
2898 3266
2899Sends an ext event to the client. 3267Sends an ext event to the client.
2901=cut 3269=cut
2902 3270
2903sub cf::client::ext_msg($$@) { 3271sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3272 my ($self, $type, @msg) = @_;
2905 3273
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3274 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2930} 3275}
2931 3276
2932=item $success = $client->query ($flags, "text", \&cb) 3277=item $success = $client->query ($flags, "text", \&cb)
2933 3278
2934Queues a query to the client, calling the given callback with 3279Queues a query to the client, calling the given callback with
2954 3299
2955 $self->send_packet ($self->{query_queue}[0][0]) 3300 $self->send_packet ($self->{query_queue}[0][0])
2956 if @{ $self->{query_queue} } == 1; 3301 if @{ $self->{query_queue} } == 1;
2957 3302
2958 1 3303 1
3304}
3305
3306=item $client->update_command_faces
3307
3308=cut
3309
3310our %COMMAND_FACE;
3311
3312sub cf::client::update_command_faces {
3313 my ($self) = @_;
3314
3315 my @faces = grep $_,
3316 $COMMAND_FACE{preferred},
3317 $COMMAND_FACE{standard},
3318 $COMMAND_FACE{skill},
3319 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3320 $COMMAND_FACE{emote},
3321 ;
3322
3323 $self->send_face ($_)
3324 for @faces;
3325 $self->flush_fx;
3326
3327 $self->ext_msg (command_list => @faces);
3328}
3329
3330=item cf::client::set_command_face $type, $commands
3331
3332=cut
3333
3334sub cf::client::set_command_face {
3335 my ($type, $list) = @_;
3336
3337 my $idx = &cf::face::set ( #d# ugly forward reference
3338 "command_list/$type" => cf::FT_RSRC,
3339 JSON::XS->new->utf8->encode ([ sort @$list ])
3340 );
3341
3342 $COMMAND_FACE{$type} = $idx;
2959} 3343}
2960 3344
2961cf::client->attach ( 3345cf::client->attach (
2962 on_connect => sub { 3346 on_connect => sub {
2963 my ($ns) = @_; 3347 my ($ns) = @_;
2989 my ($ns, $buf) = @_; 3373 my ($ns, $buf) = @_;
2990 3374
2991 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3375 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2992 3376
2993 if (ref $msg) { 3377 if (ref $msg) {
2994 my ($type, $reply, @payload) = 3378 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998 3379
2999 my @reply;
3000
3001 if (my $cb = $EXTICMD{$type}) { 3380 if (my $cb = $EXTIACMD{$type}) {
3381 $cb->(
3382 $ns,
3383 sub {
3384 $ns->ext_msg ("reply-$reply", @_)
3385 if $reply;
3386 },
3387 @payload
3388 );
3389 } else {
3390 my @reply;
3391
3392 if (my $cb = $EXTICMD{$type}) {
3002 @reply = $cb->($ns, @payload); 3393 @reply = $cb->($ns, @payload);
3394 }
3395
3396 $ns->ext_msg ("reply-$reply", @reply)
3397 if $reply;
3003 } 3398 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
3008 } else { 3399 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3400 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3401 }
3011 3402
3012 cf::override; 3403 cf::override;
3013 }, 3404 },
3014); 3405);
3034 3425
3035 $coro 3426 $coro
3036} 3427}
3037 3428
3038cf::client->attach ( 3429cf::client->attach (
3039 on_destroy => sub { 3430 on_client_destroy => sub {
3040 my ($ns) = @_; 3431 my ($ns) = @_;
3041 3432
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3433 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3434 },
3044); 3435);
3060our $safe_hole = new Safe::Hole; 3451our $safe_hole = new Safe::Hole;
3061 3452
3062$SIG{FPE} = 'IGNORE'; 3453$SIG{FPE} = 'IGNORE';
3063 3454
3064$safe->permit_only (Opcode::opset qw( 3455$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3456 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3457 grepstart grepwhile mapstart mapwhile
3067 sort time 3458 sort time
3068)); 3459));
3069 3460
3070# here we export the classes and methods available to script code 3461# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3465The following functions and methods are available within a safe environment:
3075 3466
3076 cf::object 3467 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3468 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3469 insert remove name archname title slaying race decrease split
3470 value
3079 3471
3080 cf::object::player 3472 cf::object::player
3081 player 3473 player
3082 3474
3083 cf::player 3475 cf::player
3089=cut 3481=cut
3090 3482
3091for ( 3483for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3484 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3485 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3486 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3487 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3488 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3489 ["cf::map" => qw(trigger)],
3098) { 3490) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3491 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3492 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3493 for @funs;
3103} 3494}
3104 3495
3119 3510
3120 my $qcode = $code; 3511 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3512 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3513 $qcode =~ s/\n/\\n/g;
3123 3514
3515 %vars = (_dummy => 0) unless %vars;
3516
3517 my @res;
3124 local $_; 3518 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3519
3127 my $eval = 3520 my $eval =
3128 "do {\n" 3521 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3522 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3523 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3524 . $code
3132 . "\n}" 3525 . "\n}"
3133 ; 3526 ;
3134 3527
3528 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3529 sub_generation_inc;
3530 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3531 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3532 sub_generation_inc;
3533 } else {
3534 local @cf::_safe_eval_args = values %vars;
3535 @res = wantarray ? eval eval : scalar eval $eval;
3536 }
3138 3537
3139 if ($@) { 3538 if ($@) {
3140 warn "$@"; 3539 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3540 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3541 "with arguments " . (join " ", %vars) . "\n";
3143 } 3542 }
3144 3543
3145 wantarray ? @res : $res[0] 3544 wantarray ? @res : $res[0]
3146} 3545}
3147 3546
3161=cut 3560=cut
3162 3561
3163sub register_script_function { 3562sub register_script_function {
3164 my ($fun, $cb) = @_; 3563 my ($fun, $cb) = @_;
3165 3564
3166 no strict 'refs'; 3565 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3566 *$fun = $safe_hole->wrap ($cb);
3168} 3567}
3169 3568
3170=back 3569=back
3171 3570
3172=cut 3571=cut
3173 3572
3174############################################################################# 3573#############################################################################
3175# the server's init and main functions 3574# the server's init and main functions
3176 3575
3576{
3577 package cf::face;
3578
3579 our %HASH; # hash => idx
3580 our @DATA; # dynamically-created facedata, only faceste 0 used
3581 our @FOFS; # file offset, if > 0
3582 our @SIZE; # size of face, in octets
3583 our @META; # meta hash of face, if any
3584 our $DATAFH; # facedata filehandle
3585
3586 # internal api, not finalised
3587 sub set {
3588 my ($name, $type, $data) = @_;
3589
3590 my $idx = cf::face::find $name;
3591
3592 if ($idx) {
3593 delete $HASH{cf::face::get_csum $idx};
3594 } else {
3595 $idx = cf::face::alloc $name;
3596 }
3597
3598 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3599
3600 cf::face::set_type $idx, $type;
3601 cf::face::set_csum $idx, 0, $hash;
3602
3603 # we need to destroy the SV itself, not just modify it, as a running ix
3604 # might hold a reference to it: "delete" achieves that.
3605 delete $FOFS[0][$idx];
3606 delete $DATA[0][$idx];
3607 $DATA[0][$idx] = $data;
3608 $SIZE[0][$idx] = length $data;
3609 delete $META[$idx];
3610 $HASH{$hash} = $idx;#d#
3611
3612 $idx
3613 }
3614
3615 sub _get_data($$$) {
3616 my ($idx, $set, $cb) = @_;
3617
3618 if (defined $DATA[$set][$idx]) {
3619 $cb->($DATA[$set][$idx]);
3620 } elsif (my $fofs = $FOFS[$set][$idx]) {
3621 my $size = $SIZE[$set][$idx];
3622 my $buf;
3623 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3624 if ($_[0] == $size) {
3625 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3626 $cb->($buf);
3627 } else {
3628 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3629 }
3630 };
3631 } else {
3632 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3633 }
3634 }
3635
3636 # rather ineffient
3637 sub cf::face::get_data($;$) {
3638 my ($idx, $set) = @_;
3639
3640 _get_data $idx, $set, Coro::rouse_cb;
3641 Coro::rouse_wait
3642 }
3643
3644 sub cf::face::ix {
3645 my ($ns, $set, $idx, $pri) = @_;
3646
3647 _get_data $idx, $set, sub {
3648 $ns->ix_send ($idx, $pri, $_[0]);
3649 };
3650 }
3651}
3652
3177sub load_facedata($) { 3653sub load_facedata($) {
3178 my ($path) = @_; 3654 my ($path) = @_;
3179 3655
3180 # HACK to clear player env face cache, we need some signal framework
3181 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = ();
3183
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3656 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3657
3186 warn "loading facedata from $path\n"; 3658 trace "loading facedata from $path\n";
3187 3659
3188 my $facedata; 3660 my $facedata = decode_storable load_file "$path/faceinfo";
3189 0 < aio_load $path, $facedata
3190 or die "$path: $!";
3191
3192 $facedata = Coro::Storable::thaw $facedata;
3193 3661
3194 $facedata->{version} == 2 3662 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3663 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3196 3664
3197 # patch in the exptable 3665 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3198 $facedata->{resource}{"res/exp_table"} = { 3666 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3199 type => FT_RSRC, 3667
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3668 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3201 }; 3669
3202 cf::cede_to_tick; 3670 # BEGIN ATOMIC
3671 # from here on, everything must be atomic - no thread switch allowed
3672 my $t1 = EV::time;
3203 3673
3204 { 3674 {
3205 my $faces = $facedata->{faceinfo}; 3675 my $faces = $facedata->{faceinfo};
3206 3676
3207 while (my ($face, $info) = each %$faces) { 3677 for my $face (sort keys %$faces) {
3678 my $info = $faces->{$face};
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3679 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3680
3210 cf::face::set_visibility $idx, $info->{visibility}; 3681 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3682 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3683 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3684 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3214 3685 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3215 cf::cede_to_tick; 3686 $cf::face::HASH{$info->{hash64}} = $idx;
3687 delete $cf::face::META[$idx];
3216 } 3688 }
3217 3689
3218 while (my ($face, $info) = each %$faces) { 3690 while (my ($face, $info) = each %$faces) {
3219 next unless $info->{smooth}; 3691 next unless $info->{smooth};
3220 3692
3223 3695
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3696 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3697 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3698 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3699 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3700 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3701 }
3230
3231 cf::cede_to_tick;
3232 } 3702 }
3233 } 3703 }
3234 3704
3235 { 3705 {
3236 my $anims = $facedata->{animinfo}; 3706 my $anims = $facedata->{animinfo};
3237 3707
3238 while (my ($anim, $info) = each %$anims) { 3708 while (my ($anim, $info) = each %$anims) {
3239 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3709 cf::anim::set $anim, $info->{frames}, $info->{facings};
3240 cf::cede_to_tick;
3241 } 3710 }
3242 3711
3243 cf::anim::invalidate_all; # d'oh 3712 cf::anim::invalidate_all; # d'oh
3244 } 3713 }
3245 3714
3246 { 3715 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3716 my $res = $facedata->{resource};
3250 3717
3251 while (my ($name, $info) = each %$res) { 3718 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3719 if (defined (my $type = $info->{type})) {
3720 # TODO: different hash - must free and use new index, or cache ixface data queue
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3721 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3722
3256 if ($info->{type} & 1) {
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3723 cf::face::set_type $idx, $type;
3724 cf::face::set_csum $idx, 0, $info->{hash};
3725 $cf::face::SIZE[0][$idx] = $info->{size};
3726 $cf::face::FOFS[0][$idx] = $info->{fofs};
3727 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3728 $cf::face::HASH{$info->{hash}} = $idx;
3271 } else { 3729 } else {
3272 $RESOURCE{$name} = $info; 3730# $RESOURCE{$name} = $info; # unused
3273 } 3731 }
3274
3275 cf::cede_to_tick;
3276 } 3732 }
3277 } 3733 }
3734
3735 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3736
3737 # HACK to clear player env face cache, we need some signal framework
3738 # for this (global event?)
3739 %ext::player_env::MUSIC_FACE_CACHE = ();
3740
3741 # END ATOMIC
3742
3743 cf::debug "facedata atomic update time ", EV::time - $t1;
3278 3744
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3745 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3746
3747 aio_close $fh if $fh; # close old facedata
3748
3281 1 3749 1
3282} 3750}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3751
3304register_exticmd fx_want => sub { 3752register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3753 my ($ns, $want) = @_;
3306 3754
3307 while (my ($k, $v) = each %$want) { 3755 while (my ($k, $v) = each %$want) {
3315 my $status = load_resource_file_ $_[0]; 3763 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100; 3764 get_slot 0.1, 100;
3317 cf::arch::commit_load; 3765 cf::arch::commit_load;
3318 3766
3319 $status 3767 $status
3768}
3769
3770sub reload_exp_table {
3771 _reload_exp_table;
3772
3773 cf::face::set
3774 "res/exp_table" => FT_RSRC,
3775 JSON::XS->new->utf8->canonical->encode (
3776 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3777 );
3778}
3779
3780sub reload_materials {
3781 _reload_materials;
3320} 3782}
3321 3783
3322sub reload_regions { 3784sub reload_regions {
3323 # HACK to clear player env face cache, we need some signal framework 3785 # HACK to clear player env face cache, we need some signal framework
3324 # for this (global event?) 3786 # for this (global event?)
3332 if exists $_->{match}; 3794 if exists $_->{match};
3333 } 3795 }
3334} 3796}
3335 3797
3336sub reload_facedata { 3798sub reload_facedata {
3337 load_facedata "$DATADIR/facedata" 3799 load_facedata $DATADIR
3338 or die "unable to load facedata\n"; 3800 or die "unable to load facedata\n";
3339} 3801}
3340 3802
3341sub reload_archetypes { 3803sub reload_archetypes {
3342 load_resource_file "$DATADIR/archetypes" 3804 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n"; 3805 or die "unable to load archetypes\n";
3806
3807 cf::face::set
3808 "res/skill_info" => FT_RSRC,
3809 JSON::XS->new->utf8->canonical->encode (
3810 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3811 );
3812
3813 cf::face::set
3814 "res/spell_paths" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3817 );
3818
3819 # command completion
3820 my @commands;
3821
3822 for (0..cf::arch::skillvec_size - 1) {
3823 my $skill = cf::arch::skillvec $_;
3824 my $name = $skill->name;
3825 my $flags = cf::skill_flags $skill->subtype;
3826
3827 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3828 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3829 }
3830
3831 cf::client::set_command_face skill => \@commands;
3344} 3832}
3345 3833
3346sub reload_treasures { 3834sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3835 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3836 or die "unable to load treasurelists\n";
3349} 3837}
3350 3838
3839sub reload_sound {
3840 trace "loading sound config from $DATADIR/sound\n";
3841
3842 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3843
3844 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3845 my $sound = $soundconf->{compat}[$_]
3846 or next;
3847
3848 my $face = cf::face::find "sound/$sound->[1]";
3849 cf::sound::set $sound->[0] => $face;
3850 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3851 }
3852
3853 while (my ($k, $v) = each %{$soundconf->{event}}) {
3854 my $face = cf::face::find "sound/$v";
3855 cf::sound::set $k => $face;
3856 }
3857}
3858
3351sub reload_resources { 3859sub reload_resources {
3352 warn "reloading resource files...\n"; 3860 trace "reloading resource files...\n";
3353 3861
3862 reload_materials;
3354 reload_facedata; 3863 reload_facedata;
3864 reload_exp_table;
3865 reload_sound;
3355 reload_archetypes; 3866 reload_archetypes;
3356 reload_regions; 3867 reload_regions;
3357 reload_treasures; 3868 reload_treasures;
3358 3869
3359 warn "finished reloading resource files\n"; 3870 trace "finished reloading resource files\n";
3360} 3871}
3361 3872
3362sub reload_config { 3873sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3874 trace "reloading config file...\n";
3364 or return;
3365 3875
3366 local $/; 3876 my $config = load_file "$CONFDIR/config";
3367 *CFG = YAML::Load <$fh>; 3877 utf8::decode $config;
3878 *CFG = decode_yaml $config;
3368 3879
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3880 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3881
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3882 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3883 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 3884
3374 if (exists $CFG{mlockall}) { 3885 if (exists $CFG{mlockall}) {
3397 3908
3398 seek $fh, 0, 0; 3909 seek $fh, 0, 0;
3399 print $fh $$; 3910 print $fh $$;
3400} 3911}
3401 3912
3913sub main_loop {
3914 trace "EV::loop starting\n";
3915 if (1) {
3916 EV::loop;
3917 }
3918 trace "EV::loop returned\n";
3919 goto &main_loop unless $REALLY_UNLOOP;
3920}
3921
3402sub main { 3922sub main {
3403 cf::init_globals; # initialise logging 3923 cf::init_globals; # initialise logging
3404 3924
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3925 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3926 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3927 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3928 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409 3929
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3930 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3931
3418 # we must not ever block the main coroutine 3932 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3933 $Coro::idle = sub {
3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3934 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3421 (async { 3935 (async {
3422 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3936 $Coro::current->{desc} = "IDLE BUG HANDLER";
3423 EV::loop EV::LOOP_ONESHOT; 3937 EV::loop EV::LOOP_ONESHOT;
3424 })->prio (Coro::PRIO_MAX); 3938 })->prio (Coro::PRIO_MAX);
3425 }; 3939 };
3426 3940
3427 evthread_start IO::AIO::poll_fileno; 3941 evthread_start IO::AIO::poll_fileno;
3428 3942
3429 cf::sync_job { 3943 cf::sync_job {
3944 cf::incloader::init ();
3945
3946 db_init;
3947
3948 cf::init_anim;
3949 cf::init_attackmess;
3950 cf::init_dynamic;
3951
3952 cf::load_settings;
3953
3430 reload_resources; 3954 reload_resources;
3431 reload_config; 3955 reload_config;
3432 db_init;
3433 3956
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3957 cf::init_uuid;
3437 cf::init_signals; 3958 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3959 cf::init_skills;
3440 3960
3441 cf::init_beforeplay; 3961 cf::init_beforeplay;
3442 3962
3443 atomic; 3963 atomic;
3445 load_extensions; 3965 load_extensions;
3446 3966
3447 utime time, time, $RUNTIMEFILE; 3967 utime time, time, $RUNTIMEFILE;
3448 3968
3449 # no (long-running) fork's whatsoever before this point(!) 3969 # no (long-running) fork's whatsoever before this point(!)
3970 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3971 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3972
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3973 cf::_post_init 0;
3453 }; 3974 };
3454 3975
3455 EV::loop; 3976 cf::object::thawer::errors_are_fatal 0;
3977 info "parse errors in files are no longer fatal from this point on.\n";
3978
3979 AE::postpone {
3980 undef &main; # free gobs of memory :)
3981 };
3982
3983 goto &main_loop;
3456} 3984}
3457 3985
3458############################################################################# 3986#############################################################################
3459# initialisation and cleanup 3987# initialisation and cleanup
3460 3988
3461# install some emergency cleanup handlers 3989# install some emergency cleanup handlers
3462BEGIN { 3990BEGIN {
3463 our %SIGWATCHER = (); 3991 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3992 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3993 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3994 cf::cleanup "SIG$signal";
3467 }; 3995 };
3468 } 3996 }
3469} 3997}
3470 3998
3471sub write_runtime_sync { 3999sub write_runtime_sync {
4000 my $t0 = AE::time;
4001
3472 # first touch the runtime file to show we are still running: 4002 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 4003 # the fsync below can take a very very long time.
3474 4004
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4005 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 4006
3477 my $guard = cf::lock_acquire "write_runtime"; 4007 my $guard = cf::lock_acquire "write_runtime";
3478 4008
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4009 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 4010 or return;
3481 4011
3482 my $value = $cf::RUNTIME + 90 + 10; 4012 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 4013 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 4014 # 60 allows for the watchdog to kill the server.
3497 or return; 4027 or return;
3498 4028
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4029 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 4030 and return;
3501 4031
3502 warn "runtime file written.\n"; 4032 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 4033
3504 1 4034 1
3505} 4035}
3506 4036
3507our $uuid_lock; 4037our $uuid_lock;
3519 or return; 4049 or return;
3520 4050
3521 my $value = uuid_seq uuid_cur; 4051 my $value = uuid_seq uuid_cur;
3522 4052
3523 unless ($value) { 4053 unless ($value) {
3524 warn "cowardly refusing to write zero uuid value!\n"; 4054 info "cowardly refusing to write zero uuid value!\n";
3525 return; 4055 return;
3526 } 4056 }
3527 4057
3528 my $value = uuid_str $value + $uuid_skip; 4058 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0; 4059 $uuid_skip = 0;
3539 or return; 4069 or return;
3540 4070
3541 aio_rename "$uuid~", $uuid 4071 aio_rename "$uuid~", $uuid
3542 and return; 4072 and return;
3543 4073
3544 warn "uuid file written ($value).\n"; 4074 trace "uuid file written ($value).\n";
3545 4075
3546 1 4076 1
3547 4077
3548} 4078}
3549 4079
3555} 4085}
3556 4086
3557sub emergency_save() { 4087sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 4088 my $freeze_guard = cf::freeze_mainloop;
3559 4089
3560 warn "enter emergency perl save\n"; 4090 info "emergency_perl_save: enter\n";
4091
4092 # this is a trade-off: we want to be very quick here, so
4093 # save all maps without fsync, and later call a global sync
4094 # (which in turn might be very very slow)
4095 local $USE_FSYNC = 0;
3561 4096
3562 cf::sync_job { 4097 cf::sync_job {
4098 cf::write_runtime_sync; # external watchdog should not bark
4099
3563 # use a peculiar iteration method to avoid tripping on perl 4100 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 4101 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 4102 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 4103 info "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 4104 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 4105 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 4106 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4107 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 4108 $pl->save;
3572 } 4109 }
3573 warn "end emergency player save\n"; 4110 info "emergency_perl_save: end player save\n";
3574 4111
3575 warn "begin emergency map save\n"; 4112 cf::write_runtime_sync; # external watchdog should not bark
4113
4114 info "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 4115 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 4116 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 4117 $map->valid or next;
3579 $map->save; 4118 $map->save;
3580 } 4119 }
3581 warn "end emergency map save\n"; 4120 info "emergency_perl_save: end map save\n";
3582 4121
3583 warn "begin emergency database checkpoint\n"; 4122 cf::write_runtime_sync; # external watchdog should not bark
4123
4124 info "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 4125 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 4126 info "emergency_perl_save: end database checkpoint\n";
3586 4127
3587 warn "begin write uuid\n"; 4128 info "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 4129 write_uuid_sync 1;
3589 warn "end write uuid\n"; 4130 info "emergency_perl_save: end write uuid\n";
4131
4132 cf::write_runtime_sync; # external watchdog should not bark
4133
4134 trace "emergency_perl_save: syncing database to disk";
4135 BDB::db_env_txn_checkpoint $DB_ENV;
4136
4137 info "emergency_perl_save: starting sync\n";
4138 IO::AIO::aio_sync sub {
4139 info "emergency_perl_save: finished sync\n";
4140 };
4141
4142 cf::write_runtime_sync; # external watchdog should not bark
4143
4144 trace "emergency_perl_save: flushing outstanding aio requests";
4145 while (IO::AIO::nreqs || BDB::nreqs) {
4146 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4147 }
4148
4149 cf::write_runtime_sync; # external watchdog should not bark
3590 }; 4150 };
3591 4151
3592 warn "leave emergency perl save\n"; 4152 info "emergency_perl_save: leave\n";
3593} 4153}
3594 4154
3595sub post_cleanup { 4155sub post_cleanup {
3596 my ($make_core) = @_; 4156 my ($make_core) = @_;
3597 4157
4158 IO::AIO::flush;
4159
3598 warn Carp::longmess "post_cleanup backtrace" 4160 error Carp::longmess "post_cleanup backtrace"
3599 if $make_core; 4161 if $make_core;
3600 4162
3601 my $fh = pidfile; 4163 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$; 4164 unlink $PIDFILE if <$fh> == $$;
3603} 4165}
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4185 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 4186 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 4187 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4188# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 4189 }
3628 warn "cleared package $pkg\n";#d#
3629} 4190}
3630 4191
3631sub do_reload_perl() { 4192sub do_reload_perl() {
3632 # can/must only be called in main 4193 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 4194 unless (in_main) {
3634 warn "can only reload from main coroutine"; 4195 error "can only reload from main coroutine";
3635 return; 4196 return;
3636 } 4197 }
3637 4198
3638 return if $RELOAD++; 4199 return if $RELOAD++;
3639 4200
4201 my $t1 = AE::time;
4202
3640 while ($RELOAD) { 4203 while ($RELOAD) {
3641 warn "reloading..."; 4204 cf::get_slot 0.1, -1, "reload_perl";
4205 info "perl_reload: reloading...";
3642 4206
3643 warn "entering sync_job"; 4207 trace "perl_reload: entering sync_job";
3644 4208
3645 cf::sync_job { 4209 cf::sync_job {
3646 cf::write_runtime_sync; # external watchdog should not bark
3647 cf::emergency_save; 4210 #cf::emergency_save;
3648 cf::write_runtime_sync; # external watchdog should not bark
3649 4211
3650 warn "syncing database to disk";
3651 BDB::db_env_txn_checkpoint $DB_ENV;
3652
3653 # if anything goes wrong in here, we should simply crash as we already saved
3654
3655 warn "flushing outstanding aio requests";
3656 while (IO::AIO::nreqs || BDB::nreqs) {
3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3658 }
3659
3660 warn "cancelling all extension coros"; 4212 trace "perl_reload: cancelling all extension coros";
3661 $_->cancel for values %EXT_CORO; 4213 $_->cancel for values %EXT_CORO;
3662 %EXT_CORO = (); 4214 %EXT_CORO = ();
3663 4215
3664 warn "removing commands"; 4216 trace "perl_reload: removing commands";
3665 %COMMAND = (); 4217 %COMMAND = ();
3666 4218
3667 warn "removing ext/exti commands"; 4219 trace "perl_reload: removing ext/exti commands";
3668 %EXTCMD = (); 4220 %EXTCMD = ();
3669 %EXTICMD = (); 4221 %EXTICMD = ();
3670 4222
3671 warn "unloading/nuking all extensions"; 4223 trace "perl_reload: unloading/nuking all extensions";
3672 for my $pkg (@EXTS) { 4224 for my $pkg (@EXTS) {
3673 warn "... unloading $pkg"; 4225 trace "... unloading $pkg";
3674 4226
3675 if (my $cb = $pkg->can ("unload")) { 4227 if (my $cb = $pkg->can ("unload")) {
3676 eval { 4228 eval {
3677 $cb->($pkg); 4229 $cb->($pkg);
3678 1 4230 1
3679 } or warn "$pkg unloaded, but with errors: $@"; 4231 } or error "$pkg unloaded, but with errors: $@";
3680 } 4232 }
3681 4233
3682 warn "... clearing $pkg"; 4234 trace "... clearing $pkg";
3683 clear_package $pkg; 4235 clear_package $pkg;
3684 } 4236 }
3685 4237
3686 warn "unloading all perl modules loaded from $LIBDIR"; 4238 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) { 4239 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4240 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689 4241
3690 warn "... unloading $k"; 4242 trace "... unloading $k";
3691 delete $INC{$k}; 4243 delete $INC{$k};
3692 4244
3693 $k =~ s/\.pm$//; 4245 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g; 4246 $k =~ s/\//::/g;
3695 4247
3698 } 4250 }
3699 4251
3700 clear_package $k; 4252 clear_package $k;
3701 } 4253 }
3702 4254
3703 warn "getting rid of safe::, as good as possible"; 4255 trace "perl_reload: getting rid of safe::, as good as possible";
3704 clear_package "safe::$_" 4256 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4257 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 4258
3707 warn "unloading cf.pm \"a bit\""; 4259 trace "perl_reload: unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 4260 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 4261 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 4262
3711 # don't, removes xs symbols, too, 4263 # don't, removes xs symbols, too,
3712 # and global variables created in xs 4264 # and global variables created in xs
3713 #clear_package __PACKAGE__; 4265 #clear_package __PACKAGE__;
3714 4266
3715 warn "unload completed, starting to reload now"; 4267 info "perl_reload: unload completed, starting to reload now";
3716 4268
3717 warn "reloading cf.pm"; 4269 trace "perl_reload: reloading cf.pm";
3718 require cf; 4270 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4271 cf::_connect_to_perl_1;
3720 4272
3721 warn "loading config and database again"; 4273 trace "perl_reload: loading config and database again";
3722 cf::reload_config; 4274 cf::reload_config;
3723 4275
3724 warn "loading extensions"; 4276 trace "perl_reload: loading extensions";
3725 cf::load_extensions; 4277 cf::load_extensions;
3726 4278
4279 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 4280 trace "perl_reload: reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 4281 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 4282 trace "perl_reload: reattaching attachments to maps";
3730 reattach $_ for values %MAP; 4283 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 4284 trace "perl_reload: reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 4285 reattach $_ for values %PLAYER;
4286 }
3733 4287
3734 warn "running post_load"; 4288 cf::_post_init 1;
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736 4289
3737 warn "leaving sync_job"; 4290 trace "perl_reload: leaving sync_job";
3738 4291
3739 1 4292 1
3740 } or do { 4293 } or do {
3741 warn $@; 4294 error $@;
3742 cf::cleanup "error while reloading, exiting."; 4295 cf::cleanup "perl_reload: error, exiting.";
3743 }; 4296 };
3744 4297
3745 warn "reloaded";
3746 --$RELOAD; 4298 --$RELOAD;
3747 } 4299 }
4300
4301 $t1 = AE::time - $t1;
4302 info "perl_reload: completed in ${t1}s\n";
3748}; 4303};
3749 4304
3750our $RELOAD_WATCHER; # used only during reload 4305our $RELOAD_WATCHER; # used only during reload
3751 4306
3752sub reload_perl() { 4307sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 4308 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 4309 # coro crashes during coro_state_free->destroy here.
3755 4310
4311 $RELOAD_WATCHER ||= cf::async {
4312 Coro::AIO::aio_wait cache_extensions;
4313
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4314 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 4315 do_reload_perl;
3758 undef $RELOAD_WATCHER; 4316 undef $RELOAD_WATCHER;
4317 };
3759 }; 4318 };
3760} 4319}
3761 4320
3762register_command "reload" => sub { 4321register_command "reload" => sub {
3763 my ($who, $arg) = @_; 4322 my ($who, $arg) = @_;
3769 reload_perl; 4328 reload_perl;
3770 }; 4329 };
3771 } 4330 }
3772}; 4331};
3773 4332
3774unshift @INC, $LIBDIR; 4333#############################################################################
3775 4334
3776my $bug_warning = 0; 4335my $bug_warning = 0;
3777 4336
3778our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN;
3780
3781sub wait_for_tick { 4337sub wait_for_tick() {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 4338 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3783 4339
3784 my $signal = new Coro::Signal; 4340 $WAIT_FOR_TICK->wait;
3785 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait;
3787} 4341}
3788 4342
3789sub wait_for_tick_begin { 4343sub wait_for_tick_begin() {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3791 4345
3792 my $signal = new Coro::Signal; 4346 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 4347 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 4348 $signal->wait;
3795} 4349}
3799 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4353 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3800 unless ++$bug_warning > 10; 4354 unless ++$bug_warning > 10;
3801 return; 4355 return;
3802 } 4356 }
3803 4357
3804 cf::server_tick; # one server iteration 4358 cf::one_tick; # one server iteration
4359
4360 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3805 4361
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4362 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4363 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808 Coro::async_pool { 4364 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 4365 $Coro::current->{desc} = "runtime saver";
3810 write_runtime_sync 4366 write_runtime_sync
3811 or warn "ERROR: unable to write runtime file: $!"; 4367 or error "ERROR: unable to write runtime file: $!";
3812 }; 4368 };
3813 } 4369 }
3814 4370
3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4371 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3816 $sig->send; 4372 $sig->send;
3817 } 4373 }
3818 while (my $sig = shift @WAIT_FOR_TICK) { 4374 $WAIT_FOR_TICK->broadcast;
3819 $sig->send;
3820 }
3821 4375
3822 $LOAD = ($NOW - $TICK_START) / $TICK; 4376 $LOAD = ($NOW - $TICK_START) / $TICK;
3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4377 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3824 4378
3825 if (0) { 4379 if (0) {
3826 if ($NEXT_TICK) { 4380 if ($NEXT_TICK) {
3827 my $jitter = $TICK_START - $NEXT_TICK; 4381 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4382 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d# 4383 debug "jitter $JITTER\n";#d#
3830 } 4384 }
3831 } 4385 }
3832} 4386}
3833 4387
3834{ 4388{
3835 # configure BDB 4389 # configure BDB
4390 info "initialising database";
3836 4391
3837 BDB::min_parallel 8; 4392 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 4393 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 4394 #$AnyEvent::BDB::WATCHER->priority (1);
3840 4395
3841 unless ($DB_ENV) { 4396 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 4397 $DB_ENV = BDB::db_env_create;
3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4398 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4399 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3869 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4424 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3870 }; 4425 };
3871 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4426 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3872 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4427 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3873 }; 4428 };
4429
4430 info "database initialised";
3874} 4431}
3875 4432
3876{ 4433{
3877 # configure IO::AIO 4434 # configure IO::AIO
3878 4435
4436 info "initialising aio";
3879 IO::AIO::min_parallel 8; 4437 IO::AIO::min_parallel 8;
3880 IO::AIO::max_poll_time $TICK * 0.1; 4438 IO::AIO::max_poll_time $TICK * 0.1;
3881 undef $AnyEvent::AIO::WATCHER; 4439 undef $AnyEvent::AIO::WATCHER;
4440 info "aio initialised";
3882} 4441}
3883 4442
3884my $_log_backtrace; 4443our $_log_backtrace;
4444our $_log_backtrace_last;
3885 4445
3886sub _log_backtrace { 4446sub _log_backtrace {
3887 my ($msg, @addr) = @_; 4447 my ($msg, @addr) = @_;
3888 4448
3889 $msg =~ s/\n//; 4449 $msg =~ s/\n$//;
3890 4450
4451 if ($_log_backtrace_last eq $msg) {
4452 LOG llevInfo, "[ABT] $msg\n";
4453 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3891 # limit the # of concurrent backtraces 4454 # limit the # of concurrent backtraces
3892 if ($_log_backtrace < 2) { 4455 } elsif ($_log_backtrace < 2) {
4456 $_log_backtrace_last = $msg;
3893 ++$_log_backtrace; 4457 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg; 4458 my $perl_bt = Carp::longmess $msg;
3895 async { 4459 async {
3896 $Coro::current->{desc} = "abt $msg"; 4460 $Coro::current->{desc} = "abt $msg";
3897 4461
3917 LOG llevInfo, "[ABT] $_\n" for @bt; 4481 LOG llevInfo, "[ABT] $_\n" for @bt;
3918 --$_log_backtrace; 4482 --$_log_backtrace;
3919 }; 4483 };
3920 } else { 4484 } else {
3921 LOG llevInfo, "[ABT] $msg\n"; 4485 LOG llevInfo, "[ABT] $msg\n";
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4486 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3923 } 4487 }
3924} 4488}
3925 4489
3926# load additional modules 4490# load additional modules
3927use cf::pod; 4491require "cf/$_.pm" for @EXTRA_MODULES;
4492cf::_connect_to_perl_2;
3928 4493
3929END { cf::emergency_save } 4494END { cf::emergency_save }
3930 4495
39311 44961
3932 4497

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines