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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.452 by root, Tue Sep 23 00:24:52 2008 UTC vs.
Revision 1.606 by root, Sun Nov 18 08:34:23 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines