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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines