ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines