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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.604 by root, Thu Nov 15 07:08:08 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 less 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,
571 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious)
573
574 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
575 reset_signals; 745 cf::post_fork;
576 &$cb 746 &$cb
577 }, @args; 747 } @args;
578 748
579 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
750}
751
752sub objinfo {
753 (
754 "counter value" => cf::object::object_count,
755 "objects created" => cf::object::create_count,
756 "objects destroyed" => cf::object::destroy_count,
757 "freelist size" => cf::object::free_count,
758 "allocated objects" => cf::object::objects_size,
759 "active objects" => cf::object::actives_size,
760 )
580} 761}
581 762
582=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
583 764
584=cut 765=cut
621within each server. 802within each server.
622 803
623=cut 804=cut
624 805
625sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
626 my ($name) = @_; 810 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
628 812
629 eval { 813 eval {
630 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
640} 824}
641 825
642our $DB; 826our $DB;
643 827
644sub db_init { 828sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
647 };
648} 830}
649 831
650sub db_get($$) { 832sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
652 834
653 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
654 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
655 839
656 $! ? () 840 $! ? ()
657 : $data 841 : $data
658 }
659} 842}
660 843
661sub db_put($$$) { 844sub db_put($$$) {
662 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 874
692 my @data; 875 my @data;
693 my $md5; 876 my $md5;
694 877
695 for (0 .. $#$src) { 878 for (0 .. $#$src) {
696 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
697 or Carp::croak "$src->[$_]: $!";
698 } 880 }
699 881
700 # if processing is expensive, check 882 # if processing is expensive, check
701 # checksum first 883 # checksum first
702 if (1) { 884 if (1) {
715 897
716 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
717 } 899 }
718 } 900 }
719 901
720 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
721 my $data = $process->(\@data); 903 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
723 905
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 907
726 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
729 911
739 921
740=cut 922=cut
741 923
742sub datalog($@) { 924sub datalog($@) {
743 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 927}
746 928
747=back 929=back
748 930
749=cut 931=cut
944 1126
945 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1129
948 } elsif (ref $type) { 1130 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
950 1132
951 } else { 1133 } else {
952 shift @arg; 1134 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
954 } 1136 }
955 } 1137 }
956} 1138}
957 1139
958sub _object_attach { 1140sub _object_attach {
968 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
969 } 1151 }
970 1152
971 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
972 } else { 1154 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1156 }
975 1157
976 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
977} 1159}
978 1160
1037 1219
1038 for (@$callbacks) { 1220 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1040 1222
1041 if ($@) { 1223 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1225 override;
1045 } 1226 }
1046 1227
1047 return 1 if $override; 1228 return 1 if $override;
1048 } 1229 }
1127 for (@$attach) { 1308 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1130 } 1311 }
1131 } else { 1312 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1314 }
1134 } 1315 }
1135} 1316}
1136 1317
1137cf::attachable->attach ( 1318cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1165 1346
1166 sync_job { 1347 sync_job {
1167 if (length $$rdata) { 1348 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1171 1353
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1357 if ($cf::USE_FSYNC) {
1358 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1359 aio_fsync $fh;
1360 }
1176 aio_close $fh; 1361 aio_close $fh;
1177 1362
1178 if (@$objs) { 1363 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1364 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1365 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1368 if ($cf::USE_FSYNC) {
1369 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1370 aio_fsync $fh;
1371 }
1184 aio_close $fh; 1372 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1374 }
1187 } else { 1375 } else {
1188 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1189 } 1377 }
1190 1378
1191 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1192 1380
1193 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1383 } else {
1196 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1197 } 1385 }
1198 } else { 1386 } else {
1199 aio_unlink $filename; 1387 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1201 } 1389 }
1225 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs}; 1414 $av = $st->{objs};
1227 } 1415 }
1228 1416
1229 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1230 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1231 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1232 1421
1233 ($data, $av) 1422 ($data, $av)
1234} 1423}
1235 1424
1236=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1240=cut 1429=cut
1241 1430
1242############################################################################# 1431#############################################################################
1243# command handling &c 1432# command handling &c
1244 1433
1245=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1246 1435
1247Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1248$name. 1437$name.
1249 1438
1250=cut 1439=cut
1256 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1257 1446
1258 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1259} 1448}
1260 1449
1261=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1262 1451
1263Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1264extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1265received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1266the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1267has logged in successfully. 1456has logged in successfully.
1268 1457
1269If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1270called.
1271 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1272=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1273 1466
1274Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1275exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1276are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1277is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1278log-in. 1471log-in.
1279 1472
1280If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1281called.
1282 1474
1283=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1284 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1285sub register_extcmd { 1482sub register_extcmd($$) {
1286 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1287 1484
1288 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1289} 1486}
1290 1487
1291sub register_exticmd { 1488sub register_async_extcmd($$) {
1292 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1293 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1294 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1295} 1498}
1296 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1297cf::player->attach ( 1508cf::player->attach (
1298 on_command => sub { 1509 on_unknown_command => sub {
1299 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1300 1511
1301 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1302 or return; 1513 or return;
1303 1514
1311 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1312 1523
1313 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1314 1525
1315 if (ref $msg) { 1526 if (ref $msg) {
1316 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1317 "ARRAY" eq ref $msg
1318 ? @$msg
1319 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1320 1528
1321 my @reply;
1322
1323 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1324 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1325 } 1547 }
1326 1548
1327 $pl->ext_reply ($reply, @reply)
1328 if $reply;
1329
1330 } else { 1549 } else {
1331 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1332 } 1551 }
1333 1552
1334 cf::override; 1553 cf::override;
1335 }, 1554 },
1336); 1555);
1337 1556
1557# "readahead" all extensions
1558sub cache_extensions {
1559 my $grp = IO::AIO::aio_group;
1560
1561 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1562 for (grep /\.ext$/, @{$_[0]}) {
1563 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1564 }
1565 };
1566
1567 $grp
1568}
1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1338sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1339 cf::sync_job { 1586 cf::sync_job {
1340 my %todo; 1587 my %todo;
1341 1588
1342 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1343 next unless -r $path; 1590 next unless -r $path;
1361 1608
1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1364 1611
1365 $ext{source} = 1612 $ext{source} =
1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1367 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1368 . $source 1615 . $source
1369 . "\n};\n1"; 1616 . "\n};\n1";
1370 1617
1371 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1372 } 1619 }
1373 1620
1621 my $pass = 0;
1374 my %done; 1622 my %done;
1375 while (%todo) { 1623 while (%todo) {
1376 my $progress; 1624 my $progress;
1377 1625
1626 ++$pass;
1627
1628 ext:
1378 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1379 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1380 goto skip 1631 next ext
1381 unless exists $done{$_}; 1632 unless exists $done{$_};
1382 } 1633 }
1383 1634
1384 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1385 1636
1386 unless (eval $v->{source}) { 1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1646 my $active = eval $source;
1647
1648 if (length $@) {
1387 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1388 : "$v->{base}: extension inactive.\n";
1389 1650
1390 if (exists $v->{meta}{mandatory}) {
1391 warn $msg;
1392 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1393 } 1652 if exists $v->{meta}{mandatory};
1394 1653
1395 warn $msg; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1655 delete $todo{$k};
1656 } else {
1657 $done{$k} = delete $todo{$k};
1658 push @EXTS, $v->{pkg};
1659 $progress = 1;
1660
1661 info "$v->{base}: extension inactive.\n"
1662 unless $active;
1396 } 1663 }
1397
1398 $done{$k} = delete $todo{$k};
1399 push @EXTS, $v->{pkg};
1400 $progress = 1;
1401 } 1664 }
1402 1665
1403 skip: 1666 unless ($progress) {
1404 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1405 unless $progress; 1668
1669 while (my ($k, $v) = each %todo) {
1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1671 if exists $v->{meta}{mandatory};
1672 }
1673
1674 last;
1675 }
1406 } 1676 }
1407 }; 1677 };
1408} 1678}
1409 1679
1410############################################################################# 1680#############################################################################
1494 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1495 } 1765 }
1496 } 1766 }
1497} 1767}
1498 1768
1769cf::player->attach (
1770 on_load => sub {
1771 my ($pl, $path) = @_;
1772
1773 # restore slots saved in save, below
1774 my $slots = delete $pl->{_slots};
1775
1776 $pl->ob->current_weapon ($slots->[0]);
1777 $pl->combat_ob ($slots->[1]);
1778 $pl->ranged_ob ($slots->[2]);
1779 },
1780);
1781
1499sub save($) { 1782sub save($) {
1500 my ($pl) = @_; 1783 my ($pl) = @_;
1501 1784
1502 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1503 1786
1508 1791
1509 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1510 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1511 1794
1512 cf::get_slot 0.01; 1795 cf::get_slot 0.01;
1796
1797 # save slots, to be restored later
1798 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1513 1799
1514 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1515 cf::cede_to_tick; 1801 cf::cede_to_tick;
1516} 1802}
1517 1803
1551 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1552 1838
1553 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1555 1841
1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1557 $pl->deactivate; 1843 $pl->deactivate;
1844
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1560 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1561 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1562 1850
1563 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1564 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1565 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1619 \@logins 1907 \@logins
1620} 1908}
1621 1909
1622=item $player->maps 1910=item $player->maps
1623 1911
1912=item cf::player::maps $login
1913
1624Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1625player. May block. 1915player. May block.
1626 1916
1627=cut 1917=cut
1628 1918
1649 1939
1650=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1651 1941
1652Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1653 1943
1654=item $player->ext_reply ($msgid, @msg)
1655
1656Sends an ext reply to the player.
1657
1658=cut
1659
1660sub ext_reply($$@) {
1661 my ($self, $id, @msg) = @_;
1662
1663 $self->ns->ext_reply ($id, @msg)
1664}
1665
1666=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1667 1945
1668Sends an ext event to the client. 1946Sends an ext event to the client.
1669 1947
1670=cut 1948=cut
1689 1967
1690=cut 1968=cut
1691 1969
1692sub find_by_path($) { 1970sub find_by_path($) {
1693 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1694 1974
1695 my ($match, $specificity); 1975 my ($match, $specificity);
1696 1976
1697 for my $region (list) { 1977 for my $region (list) {
1698 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1727sub generate_random_map { 2007sub generate_random_map {
1728 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1729 2009
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731 2011
1732 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1741 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1742 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1743 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1744 (cf::region::find $rmp->{region}), $rmp->{custom}
1745 )
1746} 2013}
1747 2014
1748=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1749 2016
1750Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1755 2022
1756sub register { 2023sub register {
1757 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 2025 my $pkg = caller;
1759 2026
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 2028
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 2030}
1765 2031
1766# also paths starting with '/' 2032# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 2034
1769sub thawer_merge { 2035sub thawer_merge {
1770 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1771 2037
1772 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1777} 2043}
1778 2044
1779sub normalise { 2045sub normalise {
1780 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1781 2047
1782 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1783 2049
1784 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1785 2051
1786 # map plan: 2052 # map plan:
1787 # 2053 #
1802 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1803 $path = "$base/$path"; 2069 $path = "$base/$path";
1804 } 2070 }
1805 2071
1806 for ($path) { 2072 for ($path) {
1807 redo if s{//}{/};
1808 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1809 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1810 } 2075 }
1811 2076
1812 $path 2077 $path
1826 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1827 return $self; 2092 return $self;
1828 } 2093 }
1829 } 2094 }
1830 2095
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 2097 ()
1833} 2098}
1834 2099
2100# may re-bless or do other evil things
1835sub init { 2101sub init {
1836 my ($self) = @_; 2102 my ($self) = @_;
1837 2103
1838 $self 2104 $self
1839} 2105}
1870 2136
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1873} 2139}
1874 2140
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 2141sub decay_objects {
1885 my ($self) = @_; 2142 my ($self) = @_;
1886 2143
1887 return if $self->{deny_reset}; 2144 return if $self->{deny_reset};
1888 2145
1913 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1914 2171
1915 1 2172 1
1916} 2173}
1917 2174
2175# used to laod the header of an original map
1918sub load_header_orig { 2176sub load_header_orig {
1919 my ($self) = @_; 2177 my ($self) = @_;
1920 2178
1921 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1922} 2180}
1923 2181
2182# used to laod the header of an instantiated map
1924sub load_header_temp { 2183sub load_header_temp {
1925 my ($self) = @_; 2184 my ($self) = @_;
1926 2185
1927 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1928} 2187}
1929 2188
2189# called after loading the header from an instantiated map
1930sub prepare_temp { 2190sub prepare_temp {
1931 my ($self) = @_; 2191 my ($self) = @_;
1932 2192
1933 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1934 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1935 # safety 2195 # safety
1936 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1937 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1938} 2198}
1939 2199
2200# called after loading the header from an original map
1940sub prepare_orig { 2201sub prepare_orig {
1941 my ($self) = @_; 2202 my ($self) = @_;
1942 2203
1943 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1944 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1968 2229
1969sub find; 2230sub find;
1970sub find { 2231sub find {
1971 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1972 2233
2234 cf::cede_to_tick;
2235
1973 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1974 2237
1975 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2240
1978 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
1983 or return; 2243 or return;
1984 2244
1985 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
1986 2246
1998 2258
1999 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
2000 } 2260 }
2001} 2261}
2002 2262
2003sub pre_load { } 2263sub pre_load { }
2004sub post_load { } 2264#sub post_load { } # XS
2005 2265
2006sub load { 2266sub load {
2007 my ($self) = @_; 2267 my ($self) = @_;
2008 2268
2009 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2012 2272
2013 { 2273 {
2014 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2015 2275
2016 return unless $self->valid; 2276 return unless $self->valid;
2017 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2018
2019 $self->in_memory (cf::MAP_LOADING);
2020 2278
2021 $self->alloc; 2279 $self->alloc;
2022 2280
2023 $self->pre_load; 2281 $self->pre_load;
2024 cf::cede_to_tick; 2282 cf::cede_to_tick;
2025 2283
2284 if (exists $self->{load_path}) {
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2286 $f->skip_block;
2028 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2029 or return; 2288 or return;
2030 2289
2031 $self->post_load_original 2290 $self->post_load_original
2032 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2033 2292
2034 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2294 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2038 $self->clear_unique_items; 2297 $self->clear_unique_items;
2039 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2041 } 2301 }
2042 } 2302 }
2043 }
2044 2303
2045 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2046 2311
2047 cf::cede_to_tick; 2312 cf::cede_to_tick;
2048 # now do the right thing for maps 2313 # now do the right thing for maps
2049 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2050 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2054 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2320 $self->decay_objects;
2056 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2057 $self->update_buttons; 2322 $self->update_buttons;
2058 cf::cede_to_tick; 2323 cf::cede_to_tick;
2059 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2060 cf::cede_to_tick;
2061 $self->activate;
2062 } 2325 }
2063 2326
2064 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2066
2067 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2329 }
2069 2330
2070 $self->post_load; 2331 $self->post_load;
2071}
2072 2332
2333 1
2334}
2335
2336# customize the map for a given player, i.e.
2337# return the _real_ map. used by e.g. per-player
2338# maps to change the path to ~playername/mappath
2073sub customise_for { 2339sub customise_for {
2074 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2075 2341
2076 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2343 if $self->per_player;
2080# if $self->per_party; 2346# if $self->per_party;
2081 2347
2082 $self 2348 $self
2083} 2349}
2084 2350
2085# find and load all maps in the 3x3 area around a map
2086sub load_neighbours {
2087 my ($map) = @_;
2088
2089 my @neigh; # diagonal neighbours
2090
2091 for (0 .. 3) {
2092 my $neigh = $map->tile_path ($_)
2093 or next;
2094 $neigh = find $neigh, $map
2095 or next;
2096 $neigh->load;
2097
2098 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 }
2102
2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
2105 my $neigh = find $path, $origin
2106 or next;
2107 $neigh->load;
2108 }
2109}
2110
2111sub find_sync { 2351sub find_sync {
2112 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2113 2353
2114 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2115} 2359}
2116 2360
2117sub do_load_sync { 2361sub do_load_sync {
2118 my ($map) = @_; 2362 my ($map) = @_;
2119 2363
2364 # it's a bug to call this from the main context
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2122 2367
2123 cf::sync_job { $map->load }; 2368 $map->load;
2124} 2369}
2125 2370
2126our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2128 2373
2129sub find_async { 2374sub find_async {
2130 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2131 2376
2132 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2133 2378
2134 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2136 } 2381 }
2137 2382
2138 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2139 2384
2140 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2155 2400
2156 () 2401 ()
2157} 2402}
2158 2403
2404# common code, used by both ->save and ->swapout
2159sub save { 2405sub _save {
2160 my ($self) = @_; 2406 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2407
2164 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2165 2409
2166 return unless $self->dirty; 2410 return unless $self->dirty;
2167 2411
2187 } else { 2431 } else {
2188 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2432 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2189 } 2433 }
2190} 2434}
2191 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2192sub swap_out { 2444sub swap_out {
2193 my ($self) = @_; 2445 my ($self) = @_;
2194 2446
2195 # save first because save cedes
2196 $self->save;
2197
2198 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2199 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2200 return if $self->players; 2451 return if $self->players;
2201 return if $self->in_memory != cf::MAP_ACTIVE; 2452
2453 # first deactivate the map and "unlink" it from the core
2454 $self->deactivate;
2455 $_->clear_links_to ($self) for values %cf::MAP;
2456 $self->state (cf::MAP_SWAPPED);
2457
2458 # then atomically save
2459 $self->_save;
2460
2461 # then free the map
2462 $self->clear;
2463}
2464
2465sub reset_at {
2466 my ($self) = @_;
2467
2468 # TODO: safety, remove and allow resettable per-player maps
2202 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2203 2470
2471 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2472 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2473
2474 $time + $to
2475}
2476
2477sub should_reset {
2478 my ($self) = @_;
2479
2480 $self->reset_at <= $cf::RUNTIME
2481}
2482
2483sub reset {
2484 my ($self) = @_;
2485
2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2487
2488 return if $self->players;
2489
2490 cf::trace "resetting map ", $self->path, "\n";
2491
2204 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2493
2494 # need to save uniques path
2495 unless ($self->{deny_save}) {
2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2497
2498 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2499 if $uniq;
2500 }
2501
2502 delete $cf::MAP{$self->path};
2205 2503
2206 $self->deactivate; 2504 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2208 $self->clear; 2506 $self->clear;
2209}
2210
2211sub reset_at {
2212 my ($self) = @_;
2213
2214 # TODO: safety, remove and allow resettable per-player maps
2215 return 1e99 if $self->{deny_reset};
2216
2217 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2218 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2219
2220 $time + $to
2221}
2222
2223sub should_reset {
2224 my ($self) = @_;
2225
2226 $self->reset_at <= $cf::RUNTIME
2227}
2228
2229sub reset {
2230 my ($self) = @_;
2231
2232 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233
2234 return if $self->players;
2235
2236 warn "resetting map ", $self->path;
2237
2238 $self->in_memory (cf::MAP_SWAPPED);
2239
2240 # need to save uniques path
2241 unless ($self->{deny_save}) {
2242 my $uniq = $self->uniq_path; utf8::encode $uniq;
2243
2244 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2245 if $uniq;
2246 }
2247
2248 delete $cf::MAP{$self->path};
2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear;
2253 2507
2254 $self->unlink_save; 2508 $self->unlink_save;
2255 $self->destroy; 2509 $self->destroy;
2256} 2510}
2257 2511
2265 2519
2266 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2267 2521
2268 $self->unlink_save; 2522 $self->unlink_save;
2269 2523
2270 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2271 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2272 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2273 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2275 2529
2332 : normalise $_ 2586 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2588 ]
2335} 2589}
2336 2590
2591=item cf::map::static_maps
2592
2593Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2594file in the shared directory excluding F</styles> and F</editor>). May
2595block.
2596
2597=cut
2598
2599sub static_maps() {
2600 my @dirs = "";
2601 my @maps;
2602
2603 while (@dirs) {
2604 my $dir = shift @dirs;
2605
2606 next if $dir eq "/styles" || $dir eq "/editor";
2607
2608 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2609 or return;
2610
2611 for (@$files) {
2612 s/\.map$// or next;
2613 utf8::decode $_;
2614 push @maps, "$dir/$_";
2615 }
2616
2617 push @dirs, map "$dir/$_", @$dirs;
2618 }
2619
2620 \@maps
2621}
2622
2337=back 2623=back
2338 2624
2339=head3 cf::object 2625=head3 cf::object
2340 2626
2341=cut 2627=cut
2364 2650
2365Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2366 2652
2367=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2368 2654
2369returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2370even if the object actually exists. May block. 2656even if the object actually exists. May block.
2371 2657
2372=cut 2658=cut
2373 2659
2374sub deref { 2660sub deref {
2406 2692
2407our $SAY_CHANNEL = { 2693our $SAY_CHANNEL = {
2408 id => "say", 2694 id => "say",
2409 title => "Map", 2695 title => "Map",
2410 reply => "say ", 2696 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2697 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2412}; 2698};
2413 2699
2414our $CHAT_CHANNEL = { 2700our $CHAT_CHANNEL = {
2415 id => "chat", 2701 id => "chat",
2416 title => "Chat", 2702 title => "Chat",
2473 2759
2474Freezes the player and moves him/her to a special map (C<{link}>). 2760Freezes the player and moves him/her to a special map (C<{link}>).
2475 2761
2476The player should be reasonably safe there for short amounts of time (e.g. 2762The player should be reasonably safe there for short amounts of time (e.g.
2477for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2763for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link 2764though, as the player cannot control the character while it is on the link
2479map. 2765map.
2480 2766
2481Will never block. 2767Will never block.
2482 2768
2483=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2504sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2505 my ($self) = @_; 2791 my ($self) = @_;
2506 2792
2507 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2508 2794
2795 ++$self->{_link_recursion};
2796
2509 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2510 2798
2511 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2512 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2513 2801
2514 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2515} 2803}
2516 2804
2517sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2518 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2519 2807
2536 ($x, $y) = (-1, -1) 2824 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2825 unless (defined $x) && (defined $y);
2538 2826
2539 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2542 2830
2543 $map->load; 2831 $map->load;
2544 $map->load_neighbours;
2545 2832
2546 return unless $self->contr->active; 2833 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2834
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2552} 2837 # entering was successful
2838 delete $self->{_link_recursion};
2839 # only activate afterwards, to support waiting in hooks
2840 $self->activate_recursive;
2841 }
2553 2842
2843}
2844
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2845=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2555 2846
2556Moves the player to the given map-path and coordinates by first freezing 2847Moves the player to the given map-path and coordinates by first freezing
2557her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2558that has to return the map if sucecssful, and then unfreezes the player on 2849that has to return the map if sucecssful, and then unfreezes the player on
2559the new (success) or old (failed) map position. In either case, $done will 2850the new (success) or old (failed) map position. In either case, $done will
2566 2857
2567our $GOTOGEN; 2858our $GOTOGEN;
2568 2859
2569sub cf::object::player::goto { 2860sub cf::object::player::goto {
2570 my ($self, $path, $x, $y, $check, $done) = @_; 2861 my ($self, $path, $x, $y, $check, $done) = @_;
2862
2863 if ($self->{_link_recursion} >= $MAX_LINKS) {
2864 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2865 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2866 ($path, $x, $y) = @$EMERGENCY_POSITION;
2867 }
2571 2868
2572 # do generation counting so two concurrent goto's will be executed in-order 2869 # do generation counting so two concurrent goto's will be executed in-order
2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2574 2871
2575 $self->enter_link; 2872 $self->enter_link;
2595 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2596 } 2893 }
2597 } 2894 }
2598 2895
2599 my $map = eval { 2896 my $map = eval {
2600 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2601 2898
2602 if ($map) { 2899 if ($map) {
2603 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2604 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2605 } else { 2902 } else {
2606 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2903 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2607 } 2904 }
2608 2905
2609 $map 2906 $map
2617 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2618 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2619 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2620 } 2917 }
2621 2918
2622 $done->() if $done; 2919 $done->($self) if $done;
2623 })->prio (1); 2920 })->prio (1);
2624} 2921}
2625 2922
2626=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2627 2924
2695 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2696 2993
2697 unless (eval { 2994 unless (eval {
2698 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2699 2996
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2709 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2710 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2711 3023
2712 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2713 3025
2714 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2720 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2721 . "I'll try to bring you back to the map you were before. " 3033 . "I'll try to bring you back to the map you were before. "
2722 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2723 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2724 3036
2725 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2726 $self->leave_link; 3038 $self->leave_link;
2727 } 3039 }
2728 })->prio (1); 3040 })->prio (1);
2729} 3041}
2730 3042
2742sub cf::client::send_drawinfo { 3054sub cf::client::send_drawinfo {
2743 my ($self, $text, $flags) = @_; 3055 my ($self, $text, $flags) = @_;
2744 3056
2745 utf8::encode $text; 3057 utf8::encode $text;
2746 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3058 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3059}
3060
3061=item $client->send_big_packet ($pkt)
3062
3063Like C<send_packet>, but tries to compress large packets, and fragments
3064them as required.
3065
3066=cut
3067
3068our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3069
3070sub cf::client::send_big_packet {
3071 my ($self, $pkt) = @_;
3072
3073 # try lzf for large packets
3074 $pkt = "lzf " . Compress::LZF::compress $pkt
3075 if 1024 <= length $pkt and $self->{can_lzf};
3076
3077 # split very large packets
3078 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3079 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3080 $pkt = "frag";
3081 }
3082
3083 $self->send_packet ($pkt);
2747} 3084}
2748 3085
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 3086=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 3087
2751Send a drawinfo or msg packet to the client, formatting the msg for the 3088Send a drawinfo or msg packet to the client, formatting the msg for the
2755 3092
2756=cut 3093=cut
2757 3094
2758# non-persistent channels (usually the info channel) 3095# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 3096our %CHANNEL = (
3097 "c/motd" => {
3098 id => "infobox",
3099 title => "MOTD",
3100 reply => undef,
3101 tooltip => "The message of the day",
3102 },
2760 "c/identify" => { 3103 "c/identify" => {
2761 id => "infobox", 3104 id => "infobox",
2762 title => "Identify", 3105 title => "Identify",
2763 reply => undef, 3106 reply => undef,
2764 tooltip => "Items recently identified", 3107 tooltip => "Items recently identified",
2766 "c/examine" => { 3109 "c/examine" => {
2767 id => "infobox", 3110 id => "infobox",
2768 title => "Examine", 3111 title => "Examine",
2769 reply => undef, 3112 reply => undef,
2770 tooltip => "Signs and other items you examined", 3113 tooltip => "Signs and other items you examined",
3114 },
3115 "c/shopinfo" => {
3116 id => "infobox",
3117 title => "Shop Info",
3118 reply => undef,
3119 tooltip => "What your bargaining skill tells you about the shop",
2771 }, 3120 },
2772 "c/book" => { 3121 "c/book" => {
2773 id => "infobox", 3122 id => "infobox",
2774 title => "Book", 3123 title => "Book",
2775 reply => undef, 3124 reply => undef,
2791 id => "infobox", 3140 id => "infobox",
2792 title => "Body Parts", 3141 title => "Body Parts",
2793 reply => undef, 3142 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 3143 tooltip => "Shows which body parts you posess and are available",
2795 }, 3144 },
3145 "c/statistics" => {
3146 id => "infobox",
3147 title => "Statistics",
3148 reply => undef,
3149 tooltip => "Shows your primary statistics",
3150 },
2796 "c/skills" => { 3151 "c/skills" => {
2797 id => "infobox", 3152 id => "infobox",
2798 title => "Skills", 3153 title => "Skills",
2799 reply => undef, 3154 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 3155 tooltip => "Shows your experience per skill and item power",
3156 },
3157 "c/shopitems" => {
3158 id => "infobox",
3159 title => "Shop Items",
3160 reply => undef,
3161 tooltip => "Shows the items currently for sale in this shop",
3162 },
3163 "c/resistances" => {
3164 id => "infobox",
3165 title => "Resistances",
3166 reply => undef,
3167 tooltip => "Shows your resistances",
3168 },
3169 "c/pets" => {
3170 id => "infobox",
3171 title => "Pets",
3172 reply => undef,
3173 tooltip => "Shows information abotu your pets/a specific pet",
3174 },
3175 "c/perceiveself" => {
3176 id => "infobox",
3177 title => "Perceive Self",
3178 reply => undef,
3179 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3180 },
2802 "c/uptime" => { 3181 "c/uptime" => {
2803 id => "infobox", 3182 id => "infobox",
2804 title => "Uptime", 3183 title => "Uptime",
2805 reply => undef, 3184 reply => undef,
2815 id => "party", 3194 id => "party",
2816 title => "Party", 3195 title => "Party",
2817 reply => "gsay ", 3196 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 3197 tooltip => "Messages and chat related to your party",
2819 }, 3198 },
3199 "c/death" => {
3200 id => "death",
3201 title => "Death",
3202 reply => undef,
3203 tooltip => "Reason for and more info about your most recent death",
3204 },
3205 "c/fatal" => {
3206 id => "fatal",
3207 title => "Fatal Error",
3208 reply => undef,
3209 tooltip => "Reason for the server disconnect",
3210 },
3211 "c/say" => $SAY_CHANNEL,
3212 "c/chat" => $CHAT_CHANNEL,
2820); 3213);
2821 3214
2822sub cf::client::send_msg { 3215sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 3216 my ($self, $channel, $msg, $color, @extra) = @_;
2824 3217
2829 3222
2830 # check predefined channels, for the benefit of C 3223 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 3224 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 3225 $channel = $CHANNEL{$channel};
2833 3226
2834 $self->ext_msg (channel_info => $channel) 3227 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 3228 $channel = $channel->{id};
2838 3229
2839 } elsif (ref $channel) { 3230 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 3231 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 3232 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 3233 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 3234 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 3235 }
2846 3236
2847 $channel = $channel->{id}; 3237 $channel = $channel->{id};
2848 } 3238 }
2849 3239
2850 return unless @extra || length $msg; 3240 return unless @extra || length $msg;
2851 3241
2852 if ($self->can_msg) {
2853 # default colour, mask it out 3242 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3243 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 3244 if $color & cf::NDI_DEF;
2856 3245
2857 my $pkt = "msg " 3246 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3247 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3248 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3249 );
2861 3250
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3251 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 3252}
2899 3253
2900=item $client->ext_msg ($type, @msg) 3254=item $client->ext_msg ($type, @msg)
2901 3255
2902Sends an ext event to the client. 3256Sends an ext event to the client.
2904=cut 3258=cut
2905 3259
2906sub cf::client::ext_msg($$@) { 3260sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 3261 my ($self, $type, @msg) = @_;
2908 3262
2909 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3263 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 }
2915}
2916
2917=item $client->ext_reply ($msgid, @msg)
2918
2919Sends an ext reply to the client.
2920
2921=cut
2922
2923sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_;
2925
2926 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 }
2933} 3264}
2934 3265
2935=item $success = $client->query ($flags, "text", \&cb) 3266=item $success = $client->query ($flags, "text", \&cb)
2936 3267
2937Queues a query to the client, calling the given callback with 3268Queues a query to the client, calling the given callback with
2992 my ($ns, $buf) = @_; 3323 my ($ns, $buf) = @_;
2993 3324
2994 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3325 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2995 3326
2996 if (ref $msg) { 3327 if (ref $msg) {
2997 my ($type, $reply, @payload) = 3328 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2998 "ARRAY" eq ref $msg
2999 ? @$msg
3000 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3001 3329
3002 my @reply;
3003
3004 if (my $cb = $EXTICMD{$type}) { 3330 if (my $cb = $EXTIACMD{$type}) {
3331 $cb->(
3332 $ns,
3333 sub {
3334 $ns->ext_msg ("reply-$reply", @_)
3335 if $reply;
3336 },
3337 @payload
3338 );
3339 } else {
3340 my @reply;
3341
3342 if (my $cb = $EXTICMD{$type}) {
3005 @reply = $cb->($ns, @payload); 3343 @reply = $cb->($ns, @payload);
3344 }
3345
3346 $ns->ext_msg ("reply-$reply", @reply)
3347 if $reply;
3006 } 3348 }
3007
3008 $ns->ext_reply ($reply, @reply)
3009 if $reply;
3010
3011 } else { 3349 } else {
3012 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3350 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3013 } 3351 }
3014 3352
3015 cf::override; 3353 cf::override;
3016 }, 3354 },
3017); 3355);
3037 3375
3038 $coro 3376 $coro
3039} 3377}
3040 3378
3041cf::client->attach ( 3379cf::client->attach (
3042 on_destroy => sub { 3380 on_client_destroy => sub {
3043 my ($ns) = @_; 3381 my ($ns) = @_;
3044 3382
3045 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3383 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3046 }, 3384 },
3047); 3385);
3063our $safe_hole = new Safe::Hole; 3401our $safe_hole = new Safe::Hole;
3064 3402
3065$SIG{FPE} = 'IGNORE'; 3403$SIG{FPE} = 'IGNORE';
3066 3404
3067$safe->permit_only (Opcode::opset qw( 3405$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3406 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3407 grepstart grepwhile mapstart mapwhile
3070 sort time 3408 sort time
3071)); 3409));
3072 3410
3073# here we export the classes and methods available to script code 3411# here we export the classes and methods available to script code
3077The following functions and methods are available within a safe environment: 3415The following functions and methods are available within a safe environment:
3078 3416
3079 cf::object 3417 cf::object
3080 contr pay_amount pay_player map x y force_find force_add destroy 3418 contr pay_amount pay_player map x y force_find force_add destroy
3081 insert remove name archname title slaying race decrease split 3419 insert remove name archname title slaying race decrease split
3420 value
3082 3421
3083 cf::object::player 3422 cf::object::player
3084 player 3423 player
3085 3424
3086 cf::player 3425 cf::player
3092=cut 3431=cut
3093 3432
3094for ( 3433for (
3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3434 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3096 insert remove inv nrof name archname title slaying race 3435 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3436 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3437 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3438 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3439 ["cf::map" => qw(trigger)],
3101) { 3440) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3441 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3442 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3443 for @funs;
3106} 3444}
3107 3445
3122 3460
3123 my $qcode = $code; 3461 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3462 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3463 $qcode =~ s/\n/\\n/g;
3126 3464
3465 %vars = (_dummy => 0) unless %vars;
3466
3467 my @res;
3127 local $_; 3468 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3469
3130 my $eval = 3470 my $eval =
3131 "do {\n" 3471 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3472 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3473 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3474 . $code
3135 . "\n}" 3475 . "\n}"
3136 ; 3476 ;
3137 3477
3478 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3479 sub_generation_inc;
3480 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3481 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 sub_generation_inc; 3482 sub_generation_inc;
3483 } else {
3484 local @cf::_safe_eval_args = values %vars;
3485 @res = wantarray ? eval eval : scalar eval $eval;
3486 }
3141 3487
3142 if ($@) { 3488 if ($@) {
3143 warn "$@"; 3489 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3490 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3491 "with arguments " . (join " ", %vars) . "\n";
3146 } 3492 }
3147 3493
3148 wantarray ? @res : $res[0] 3494 wantarray ? @res : $res[0]
3149} 3495}
3150 3496
3164=cut 3510=cut
3165 3511
3166sub register_script_function { 3512sub register_script_function {
3167 my ($fun, $cb) = @_; 3513 my ($fun, $cb) = @_;
3168 3514
3169 no strict 'refs'; 3515 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3516 *$fun = $safe_hole->wrap ($cb);
3171} 3517}
3172 3518
3173=back 3519=back
3174 3520
3175=cut 3521=cut
3176 3522
3177############################################################################# 3523#############################################################################
3178# the server's init and main functions 3524# the server's init and main functions
3179 3525
3526{
3527 package cf::face;
3528
3529 our %HASH; # hash => idx
3530 our @DATA; # dynamically-created facedata, only faceste 0 used
3531 our @FOFS; # file offset, if > 0
3532 our @SIZE; # size of face, in octets
3533 our @META; # meta hash of face, if any
3534 our $DATAFH; # facedata filehandle
3535
3536 # internal api, not finalised
3537 sub set {
3538 my ($name, $type, $data) = @_;
3539
3540 my $idx = cf::face::find $name;
3541
3542 if ($idx) {
3543 delete $HASH{cf::face::get_chksum $idx};
3544 } else {
3545 $idx = cf::face::alloc $name;
3546 }
3547
3548 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3549
3550 cf::face::set_type $idx, $type;
3551 cf::face::set_csum $idx, 0, $hash;
3552
3553 # we need to destroy the SV itself, not just modify it, as a running ix
3554 # might hold a reference to it: "delete" achieves that.
3555 delete $FOFS[0][$idx];
3556 delete $DATA[0][$idx];
3557 $DATA[0][$idx] = $data;
3558 $SIZE[0][$idx] = length $data;
3559 delete $META[$idx];
3560 $HASH{$hash} = $idx;#d#
3561
3562 $idx
3563 }
3564
3565 sub _get_data($$$) {
3566 my ($idx, $set, $cb) = @_;
3567
3568 if (defined $DATA[$set][$idx]) {
3569 $cb->($DATA[$set][$idx]);
3570 } elsif (my $fofs = $FOFS[$set][$idx]) {
3571 my $size = $SIZE[$set][$idx];
3572 my $buf;
3573 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3574 if ($_[0] == $size) {
3575 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3576 $cb->($buf);
3577 } else {
3578 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3579 }
3580 };
3581 } else {
3582 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3583 }
3584 }
3585
3586 # rather ineffient
3587 sub cf::face::get_data($;$) {
3588 my ($idx, $set) = @_;
3589
3590 _get_data $idx, $set, Coro::rouse_cb;
3591 Coro::rouse_wait
3592 }
3593
3594 sub cf::face::ix {
3595 my ($ns, $set, $idx, $pri) = @_;
3596
3597 _get_data $idx, $set, sub {
3598 $ns->ix_send ($idx, $pri, $_[0]);
3599 };
3600 }
3601}
3602
3180sub load_facedata($) { 3603sub load_facedata($) {
3181 my ($path) = @_; 3604 my ($path) = @_;
3182 3605
3183 # HACK to clear player env face cache, we need some signal framework
3184 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = ();
3186
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3606 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3607
3189 warn "loading facedata from $path\n"; 3608 trace "loading facedata from $path\n";
3190 3609
3191 my $facedata; 3610 my $facedata = decode_storable load_file "$path/faceinfo";
3192 0 < aio_load $path, $facedata
3193 or die "$path: $!";
3194
3195 $facedata = Coro::Storable::thaw $facedata;
3196 3611
3197 $facedata->{version} == 2 3612 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3613 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3199 3614
3200 # patch in the exptable 3615 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3201 $facedata->{resource}{"res/exp_table"} = { 3616 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3202 type => FT_RSRC, 3617
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3618 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3204 }; 3619
3205 cf::cede_to_tick; 3620 # BEGIN ATOMIC
3621 # from here on, everything must be atomic - no thread switch allowed
3622 my $t1 = EV::time;
3206 3623
3207 { 3624 {
3208 my $faces = $facedata->{faceinfo}; 3625 my $faces = $facedata->{faceinfo};
3209 3626
3210 while (my ($face, $info) = each %$faces) { 3627 for my $face (sort keys %$faces) {
3628 my $info = $faces->{$face};
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3629 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3630
3213 cf::face::set_visibility $idx, $info->{visibility}; 3631 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3632 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3633 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3634 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3217 3635 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3218 cf::cede_to_tick; 3636 $cf::face::HASH{$info->{hash64}} = $idx;
3637 delete $cf::face::META[$idx];
3219 } 3638 }
3220 3639
3221 while (my ($face, $info) = each %$faces) { 3640 while (my ($face, $info) = each %$faces) {
3222 next unless $info->{smooth}; 3641 next unless $info->{smooth};
3223 3642
3226 3645
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3646 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3647 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3648 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3649 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3650 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3651 }
3233
3234 cf::cede_to_tick;
3235 } 3652 }
3236 } 3653 }
3237 3654
3238 { 3655 {
3239 my $anims = $facedata->{animinfo}; 3656 my $anims = $facedata->{animinfo};
3240 3657
3241 while (my ($anim, $info) = each %$anims) { 3658 while (my ($anim, $info) = each %$anims) {
3242 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3659 cf::anim::set $anim, $info->{frames}, $info->{facings};
3243 cf::cede_to_tick;
3244 } 3660 }
3245 3661
3246 cf::anim::invalidate_all; # d'oh 3662 cf::anim::invalidate_all; # d'oh
3247 } 3663 }
3248 3664
3249 { 3665 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3666 my $res = $facedata->{resource};
3253 3667
3254 while (my ($name, $info) = each %$res) { 3668 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3669 if (defined (my $type = $info->{type})) {
3670 # TODO: different hash - must free and use new index, or cache ixface data queue
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3671 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3672
3259 if ($info->{type} & 1) {
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3673 cf::face::set_type $idx, $type;
3674 cf::face::set_csum $idx, 0, $info->{hash};
3675 $cf::face::SIZE[0][$idx] = $info->{size};
3676 $cf::face::FOFS[0][$idx] = $info->{fofs};
3677 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3678 $cf::face::HASH{$info->{hash}} = $idx;
3274 } else { 3679 } else {
3275 $RESOURCE{$name} = $info; 3680# $RESOURCE{$name} = $info; # unused
3276 } 3681 }
3277
3278 cf::cede_to_tick;
3279 } 3682 }
3280 } 3683 }
3684
3685 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3686
3687 # HACK to clear player env face cache, we need some signal framework
3688 # for this (global event?)
3689 %ext::player_env::MUSIC_FACE_CACHE = ();
3690
3691 # END ATOMIC
3692
3693 cf::debug "facedata atomic update time ", EV::time - $t1;
3281 3694
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3695 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3696
3697 aio_close $fh if $fh; # close old facedata
3698
3284 1 3699 1
3285} 3700}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3701
3307register_exticmd fx_want => sub { 3702register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3703 my ($ns, $want) = @_;
3309 3704
3310 while (my ($k, $v) = each %$want) { 3705 while (my ($k, $v) = each %$want) {
3318 my $status = load_resource_file_ $_[0]; 3713 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100; 3714 get_slot 0.1, 100;
3320 cf::arch::commit_load; 3715 cf::arch::commit_load;
3321 3716
3322 $status 3717 $status
3718}
3719
3720sub reload_exp_table {
3721 _reload_exp_table;
3722
3723 cf::face::set
3724 "res/exp_table" => FT_RSRC,
3725 JSON::XS->new->utf8->canonical->encode (
3726 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3727 );
3728}
3729
3730sub reload_materials {
3731 _reload_materials;
3323} 3732}
3324 3733
3325sub reload_regions { 3734sub reload_regions {
3326 # HACK to clear player env face cache, we need some signal framework 3735 # HACK to clear player env face cache, we need some signal framework
3327 # for this (global event?) 3736 # for this (global event?)
3335 if exists $_->{match}; 3744 if exists $_->{match};
3336 } 3745 }
3337} 3746}
3338 3747
3339sub reload_facedata { 3748sub reload_facedata {
3340 load_facedata "$DATADIR/facedata" 3749 load_facedata $DATADIR
3341 or die "unable to load facedata\n"; 3750 or die "unable to load facedata\n";
3342} 3751}
3343 3752
3344sub reload_archetypes { 3753sub reload_archetypes {
3345 load_resource_file "$DATADIR/archetypes" 3754 load_resource_file "$DATADIR/archetypes"
3346 or die "unable to load archetypes\n"; 3755 or die "unable to load archetypes\n";
3756
3757 cf::face::set
3758 "res/skill_info" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3761 );
3762
3763 cf::face::set
3764 "res/spell_paths" => FT_RSRC,
3765 JSON::XS->new->utf8->canonical->encode (
3766 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3767 );
3347} 3768}
3348 3769
3349sub reload_treasures { 3770sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3771 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3772 or die "unable to load treasurelists\n";
3352} 3773}
3353 3774
3775sub reload_sound {
3776 trace "loading sound config from $DATADIR/sound\n";
3777
3778 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3779
3780 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3781 my $sound = $soundconf->{compat}[$_]
3782 or next;
3783
3784 my $face = cf::face::find "sound/$sound->[1]";
3785 cf::sound::set $sound->[0] => $face;
3786 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3787 }
3788
3789 while (my ($k, $v) = each %{$soundconf->{event}}) {
3790 my $face = cf::face::find "sound/$v";
3791 cf::sound::set $k => $face;
3792 }
3793}
3794
3354sub reload_resources { 3795sub reload_resources {
3355 warn "reloading resource files...\n"; 3796 trace "reloading resource files...\n";
3356 3797
3798 reload_materials;
3357 reload_facedata; 3799 reload_facedata;
3800 reload_exp_table;
3801 reload_sound;
3358 reload_archetypes; 3802 reload_archetypes;
3359 reload_regions; 3803 reload_regions;
3360 reload_treasures; 3804 reload_treasures;
3361 3805
3362 warn "finished reloading resource files\n"; 3806 trace "finished reloading resource files\n";
3363} 3807}
3364 3808
3365sub reload_config { 3809sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3810 trace "reloading config file...\n";
3367 or return;
3368 3811
3369 local $/; 3812 my $config = load_file "$CONFDIR/config";
3370 *CFG = YAML::Load <$fh>; 3813 utf8::decode $config;
3814 *CFG = decode_yaml $config;
3371 3815
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3816 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3817
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3818 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3819 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3820
3377 if (exists $CFG{mlockall}) { 3821 if (exists $CFG{mlockall}) {
3400 3844
3401 seek $fh, 0, 0; 3845 seek $fh, 0, 0;
3402 print $fh $$; 3846 print $fh $$;
3403} 3847}
3404 3848
3849sub main_loop {
3850 trace "EV::loop starting\n";
3851 if (1) {
3852 EV::loop;
3853 }
3854 trace "EV::loop returned\n";
3855 goto &main_loop unless $REALLY_UNLOOP;
3856}
3857
3405sub main { 3858sub main {
3406 cf::init_globals; # initialise logging 3859 cf::init_globals; # initialise logging
3407 3860
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3861 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3862 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3863 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3864 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412 3865
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3866 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3867
3421 # we must not ever block the main coroutine 3868 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3869 $Coro::idle = sub {
3423 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3870 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3424 (async { 3871 (async {
3425 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3872 $Coro::current->{desc} = "IDLE BUG HANDLER";
3426 EV::loop EV::LOOP_ONESHOT; 3873 EV::loop EV::LOOP_ONESHOT;
3427 })->prio (Coro::PRIO_MAX); 3874 })->prio (Coro::PRIO_MAX);
3428 }; 3875 };
3429 3876
3430 evthread_start IO::AIO::poll_fileno; 3877 evthread_start IO::AIO::poll_fileno;
3431 3878
3432 cf::sync_job { 3879 cf::sync_job {
3880 cf::incloader::init ();
3881
3882 db_init;
3883
3884 cf::init_anim;
3885 cf::init_attackmess;
3886 cf::init_dynamic;
3887
3888 cf::load_settings;
3889
3433 reload_resources; 3890 reload_resources;
3434 reload_config; 3891 reload_config;
3435 db_init;
3436 3892
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3893 cf::init_uuid;
3440 cf::init_signals; 3894 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills; 3895 cf::init_skills;
3443 3896
3444 cf::init_beforeplay; 3897 cf::init_beforeplay;
3445 3898
3446 atomic; 3899 atomic;
3448 load_extensions; 3901 load_extensions;
3449 3902
3450 utime time, time, $RUNTIMEFILE; 3903 utime time, time, $RUNTIMEFILE;
3451 3904
3452 # no (long-running) fork's whatsoever before this point(!) 3905 # no (long-running) fork's whatsoever before this point(!)
3906 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3907 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3908
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3909 cf::_post_init 0;
3456 }; 3910 };
3457 3911
3458 EV::loop; 3912 cf::object::thawer::errors_are_fatal 0;
3913 info "parse errors in files are no longer fatal from this point on.\n";
3914
3915 AE::postpone {
3916 undef &main; # free gobs of memory :)
3917 };
3918
3919 goto &main_loop;
3459} 3920}
3460 3921
3461############################################################################# 3922#############################################################################
3462# initialisation and cleanup 3923# initialisation and cleanup
3463 3924
3464# install some emergency cleanup handlers 3925# install some emergency cleanup handlers
3465BEGIN { 3926BEGIN {
3466 our %SIGWATCHER = (); 3927 our %SIGWATCHER = ();
3467 for my $signal (qw(INT HUP TERM)) { 3928 for my $signal (qw(INT HUP TERM)) {
3468 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3929 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3469 cf::cleanup "SIG$signal"; 3930 cf::cleanup "SIG$signal";
3470 }; 3931 };
3471 } 3932 }
3472} 3933}
3473 3934
3474sub write_runtime_sync { 3935sub write_runtime_sync {
3936 my $t0 = AE::time;
3937
3475 # first touch the runtime file to show we are still running: 3938 # first touch the runtime file to show we are still running:
3476 # the fsync below can take a very very long time. 3939 # the fsync below can take a very very long time.
3477 3940
3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3941 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3479 3942
3480 my $guard = cf::lock_acquire "write_runtime"; 3943 my $guard = cf::lock_acquire "write_runtime";
3481 3944
3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3945 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3483 or return; 3946 or return;
3484 3947
3485 my $value = $cf::RUNTIME + 90 + 10; 3948 my $value = $cf::RUNTIME + 90 + 10;
3486 # 10 is the runtime save interval, for a monotonic clock 3949 # 10 is the runtime save interval, for a monotonic clock
3487 # 60 allows for the watchdog to kill the server. 3950 # 60 allows for the watchdog to kill the server.
3500 or return; 3963 or return;
3501 3964
3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3965 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3503 and return; 3966 and return;
3504 3967
3505 warn "runtime file written.\n"; 3968 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3506 3969
3507 1 3970 1
3508} 3971}
3509 3972
3510our $uuid_lock; 3973our $uuid_lock;
3522 or return; 3985 or return;
3523 3986
3524 my $value = uuid_seq uuid_cur; 3987 my $value = uuid_seq uuid_cur;
3525 3988
3526 unless ($value) { 3989 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n"; 3990 info "cowardly refusing to write zero uuid value!\n";
3528 return; 3991 return;
3529 } 3992 }
3530 3993
3531 my $value = uuid_str $value + $uuid_skip; 3994 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0; 3995 $uuid_skip = 0;
3542 or return; 4005 or return;
3543 4006
3544 aio_rename "$uuid~", $uuid 4007 aio_rename "$uuid~", $uuid
3545 and return; 4008 and return;
3546 4009
3547 warn "uuid file written ($value).\n"; 4010 trace "uuid file written ($value).\n";
3548 4011
3549 1 4012 1
3550 4013
3551} 4014}
3552 4015
3558} 4021}
3559 4022
3560sub emergency_save() { 4023sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 4024 my $freeze_guard = cf::freeze_mainloop;
3562 4025
3563 warn "enter emergency perl save\n"; 4026 info "emergency_perl_save: enter\n";
4027
4028 # this is a trade-off: we want to be very quick here, so
4029 # save all maps without fsync, and later call a global sync
4030 # (which in turn might be very very slow)
4031 local $USE_FSYNC = 0;
3564 4032
3565 cf::sync_job { 4033 cf::sync_job {
4034 cf::write_runtime_sync; # external watchdog should not bark
4035
3566 # use a peculiar iteration method to avoid tripping on perl 4036 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 4037 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 4038 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 4039 info "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 4040 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 4041 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 4042 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4043 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 4044 $pl->save;
3575 } 4045 }
3576 warn "end emergency player save\n"; 4046 info "emergency_perl_save: end player save\n";
3577 4047
3578 warn "begin emergency map save\n"; 4048 cf::write_runtime_sync; # external watchdog should not bark
4049
4050 info "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 4051 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 4052 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 4053 $map->valid or next;
3582 $map->save; 4054 $map->save;
3583 } 4055 }
3584 warn "end emergency map save\n"; 4056 info "emergency_perl_save: end map save\n";
3585 4057
3586 warn "begin emergency database checkpoint\n"; 4058 cf::write_runtime_sync; # external watchdog should not bark
4059
4060 info "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 4061 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 4062 info "emergency_perl_save: end database checkpoint\n";
3589 4063
3590 warn "begin write uuid\n"; 4064 info "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 4065 write_uuid_sync 1;
3592 warn "end write uuid\n"; 4066 info "emergency_perl_save: end write uuid\n";
4067
4068 cf::write_runtime_sync; # external watchdog should not bark
4069
4070 trace "emergency_perl_save: syncing database to disk";
4071 BDB::db_env_txn_checkpoint $DB_ENV;
4072
4073 info "emergency_perl_save: starting sync\n";
4074 IO::AIO::aio_sync sub {
4075 info "emergency_perl_save: finished sync\n";
4076 };
4077
4078 cf::write_runtime_sync; # external watchdog should not bark
4079
4080 trace "emergency_perl_save: flushing outstanding aio requests";
4081 while (IO::AIO::nreqs || BDB::nreqs) {
4082 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4083 }
4084
4085 cf::write_runtime_sync; # external watchdog should not bark
3593 }; 4086 };
3594 4087
3595 warn "leave emergency perl save\n"; 4088 info "emergency_perl_save: leave\n";
3596} 4089}
3597 4090
3598sub post_cleanup { 4091sub post_cleanup {
3599 my ($make_core) = @_; 4092 my ($make_core) = @_;
3600 4093
4094 IO::AIO::flush;
4095
3601 warn Carp::longmess "post_cleanup backtrace" 4096 error Carp::longmess "post_cleanup backtrace"
3602 if $make_core; 4097 if $make_core;
3603 4098
3604 my $fh = pidfile; 4099 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$; 4100 unlink $PIDFILE if <$fh> == $$;
3606} 4101}
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4121 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) { 4122 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"}; 4123 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4124# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 } 4125 }
3631 warn "cleared package $pkg\n";#d#
3632} 4126}
3633 4127
3634sub do_reload_perl() { 4128sub do_reload_perl() {
3635 # can/must only be called in main 4129 # can/must only be called in main
3636 if ($Coro::current != $Coro::main) { 4130 unless (in_main) {
3637 warn "can only reload from main coroutine"; 4131 error "can only reload from main coroutine";
3638 return; 4132 return;
3639 } 4133 }
3640 4134
3641 return if $RELOAD++; 4135 return if $RELOAD++;
3642 4136
4137 my $t1 = AE::time;
4138
3643 while ($RELOAD) { 4139 while ($RELOAD) {
3644 warn "reloading..."; 4140 cf::get_slot 0.1, -1, "reload_perl";
4141 info "perl_reload: reloading...";
3645 4142
3646 warn "entering sync_job"; 4143 trace "perl_reload: entering sync_job";
3647 4144
3648 cf::sync_job { 4145 cf::sync_job {
3649 cf::write_runtime_sync; # external watchdog should not bark
3650 cf::emergency_save; 4146 #cf::emergency_save;
3651 cf::write_runtime_sync; # external watchdog should not bark
3652 4147
3653 warn "syncing database to disk";
3654 BDB::db_env_txn_checkpoint $DB_ENV;
3655
3656 # if anything goes wrong in here, we should simply crash as we already saved
3657
3658 warn "flushing outstanding aio requests";
3659 while (IO::AIO::nreqs || BDB::nreqs) {
3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3661 }
3662
3663 warn "cancelling all extension coros"; 4148 trace "perl_reload: cancelling all extension coros";
3664 $_->cancel for values %EXT_CORO; 4149 $_->cancel for values %EXT_CORO;
3665 %EXT_CORO = (); 4150 %EXT_CORO = ();
3666 4151
3667 warn "removing commands"; 4152 trace "perl_reload: removing commands";
3668 %COMMAND = (); 4153 %COMMAND = ();
3669 4154
3670 warn "removing ext/exti commands"; 4155 trace "perl_reload: removing ext/exti commands";
3671 %EXTCMD = (); 4156 %EXTCMD = ();
3672 %EXTICMD = (); 4157 %EXTICMD = ();
3673 4158
3674 warn "unloading/nuking all extensions"; 4159 trace "perl_reload: unloading/nuking all extensions";
3675 for my $pkg (@EXTS) { 4160 for my $pkg (@EXTS) {
3676 warn "... unloading $pkg"; 4161 trace "... unloading $pkg";
3677 4162
3678 if (my $cb = $pkg->can ("unload")) { 4163 if (my $cb = $pkg->can ("unload")) {
3679 eval { 4164 eval {
3680 $cb->($pkg); 4165 $cb->($pkg);
3681 1 4166 1
3682 } or warn "$pkg unloaded, but with errors: $@"; 4167 } or error "$pkg unloaded, but with errors: $@";
3683 } 4168 }
3684 4169
3685 warn "... clearing $pkg"; 4170 trace "... clearing $pkg";
3686 clear_package $pkg; 4171 clear_package $pkg;
3687 } 4172 }
3688 4173
3689 warn "unloading all perl modules loaded from $LIBDIR"; 4174 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) { 4175 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4176 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692 4177
3693 warn "... unloading $k"; 4178 trace "... unloading $k";
3694 delete $INC{$k}; 4179 delete $INC{$k};
3695 4180
3696 $k =~ s/\.pm$//; 4181 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g; 4182 $k =~ s/\//::/g;
3698 4183
3701 } 4186 }
3702 4187
3703 clear_package $k; 4188 clear_package $k;
3704 } 4189 }
3705 4190
3706 warn "getting rid of safe::, as good as possible"; 4191 trace "perl_reload: getting rid of safe::, as good as possible";
3707 clear_package "safe::$_" 4192 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4193 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 4194
3710 warn "unloading cf.pm \"a bit\""; 4195 trace "perl_reload: unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 4196 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 4197 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 4198
3714 # don't, removes xs symbols, too, 4199 # don't, removes xs symbols, too,
3715 # and global variables created in xs 4200 # and global variables created in xs
3716 #clear_package __PACKAGE__; 4201 #clear_package __PACKAGE__;
3717 4202
3718 warn "unload completed, starting to reload now"; 4203 info "perl_reload: unload completed, starting to reload now";
3719 4204
3720 warn "reloading cf.pm"; 4205 trace "perl_reload: reloading cf.pm";
3721 require cf; 4206 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4207 cf::_connect_to_perl_1;
3723 4208
3724 warn "loading config and database again"; 4209 trace "perl_reload: loading config and database again";
3725 cf::reload_config; 4210 cf::reload_config;
3726 4211
3727 warn "loading extensions"; 4212 trace "perl_reload: loading extensions";
3728 cf::load_extensions; 4213 cf::load_extensions;
3729 4214
4215 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 4216 trace "perl_reload: reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 4217 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 4218 trace "perl_reload: reattaching attachments to maps";
3733 reattach $_ for values %MAP; 4219 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 4220 trace "perl_reload: reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 4221 reattach $_ for values %PLAYER;
4222 }
3736 4223
3737 warn "running post_load"; 4224 cf::_post_init 1;
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739 4225
3740 warn "leaving sync_job"; 4226 trace "perl_reload: leaving sync_job";
3741 4227
3742 1 4228 1
3743 } or do { 4229 } or do {
3744 warn $@; 4230 error $@;
3745 cf::cleanup "error while reloading, exiting."; 4231 cf::cleanup "perl_reload: error, exiting.";
3746 }; 4232 };
3747 4233
3748 warn "reloaded";
3749 --$RELOAD; 4234 --$RELOAD;
3750 } 4235 }
4236
4237 $t1 = AE::time - $t1;
4238 info "perl_reload: completed in ${t1}s\n";
3751}; 4239};
3752 4240
3753our $RELOAD_WATCHER; # used only during reload 4241our $RELOAD_WATCHER; # used only during reload
3754 4242
3755sub reload_perl() { 4243sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 4244 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 4245 # coro crashes during coro_state_free->destroy here.
3758 4246
4247 $RELOAD_WATCHER ||= cf::async {
4248 Coro::AIO::aio_wait cache_extensions;
4249
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4250 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 4251 do_reload_perl;
3761 undef $RELOAD_WATCHER; 4252 undef $RELOAD_WATCHER;
4253 };
3762 }; 4254 };
3763} 4255}
3764 4256
3765register_command "reload" => sub { 4257register_command "reload" => sub {
3766 my ($who, $arg) = @_; 4258 my ($who, $arg) = @_;
3772 reload_perl; 4264 reload_perl;
3773 }; 4265 };
3774 } 4266 }
3775}; 4267};
3776 4268
3777unshift @INC, $LIBDIR; 4269#############################################################################
3778 4270
3779my $bug_warning = 0; 4271my $bug_warning = 0;
3780 4272
3781our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN;
3783
3784sub wait_for_tick { 4273sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3786 4275
3787 my $signal = new Coro::Signal; 4276 $WAIT_FOR_TICK->wait;
3788 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait;
3790} 4277}
3791 4278
3792sub wait_for_tick_begin { 4279sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4280 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3794 4281
3795 my $signal = new Coro::Signal; 4282 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4283 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4284 $signal->wait;
3798} 4285}
3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4289 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3803 unless ++$bug_warning > 10; 4290 unless ++$bug_warning > 10;
3804 return; 4291 return;
3805 } 4292 }
3806 4293
3807 cf::server_tick; # one server iteration 4294 cf::one_tick; # one server iteration
4295
4296 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 4297
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4298 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4299 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4300 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4301 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4302 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4303 or error "ERROR: unable to write runtime file: $!";
3815 }; 4304 };
3816 } 4305 }
3817 4306
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4307 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4308 $sig->send;
3820 } 4309 }
3821 while (my $sig = shift @WAIT_FOR_TICK) { 4310 $WAIT_FOR_TICK->broadcast;
3822 $sig->send;
3823 }
3824 4311
3825 $LOAD = ($NOW - $TICK_START) / $TICK; 4312 $LOAD = ($NOW - $TICK_START) / $TICK;
3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4313 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3827 4314
3828 if (0) { 4315 if (0) {
3829 if ($NEXT_TICK) { 4316 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4317 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4318 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4319 debug "jitter $JITTER\n";#d#
3833 } 4320 }
3834 } 4321 }
3835} 4322}
3836 4323
3837{ 4324{
3838 # configure BDB 4325 # configure BDB
4326 info "initialising database";
3839 4327
3840 BDB::min_parallel 8; 4328 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4329 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4330 #$AnyEvent::BDB::WATCHER->priority (1);
3843 4331
3844 unless ($DB_ENV) { 4332 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4333 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4334 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4335 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3872 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4360 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3873 }; 4361 };
3874 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4362 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3875 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4363 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3876 }; 4364 };
4365
4366 info "database initialised";
3877} 4367}
3878 4368
3879{ 4369{
3880 # configure IO::AIO 4370 # configure IO::AIO
3881 4371
4372 info "initialising aio";
3882 IO::AIO::min_parallel 8; 4373 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4374 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4375 undef $AnyEvent::AIO::WATCHER;
4376 info "aio initialised";
3885} 4377}
3886 4378
3887my $_log_backtrace; 4379our $_log_backtrace;
4380our $_log_backtrace_last;
3888 4381
3889sub _log_backtrace { 4382sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4383 my ($msg, @addr) = @_;
3891 4384
3892 $msg =~ s/\n//; 4385 $msg =~ s/\n$//;
3893 4386
4387 if ($_log_backtrace_last eq $msg) {
4388 LOG llevInfo, "[ABT] $msg\n";
4389 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4390 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4391 } elsif ($_log_backtrace < 2) {
4392 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4393 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4394 my $perl_bt = Carp::longmess $msg;
3898 async { 4395 async {
3899 $Coro::current->{desc} = "abt $msg"; 4396 $Coro::current->{desc} = "abt $msg";
3900 4397
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4417 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4418 --$_log_backtrace;
3922 }; 4419 };
3923 } else { 4420 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4421 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4422 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4423 }
3927} 4424}
3928 4425
3929# load additional modules 4426# load additional modules
3930use cf::pod; 4427require "cf/$_.pm" for @EXTRA_MODULES;
4428cf::_connect_to_perl_2;
3931 4429
3932END { cf::emergency_save } 4430END { cf::emergency_save }
3933 4431
39341 44321
3935 4433

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines