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.454 by root, Thu Sep 25 12:14:32 2008 UTC vs.
Revision 1.600 by root, Sun Nov 11 04:31:57 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines