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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines