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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines