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.453 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
36 40
37use Coro (); 41use Coro ();
38use Coro::State; 42use Coro::State;
39use Coro::Handle; 43use Coro::Handle;
40use Coro::EV; 44use Coro::EV;
41use Coro::AnyEvent; 45use Coro::AnyEvent;
42use Coro::Timer; 46use Coro::Timer;
43use Coro::Signal; 47use Coro::Signal;
44use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
45use Coro::AnyEvent; 50use Coro::AnyEvent;
46use Coro::AIO; 51use Coro::AIO;
47use Coro::BDB 1.6; 52use Coro::BDB 1.6;
48use Coro::Storable; 53use Coro::Storable;
49use Coro::Util (); 54use Coro::Util ();
50 55
56use Guard ();
51use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
52use BDB (); 58use BDB ();
53use Data::Dumper; 59use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 60use Fcntl;
56use YAML (); 61use YAML::XS ();
57use IO::AIO (); 62use IO::AIO ();
58use Time::HiRes;
59use Compress::LZF; 63use Compress::LZF;
60use Digest::MD5 (); 64use Digest::MD5 ();
61 65
62AnyEvent::detect; 66AnyEvent::detect;
63 67
70 74
71# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74 78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83
84our @ORIG_INC;
76 85
77our %COMMAND = (); 86our %COMMAND = ();
78our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
79 88
80our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
81our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
82our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
85 96
86our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
88 101
89our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
90our $DATADIR = datadir; 104our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
94our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 117
103our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
104 125
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 128our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 129our $USE_FSYNC = 1; # use fsync to write maps - default on
109 130
110our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 134our $DB_ENV;
114 135
136our @EXTRA_MODULES = qw(pod match mapscript incloader);
137
115our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
116 140
117our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
119our $NOW; 144our $NOW;
120 145
121our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
122our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
123our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
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;
1380
1381 $filename =~ s%/[^/]+$%%;
1382 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1383 } else {
1193 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1194 } 1385 }
1195 } else { 1386 } else {
1196 aio_unlink $filename; 1387 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1198 } 1389 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1414 $av = $st->{objs};
1224 } 1415 }
1225 1416
1226 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1229 1421
1230 ($data, $av) 1422 ($data, $av)
1231} 1423}
1232 1424
1233=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1237=cut 1429=cut
1238 1430
1239############################################################################# 1431#############################################################################
1240# command handling &c 1432# command handling &c
1241 1433
1242=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1243 1435
1244Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1245$name. 1437$name.
1246 1438
1247=cut 1439=cut
1253 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1254 1446
1255 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1256} 1448}
1257 1449
1258=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1259 1451
1260Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1261extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1262received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1263the 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
1264has logged in successfully. 1456has logged in successfully.
1265 1457
1266If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1267called.
1268 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
1269=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1270 1466
1271Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1272exticmd 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
1273are 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
1274is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1275log-in. 1471log-in.
1276 1472
1277If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1278called.
1279 1474
1280=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1281 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
1282sub register_extcmd { 1482sub register_extcmd($$) {
1283 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1284 1484
1285 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1286} 1486}
1287 1487
1288sub register_exticmd { 1488sub register_async_extcmd($$) {
1289 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1290 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1291 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1292} 1498}
1293 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1294cf::player->attach ( 1508cf::player->attach (
1295 on_command => sub { 1509 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1297 1511
1298 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1299 or return; 1513 or return;
1300 1514
1308 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1309 1523
1310 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1311 1525
1312 if (ref $msg) { 1526 if (ref $msg) {
1313 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1314 "ARRAY" eq ref $msg
1315 ? @$msg
1316 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1317 1528
1318 my @reply;
1319
1320 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}) {
1321 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1322 } 1547 }
1323 1548
1324 $pl->ext_reply ($reply, @reply)
1325 if $reply;
1326
1327 } else { 1549 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1551 }
1330 1552
1331 cf::override; 1553 cf::override;
1332 }, 1554 },
1333); 1555);
1334 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
1335sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1336 cf::sync_job { 1586 cf::sync_job {
1337 my %todo; 1587 my %todo;
1338 1588
1339 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1590 next unless -r $path;
1358 1608
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1611
1362 $ext{source} = 1612 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1365 . $source 1615 . $source
1366 . "\n};\n1"; 1616 . "\n};\n1";
1367 1617
1368 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1369 } 1619 }
1370 1620
1621 my $pass = 0;
1371 my %done; 1622 my %done;
1372 while (%todo) { 1623 while (%todo) {
1373 my $progress; 1624 my $progress;
1374 1625
1626 ++$pass;
1627
1628 ext:
1375 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1631 next ext
1378 unless exists $done{$_}; 1632 unless exists $done{$_};
1379 } 1633 }
1380 1634
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1636
1383 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 $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1650
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1652 if exists $v->{meta}{mandatory};
1391 1653
1392 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;
1393 } 1663 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1664 }
1399 1665
1400 skip: 1666 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1676 }
1404 }; 1677 };
1405} 1678}
1406 1679
1407############################################################################# 1680#############################################################################
1491 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1492 } 1765 }
1493 } 1766 }
1494} 1767}
1495 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
1496sub save($) { 1782sub save($) {
1497 my ($pl) = @_; 1783 my ($pl) = @_;
1498 1784
1499 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1500 1786
1505 1791
1506 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1508 1794
1509 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];
1510 1799
1511 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1801 cf::cede_to_tick;
1513} 1802}
1514 1803
1548 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1549 1838
1550 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1551 $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
1552 1841
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1554 $pl->deactivate; 1843 $pl->deactivate;
1844
1555 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;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1558 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1559 1850
1560 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1562 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1616 \@logins 1907 \@logins
1617} 1908}
1618 1909
1619=item $player->maps 1910=item $player->maps
1620 1911
1912=item cf::player::maps $login
1913
1621Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1622player. May block. 1915player. May block.
1623 1916
1624=cut 1917=cut
1625 1918
1646 1939
1647=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1648 1941
1649Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1650 1943
1651=item $player->ext_reply ($msgid, @msg)
1652
1653Sends an ext reply to the player.
1654
1655=cut
1656
1657sub ext_reply($$@) {
1658 my ($self, $id, @msg) = @_;
1659
1660 $self->ns->ext_reply ($id, @msg)
1661}
1662
1663=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1664 1945
1665Sends an ext event to the client. 1946Sends an ext event to the client.
1666 1947
1667=cut 1948=cut
1686 1967
1687=cut 1968=cut
1688 1969
1689sub find_by_path($) { 1970sub find_by_path($) {
1690 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1691 1974
1692 my ($match, $specificity); 1975 my ($match, $specificity);
1693 1976
1694 for my $region (list) { 1977 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1724sub generate_random_map { 2007sub generate_random_map {
1725 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1726 2009
1727 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
1728 2011
1729 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1738 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1739 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1740 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1741 (cf::region::find $rmp->{region}), $rmp->{custom}
1742 )
1743} 2013}
1744 2014
1745=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1746 2016
1747Register 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
1752 2022
1753sub register { 2023sub register {
1754 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 2025 my $pkg = caller;
1756 2026
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 2028
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 2030}
1762 2031
1763# also paths starting with '/' 2032# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 2034
1766sub thawer_merge { 2035sub thawer_merge {
1767 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1768 2037
1769 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1774} 2043}
1775 2044
1776sub normalise { 2045sub normalise {
1777 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1778 2047
1779 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1780 2049
1781 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1782 2051
1783 # map plan: 2052 # map plan:
1784 # 2053 #
1799 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1800 $path = "$base/$path"; 2069 $path = "$base/$path";
1801 } 2070 }
1802 2071
1803 for ($path) { 2072 for ($path) {
1804 redo if s{//}{/};
1805 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1806 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1807 } 2075 }
1808 2076
1809 $path 2077 $path
1823 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1824 return $self; 2092 return $self;
1825 } 2093 }
1826 } 2094 }
1827 2095
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 2097 ()
1830} 2098}
1831 2099
2100# may re-bless or do other evil things
1832sub init { 2101sub init {
1833 my ($self) = @_; 2102 my ($self) = @_;
1834 2103
1835 $self 2104 $self
1836} 2105}
1867 2136
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1870} 2139}
1871 2140
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 2141sub decay_objects {
1882 my ($self) = @_; 2142 my ($self) = @_;
1883 2143
1884 return if $self->{deny_reset}; 2144 return if $self->{deny_reset};
1885 2145
1910 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1911 2171
1912 1 2172 1
1913} 2173}
1914 2174
2175# used to laod the header of an original map
1915sub load_header_orig { 2176sub load_header_orig {
1916 my ($self) = @_; 2177 my ($self) = @_;
1917 2178
1918 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1919} 2180}
1920 2181
2182# used to laod the header of an instantiated map
1921sub load_header_temp { 2183sub load_header_temp {
1922 my ($self) = @_; 2184 my ($self) = @_;
1923 2185
1924 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1925} 2187}
1926 2188
2189# called after loading the header from an instantiated map
1927sub prepare_temp { 2190sub prepare_temp {
1928 my ($self) = @_; 2191 my ($self) = @_;
1929 2192
1930 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1932 # safety 2195 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2198}
1936 2199
2200# called after loading the header from an original map
1937sub prepare_orig { 2201sub prepare_orig {
1938 my ($self) = @_; 2202 my ($self) = @_;
1939 2203
1940 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1965 2229
1966sub find; 2230sub find;
1967sub find { 2231sub find {
1968 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1969 2233
2234 cf::cede_to_tick;
2235
1970 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1971 2237
1972 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2240
1975 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
1980 or return; 2243 or return;
1981 2244
1982 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
1983 2246
1995 2258
1996 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1997 } 2260 }
1998} 2261}
1999 2262
2000sub pre_load { } 2263sub pre_load { }
2001sub post_load { } 2264#sub post_load { } # XS
2002 2265
2003sub load { 2266sub load {
2004 my ($self) = @_; 2267 my ($self) = @_;
2005 2268
2006 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2009 2272
2010 { 2273 {
2011 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2012 2275
2013 return unless $self->valid; 2276 return unless $self->valid;
2014 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2015
2016 $self->in_memory (cf::MAP_LOADING);
2017 2278
2018 $self->alloc; 2279 $self->alloc;
2019 2280
2020 $self->pre_load; 2281 $self->pre_load;
2021 cf::cede_to_tick; 2282 cf::cede_to_tick;
2022 2283
2284 if (exists $self->{load_path}) {
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2286 $f->skip_block;
2025 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2026 or return; 2288 or return;
2027 2289
2028 $self->post_load_original 2290 $self->post_load_original
2029 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2030 2292
2031 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2294 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2035 $self->clear_unique_items; 2297 $self->clear_unique_items;
2036 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2038 } 2301 }
2039 } 2302 }
2040 }
2041 2303
2042 $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);
2043 2311
2044 cf::cede_to_tick; 2312 cf::cede_to_tick;
2045 # now do the right thing for maps 2313 # now do the right thing for maps
2046 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2047 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2051 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2320 $self->decay_objects;
2053 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2054 $self->update_buttons; 2322 $self->update_buttons;
2055 cf::cede_to_tick; 2323 cf::cede_to_tick;
2056 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2057 cf::cede_to_tick;
2058 $self->activate;
2059 } 2325 }
2060 2326
2061 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2063
2064 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2329 }
2066 2330
2067 $self->post_load; 2331 $self->post_load;
2068}
2069 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
2070sub customise_for { 2339sub customise_for {
2071 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2072 2341
2073 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2343 if $self->per_player;
2077# if $self->per_party; 2346# if $self->per_party;
2078 2347
2079 $self 2348 $self
2080} 2349}
2081 2350
2082# find and load all maps in the 3x3 area around a map
2083sub load_neighbours {
2084 my ($map) = @_;
2085
2086 my @neigh; # diagonal neighbours
2087
2088 for (0 .. 3) {
2089 my $neigh = $map->tile_path ($_)
2090 or next;
2091 $neigh = find $neigh, $map
2092 or next;
2093 $neigh->load;
2094
2095 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 }
2099
2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
2102 my $neigh = find $path, $origin
2103 or next;
2104 $neigh->load;
2105 }
2106}
2107
2108sub find_sync { 2351sub find_sync {
2109 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2110 2353
2111 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
2112} 2359}
2113 2360
2114sub do_load_sync { 2361sub do_load_sync {
2115 my ($map) = @_; 2362 my ($map) = @_;
2116 2363
2364 # it's a bug to call this from the main context
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2119 2367
2120 cf::sync_job { $map->load }; 2368 $map->load;
2121} 2369}
2122 2370
2123our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2125 2373
2126sub find_async { 2374sub find_async {
2127 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2128 2376
2129 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2130 2378
2131 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2133 } 2381 }
2134 2382
2135 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2136 2384
2137 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2151 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2152 2400
2153 () 2401 ()
2154} 2402}
2155 2403
2404# common code, used by both ->save and ->swapout
2156sub save { 2405sub _save {
2157 my ($self) = @_; 2406 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2407
2161 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2162 2409
2163 return unless $self->dirty; 2410 return unless $self->dirty;
2164 2411
2184 } else { 2431 } else {
2185 $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);
2186 } 2433 }
2187} 2434}
2188 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2189sub swap_out { 2444sub swap_out {
2190 my ($self) = @_; 2445 my ($self) = @_;
2191 2446
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2197 return if $self->players; 2451 return if $self->players;
2198 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
2199 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2200 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
2201 $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};
2202 2503
2203 $self->deactivate; 2504 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2506 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2507
2251 $self->unlink_save; 2508 $self->unlink_save;
2252 $self->destroy; 2509 $self->destroy;
2253} 2510}
2254 2511
2262 2519
2263 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2264 2521
2265 $self->unlink_save; 2522 $self->unlink_save;
2266 2523
2267 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2529
2329 : normalise $_ 2586 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2588 ]
2332} 2589}
2333 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
2334=back 2623=back
2335 2624
2336=head3 cf::object 2625=head3 cf::object
2337 2626
2338=cut 2627=cut
2361 2650
2362Creates 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.
2363 2652
2364=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2365 2654
2366returns 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,
2367even if the object actually exists. May block. 2656even if the object actually exists. May block.
2368 2657
2369=cut 2658=cut
2370 2659
2371sub deref { 2660sub deref {
2403 2692
2404our $SAY_CHANNEL = { 2693our $SAY_CHANNEL = {
2405 id => "say", 2694 id => "say",
2406 title => "Map", 2695 title => "Map",
2407 reply => "say ", 2696 reply => "say ",
2408 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.",
2409}; 2698};
2410 2699
2411our $CHAT_CHANNEL = { 2700our $CHAT_CHANNEL = {
2412 id => "chat", 2701 id => "chat",
2413 title => "Chat", 2702 title => "Chat",
2470 2759
2471Freezes 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}>).
2472 2761
2473The 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.
2474for 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,
2475though, 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
2476map. 2765map.
2477 2766
2478Will never block. 2767Will never block.
2479 2768
2480=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2502 my ($self) = @_; 2791 my ($self) = @_;
2503 2792
2504 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2505 2794
2795 ++$self->{_link_recursion};
2796
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2798
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2510 2801
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2803}
2513 2804
2514sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2516 2807
2533 ($x, $y) = (-1, -1) 2824 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2825 unless (defined $x) && (defined $y);
2535 2826
2536 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2539 2830
2540 $map->load; 2831 $map->load;
2541 $map->load_neighbours;
2542 2832
2543 return unless $self->contr->active; 2833 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2834
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2549} 2837 # entering was successful
2838 delete $self->{_link_recursion};
2839 # only activate afterwards, to support waiting in hooks
2840 $self->activate_recursive;
2841 }
2550 2842
2843}
2844
2551=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)]])
2552 2846
2553Moves 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
2554her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2555that 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
2556the 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
2563 2857
2564our $GOTOGEN; 2858our $GOTOGEN;
2565 2859
2566sub cf::object::player::goto { 2860sub cf::object::player::goto {
2567 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 }
2568 2868
2569 # 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
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2871
2572 $self->enter_link; 2872 $self->enter_link;
2592 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2593 } 2893 }
2594 } 2894 }
2595 2895
2596 my $map = eval { 2896 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2598 2898
2599 if ($map) { 2899 if ($map) {
2600 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2902 } else {
2603 $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);
2604 } 2904 }
2605 2905
2606 $map 2906 $map
2614 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2617 } 2917 }
2618 2918
2619 $done->() if $done; 2919 $done->($self) if $done;
2620 })->prio (1); 2920 })->prio (1);
2621} 2921}
2622 2922
2623=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2624 2924
2692 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2693 2993
2694 unless (eval { 2994 unless (eval {
2695 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2696 2996
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2706 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2707 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 }
2708 3023
2709 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2710 3025
2711 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2717 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "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. "
2719 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2721 3036
2722 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 3038 $self->leave_link;
2724 } 3039 }
2725 })->prio (1); 3040 })->prio (1);
2726} 3041}
2727 3042
2739sub cf::client::send_drawinfo { 3054sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 3055 my ($self, $text, $flags) = @_;
2741 3056
2742 utf8::encode $text; 3057 utf8::encode $text;
2743 $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);
2744} 3084}
2745 3085
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 3086=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 3087
2748Send 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
2752 3092
2753=cut 3093=cut
2754 3094
2755# non-persistent channels (usually the info channel) 3095# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 3096our %CHANNEL = (
3097 "c/motd" => {
3098 id => "infobox",
3099 title => "MOTD",
3100 reply => undef,
3101 tooltip => "The message of the day",
3102 },
2757 "c/identify" => { 3103 "c/identify" => {
2758 id => "infobox", 3104 id => "infobox",
2759 title => "Identify", 3105 title => "Identify",
2760 reply => undef, 3106 reply => undef,
2761 tooltip => "Items recently identified", 3107 tooltip => "Items recently identified",
2763 "c/examine" => { 3109 "c/examine" => {
2764 id => "infobox", 3110 id => "infobox",
2765 title => "Examine", 3111 title => "Examine",
2766 reply => undef, 3112 reply => undef,
2767 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",
2768 }, 3120 },
2769 "c/book" => { 3121 "c/book" => {
2770 id => "infobox", 3122 id => "infobox",
2771 title => "Book", 3123 title => "Book",
2772 reply => undef, 3124 reply => undef,
2788 id => "infobox", 3140 id => "infobox",
2789 title => "Body Parts", 3141 title => "Body Parts",
2790 reply => undef, 3142 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 3143 tooltip => "Shows which body parts you posess and are available",
2792 }, 3144 },
3145 "c/statistics" => {
3146 id => "infobox",
3147 title => "Statistics",
3148 reply => undef,
3149 tooltip => "Shows your primary statistics",
3150 },
2793 "c/skills" => { 3151 "c/skills" => {
2794 id => "infobox", 3152 id => "infobox",
2795 title => "Skills", 3153 title => "Skills",
2796 reply => undef, 3154 reply => undef,
2797 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",
2798 }, 3180 },
2799 "c/uptime" => { 3181 "c/uptime" => {
2800 id => "infobox", 3182 id => "infobox",
2801 title => "Uptime", 3183 title => "Uptime",
2802 reply => undef, 3184 reply => undef,
2812 id => "party", 3194 id => "party",
2813 title => "Party", 3195 title => "Party",
2814 reply => "gsay ", 3196 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3197 tooltip => "Messages and chat related to your party",
2816 }, 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/say" => $SAY_CHANNEL,
3206 "c/chat" => $CHAT_CHANNEL,
2817); 3207);
2818 3208
2819sub cf::client::send_msg { 3209sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3210 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3211
2826 3216
2827 # check predefined channels, for the benefit of C 3217 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3218 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3219 $channel = $CHANNEL{$channel};
2830 3220
2831 $self->ext_msg (channel_info => $channel) 3221 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3222 $channel = $channel->{id};
2835 3223
2836 } elsif (ref $channel) { 3224 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3225 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3226 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3227 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3228 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3229 }
2843 3230
2844 $channel = $channel->{id}; 3231 $channel = $channel->{id};
2845 } 3232 }
2846 3233
2847 return unless @extra || length $msg; 3234 return unless @extra || length $msg;
2848 3235
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3236 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3237 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3238 if $color & cf::NDI_DEF;
2853 3239
2854 my $pkt = "msg " 3240 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3241 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3242 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3243 );
2858 3244
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3245 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3246}
2896 3247
2897=item $client->ext_msg ($type, @msg) 3248=item $client->ext_msg ($type, @msg)
2898 3249
2899Sends an ext event to the client. 3250Sends an ext event to the client.
2901=cut 3252=cut
2902 3253
2903sub cf::client::ext_msg($$@) { 3254sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3255 my ($self, $type, @msg) = @_;
2905 3256
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3257 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2930} 3258}
2931 3259
2932=item $success = $client->query ($flags, "text", \&cb) 3260=item $success = $client->query ($flags, "text", \&cb)
2933 3261
2934Queues a query to the client, calling the given callback with 3262Queues a query to the client, calling the given callback with
2989 my ($ns, $buf) = @_; 3317 my ($ns, $buf) = @_;
2990 3318
2991 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3319 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2992 3320
2993 if (ref $msg) { 3321 if (ref $msg) {
2994 my ($type, $reply, @payload) = 3322 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998 3323
2999 my @reply;
3000
3001 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTIACMD{$type}) {
3325 $cb->(
3326 $ns,
3327 sub {
3328 $ns->ext_msg ("reply-$reply", @_)
3329 if $reply;
3330 },
3331 @payload
3332 );
3333 } else {
3334 my @reply;
3335
3336 if (my $cb = $EXTICMD{$type}) {
3002 @reply = $cb->($ns, @payload); 3337 @reply = $cb->($ns, @payload);
3338 }
3339
3340 $ns->ext_msg ("reply-$reply", @reply)
3341 if $reply;
3003 } 3342 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
3008 } else { 3343 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3344 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3345 }
3011 3346
3012 cf::override; 3347 cf::override;
3013 }, 3348 },
3014); 3349);
3034 3369
3035 $coro 3370 $coro
3036} 3371}
3037 3372
3038cf::client->attach ( 3373cf::client->attach (
3039 on_destroy => sub { 3374 on_client_destroy => sub {
3040 my ($ns) = @_; 3375 my ($ns) = @_;
3041 3376
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3377 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3378 },
3044); 3379);
3060our $safe_hole = new Safe::Hole; 3395our $safe_hole = new Safe::Hole;
3061 3396
3062$SIG{FPE} = 'IGNORE'; 3397$SIG{FPE} = 'IGNORE';
3063 3398
3064$safe->permit_only (Opcode::opset qw( 3399$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3400 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3401 grepstart grepwhile mapstart mapwhile
3067 sort time 3402 sort time
3068)); 3403));
3069 3404
3070# here we export the classes and methods available to script code 3405# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3409The following functions and methods are available within a safe environment:
3075 3410
3076 cf::object 3411 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3412 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3413 insert remove name archname title slaying race decrease split
3414 value
3079 3415
3080 cf::object::player 3416 cf::object::player
3081 player 3417 player
3082 3418
3083 cf::player 3419 cf::player
3089=cut 3425=cut
3090 3426
3091for ( 3427for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3428 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3429 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3430 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3431 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3432 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3433 ["cf::map" => qw(trigger)],
3098) { 3434) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3435 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3436 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3437 for @funs;
3103} 3438}
3104 3439
3119 3454
3120 my $qcode = $code; 3455 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3456 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3457 $qcode =~ s/\n/\\n/g;
3123 3458
3459 %vars = (_dummy => 0) unless %vars;
3460
3461 my @res;
3124 local $_; 3462 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3463
3127 my $eval = 3464 my $eval =
3128 "do {\n" 3465 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3466 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3467 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3468 . $code
3132 . "\n}" 3469 . "\n}"
3133 ; 3470 ;
3134 3471
3472 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3473 sub_generation_inc;
3474 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3475 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3476 sub_generation_inc;
3477 } else {
3478 local @cf::_safe_eval_args = values %vars;
3479 @res = wantarray ? eval eval : scalar eval $eval;
3480 }
3138 3481
3139 if ($@) { 3482 if ($@) {
3140 warn "$@"; 3483 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3484 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3485 "with arguments " . (join " ", %vars) . "\n";
3143 } 3486 }
3144 3487
3145 wantarray ? @res : $res[0] 3488 wantarray ? @res : $res[0]
3146} 3489}
3147 3490
3161=cut 3504=cut
3162 3505
3163sub register_script_function { 3506sub register_script_function {
3164 my ($fun, $cb) = @_; 3507 my ($fun, $cb) = @_;
3165 3508
3166 no strict 'refs'; 3509 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3510 *$fun = $safe_hole->wrap ($cb);
3168} 3511}
3169 3512
3170=back 3513=back
3171 3514
3172=cut 3515=cut
3173 3516
3174############################################################################# 3517#############################################################################
3175# the server's init and main functions 3518# the server's init and main functions
3176 3519
3520{
3521 package cf::face;
3522
3523 our %HASH; # hash => idx
3524 our @DATA; # dynamically-created facedata, only faceste 0 used
3525 our @FOFS; # file offset, if > 0
3526 our @SIZE; # size of face, in octets
3527 our @META; # meta hash of face, if any
3528 our $DATAFH; # facedata filehandle
3529
3530 # internal api, not finalised
3531 sub set {
3532 my ($name, $type, $data) = @_;
3533
3534 my $idx = cf::face::find $name;
3535
3536 if ($idx) {
3537 delete $HASH{cf::face::get_chksum $idx};
3538 } else {
3539 $idx = cf::face::alloc $name;
3540 }
3541
3542 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3543
3544 cf::face::set_type $idx, $type;
3545 cf::face::set_csum $idx, 0, $hash;
3546
3547 # we need to destroy the SV itself, not just modify it, as a running ix
3548 # might hold a reference to it: "delete" achieves that.
3549 delete $FOFS[0][$idx];
3550 delete $DATA[0][$idx];
3551 $DATA[0][$idx] = $data;
3552 $SIZE[0][$idx] = length $data;
3553 delete $META[$idx];
3554 $HASH{$hash} = $idx;#d#
3555
3556 $idx
3557 }
3558
3559 sub _get_data($$$) {
3560 my ($idx, $set, $cb) = @_;
3561
3562 if (defined $DATA[$set][$idx]) {
3563 $cb->($DATA[$set][$idx]);
3564 } elsif (my $fofs = $FOFS[$set][$idx]) {
3565 my $size = $SIZE[$set][$idx];
3566 my $buf;
3567 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3568 if ($_[0] == $size) {
3569 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3570 $cb->($buf);
3571 } else {
3572 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3573 }
3574 };
3575 } else {
3576 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3577 }
3578 }
3579
3580 # rather ineffient
3581 sub cf::face::get_data($;$) {
3582 my ($idx, $set) = @_;
3583
3584 _get_data $idx, $set, Coro::rouse_cb;
3585 Coro::rouse_wait
3586 }
3587
3588 sub cf::face::ix {
3589 my ($ns, $set, $idx, $pri) = @_;
3590
3591 _get_data $idx, $set, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594 }
3595}
3596
3177sub load_facedata($) { 3597sub load_facedata($) {
3178 my ($path) = @_; 3598 my ($path) = @_;
3179 3599
3180 # HACK to clear player env face cache, we need some signal framework
3181 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = ();
3183
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3600 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3601
3186 warn "loading facedata from $path\n"; 3602 trace "loading facedata from $path\n";
3187 3603
3188 my $facedata; 3604 my $facedata = decode_storable load_file "$path/faceinfo";
3189 0 < aio_load $path, $facedata
3190 or die "$path: $!";
3191
3192 $facedata = Coro::Storable::thaw $facedata;
3193 3605
3194 $facedata->{version} == 2 3606 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3607 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3196 3608
3197 # patch in the exptable 3609 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3198 $facedata->{resource}{"res/exp_table"} = { 3610 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3199 type => FT_RSRC, 3611
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3612 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3201 }; 3613
3202 cf::cede_to_tick; 3614 # BEGIN ATOMIC
3615 # from here on, everything must be atomic - no thread switch allowed
3616 my $t1 = EV::time;
3203 3617
3204 { 3618 {
3205 my $faces = $facedata->{faceinfo}; 3619 my $faces = $facedata->{faceinfo};
3206 3620
3207 while (my ($face, $info) = each %$faces) { 3621 for my $face (sort keys %$faces) {
3622 my $info = $faces->{$face};
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3623 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3624
3210 cf::face::set_visibility $idx, $info->{visibility}; 3625 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3626 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3627 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3628 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3214 3629 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3215 cf::cede_to_tick; 3630 $cf::face::HASH{$info->{hash64}} = $idx;
3631 delete $cf::face::META[$idx];
3216 } 3632 }
3217 3633
3218 while (my ($face, $info) = each %$faces) { 3634 while (my ($face, $info) = each %$faces) {
3219 next unless $info->{smooth}; 3635 next unless $info->{smooth};
3220 3636
3223 3639
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3640 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3641 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3642 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3643 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3644 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3645 }
3230
3231 cf::cede_to_tick;
3232 } 3646 }
3233 } 3647 }
3234 3648
3235 { 3649 {
3236 my $anims = $facedata->{animinfo}; 3650 my $anims = $facedata->{animinfo};
3237 3651
3238 while (my ($anim, $info) = each %$anims) { 3652 while (my ($anim, $info) = each %$anims) {
3239 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3653 cf::anim::set $anim, $info->{frames}, $info->{facings};
3240 cf::cede_to_tick;
3241 } 3654 }
3242 3655
3243 cf::anim::invalidate_all; # d'oh 3656 cf::anim::invalidate_all; # d'oh
3244 } 3657 }
3245 3658
3246 { 3659 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3660 my $res = $facedata->{resource};
3250 3661
3251 while (my ($name, $info) = each %$res) { 3662 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3663 if (defined (my $type = $info->{type})) {
3664 # TODO: different hash - must free and use new index, or cache ixface data queue
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3665 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3666
3256 if ($info->{type} & 1) {
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3667 cf::face::set_type $idx, $type;
3668 cf::face::set_csum $idx, 0, $info->{hash};
3669 $cf::face::SIZE[0][$idx] = $info->{size};
3670 $cf::face::FOFS[0][$idx] = $info->{fofs};
3671 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3672 $cf::face::HASH{$info->{hash}} = $idx;
3271 } else { 3673 } else {
3272 $RESOURCE{$name} = $info; 3674# $RESOURCE{$name} = $info; # unused
3273 } 3675 }
3274
3275 cf::cede_to_tick;
3276 } 3676 }
3277 } 3677 }
3678
3679 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3680
3681 # HACK to clear player env face cache, we need some signal framework
3682 # for this (global event?)
3683 %ext::player_env::MUSIC_FACE_CACHE = ();
3684
3685 # END ATOMIC
3686
3687 cf::debug "facedata atomic update time ", EV::time - $t1;
3278 3688
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3689 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3690
3691 aio_close $fh if $fh; # close old facedata
3692
3281 1 3693 1
3282} 3694}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3695
3304register_exticmd fx_want => sub { 3696register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3697 my ($ns, $want) = @_;
3306 3698
3307 while (my ($k, $v) = each %$want) { 3699 while (my ($k, $v) = each %$want) {
3315 my $status = load_resource_file_ $_[0]; 3707 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100; 3708 get_slot 0.1, 100;
3317 cf::arch::commit_load; 3709 cf::arch::commit_load;
3318 3710
3319 $status 3711 $status
3712}
3713
3714sub reload_exp_table {
3715 _reload_exp_table;
3716
3717 cf::face::set
3718 "res/exp_table" => FT_RSRC,
3719 JSON::XS->new->utf8->canonical->encode (
3720 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3721 );
3722}
3723
3724sub reload_materials {
3725 _reload_materials;
3320} 3726}
3321 3727
3322sub reload_regions { 3728sub reload_regions {
3323 # HACK to clear player env face cache, we need some signal framework 3729 # HACK to clear player env face cache, we need some signal framework
3324 # for this (global event?) 3730 # for this (global event?)
3332 if exists $_->{match}; 3738 if exists $_->{match};
3333 } 3739 }
3334} 3740}
3335 3741
3336sub reload_facedata { 3742sub reload_facedata {
3337 load_facedata "$DATADIR/facedata" 3743 load_facedata $DATADIR
3338 or die "unable to load facedata\n"; 3744 or die "unable to load facedata\n";
3339} 3745}
3340 3746
3341sub reload_archetypes { 3747sub reload_archetypes {
3342 load_resource_file "$DATADIR/archetypes" 3748 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n"; 3749 or die "unable to load archetypes\n";
3750
3751 cf::face::set
3752 "res/skill_info" => FT_RSRC,
3753 JSON::XS->new->utf8->canonical->encode (
3754 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3755 );
3756
3757 cf::face::set
3758 "res/spell_paths" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3761 );
3344} 3762}
3345 3763
3346sub reload_treasures { 3764sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3765 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3766 or die "unable to load treasurelists\n";
3349} 3767}
3350 3768
3769sub reload_sound {
3770 trace "loading sound config from $DATADIR/sound\n";
3771
3772 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3773
3774 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3775 my $sound = $soundconf->{compat}[$_]
3776 or next;
3777
3778 my $face = cf::face::find "sound/$sound->[1]";
3779 cf::sound::set $sound->[0] => $face;
3780 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3781 }
3782
3783 while (my ($k, $v) = each %{$soundconf->{event}}) {
3784 my $face = cf::face::find "sound/$v";
3785 cf::sound::set $k => $face;
3786 }
3787}
3788
3351sub reload_resources { 3789sub reload_resources {
3352 warn "reloading resource files...\n"; 3790 trace "reloading resource files...\n";
3353 3791
3792 reload_materials;
3354 reload_facedata; 3793 reload_facedata;
3794 reload_exp_table;
3795 reload_sound;
3355 reload_archetypes; 3796 reload_archetypes;
3356 reload_regions; 3797 reload_regions;
3357 reload_treasures; 3798 reload_treasures;
3358 3799
3359 warn "finished reloading resource files\n"; 3800 trace "finished reloading resource files\n";
3360} 3801}
3361 3802
3362sub reload_config { 3803sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3804 trace "reloading config file...\n";
3364 or return;
3365 3805
3366 local $/; 3806 my $config = load_file "$CONFDIR/config";
3367 *CFG = YAML::Load <$fh>; 3807 utf8::decode $config;
3808 *CFG = decode_yaml $config;
3368 3809
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3810 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3811
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3812 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3813 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 3814
3374 if (exists $CFG{mlockall}) { 3815 if (exists $CFG{mlockall}) {
3397 3838
3398 seek $fh, 0, 0; 3839 seek $fh, 0, 0;
3399 print $fh $$; 3840 print $fh $$;
3400} 3841}
3401 3842
3843sub main_loop {
3844 trace "EV::loop starting\n";
3845 if (1) {
3846 EV::loop;
3847 }
3848 trace "EV::loop returned\n";
3849 goto &main_loop unless $REALLY_UNLOOP;
3850}
3851
3402sub main { 3852sub main {
3403 cf::init_globals; # initialise logging 3853 cf::init_globals; # initialise logging
3404 3854
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3855 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3856 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3857 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3858 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409 3859
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3860 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3861
3418 # we must not ever block the main coroutine 3862 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3863 $Coro::idle = sub {
3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3864 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3421 (async { 3865 (async {
3422 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3866 $Coro::current->{desc} = "IDLE BUG HANDLER";
3423 EV::loop EV::LOOP_ONESHOT; 3867 EV::loop EV::LOOP_ONESHOT;
3424 })->prio (Coro::PRIO_MAX); 3868 })->prio (Coro::PRIO_MAX);
3425 }; 3869 };
3426 3870
3427 evthread_start IO::AIO::poll_fileno; 3871 evthread_start IO::AIO::poll_fileno;
3428 3872
3429 cf::sync_job { 3873 cf::sync_job {
3874 cf::incloader::init ();
3875
3876 db_init;
3877
3878 cf::init_anim;
3879 cf::init_attackmess;
3880 cf::init_dynamic;
3881
3882 cf::load_settings;
3883
3430 reload_resources; 3884 reload_resources;
3431 reload_config; 3885 reload_config;
3432 db_init;
3433 3886
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3887 cf::init_uuid;
3437 cf::init_signals; 3888 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3889 cf::init_skills;
3440 3890
3441 cf::init_beforeplay; 3891 cf::init_beforeplay;
3442 3892
3443 atomic; 3893 atomic;
3445 load_extensions; 3895 load_extensions;
3446 3896
3447 utime time, time, $RUNTIMEFILE; 3897 utime time, time, $RUNTIMEFILE;
3448 3898
3449 # no (long-running) fork's whatsoever before this point(!) 3899 # no (long-running) fork's whatsoever before this point(!)
3900 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3901 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3902
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3903 cf::_post_init 0;
3453 }; 3904 };
3454 3905
3455 EV::loop; 3906 cf::object::thawer::errors_are_fatal 0;
3907 info "parse errors in files are no longer fatal from this point on.\n";
3908
3909 AE::postpone {
3910 undef &main; # free gobs of memory :)
3911 };
3912
3913 goto &main_loop;
3456} 3914}
3457 3915
3458############################################################################# 3916#############################################################################
3459# initialisation and cleanup 3917# initialisation and cleanup
3460 3918
3461# install some emergency cleanup handlers 3919# install some emergency cleanup handlers
3462BEGIN { 3920BEGIN {
3463 our %SIGWATCHER = (); 3921 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3922 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3923 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3924 cf::cleanup "SIG$signal";
3467 }; 3925 };
3468 } 3926 }
3469} 3927}
3470 3928
3471sub write_runtime_sync { 3929sub write_runtime_sync {
3930 my $t0 = AE::time;
3931
3472 # first touch the runtime file to show we are still running: 3932 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3933 # the fsync below can take a very very long time.
3474 3934
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3935 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3936
3477 my $guard = cf::lock_acquire "write_runtime"; 3937 my $guard = cf::lock_acquire "write_runtime";
3478 3938
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3939 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3940 or return;
3481 3941
3482 my $value = $cf::RUNTIME + 90 + 10; 3942 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3943 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3944 # 60 allows for the watchdog to kill the server.
3497 or return; 3957 or return;
3498 3958
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3959 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3960 and return;
3501 3961
3502 warn "runtime file written.\n"; 3962 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3963
3504 1 3964 1
3505} 3965}
3506 3966
3507our $uuid_lock; 3967our $uuid_lock;
3516 my $uuid = "$LOCALDIR/uuid"; 3976 my $uuid = "$LOCALDIR/uuid";
3517 3977
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3978 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3979 or return;
3520 3980
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3981 my $value = uuid_seq uuid_cur;
3982
3983 unless ($value) {
3984 info "cowardly refusing to write zero uuid value!\n";
3985 return;
3986 }
3987
3988 my $value = uuid_str $value + $uuid_skip;
3522 $uuid_skip = 0; 3989 $uuid_skip = 0;
3523 3990
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3991 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3992 and return;
3526 3993
3532 or return; 3999 or return;
3533 4000
3534 aio_rename "$uuid~", $uuid 4001 aio_rename "$uuid~", $uuid
3535 and return; 4002 and return;
3536 4003
3537 warn "uuid file written ($value).\n"; 4004 trace "uuid file written ($value).\n";
3538 4005
3539 1 4006 1
3540 4007
3541} 4008}
3542 4009
3548} 4015}
3549 4016
3550sub emergency_save() { 4017sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 4018 my $freeze_guard = cf::freeze_mainloop;
3552 4019
3553 warn "enter emergency perl save\n"; 4020 info "emergency_perl_save: enter\n";
4021
4022 # this is a trade-off: we want to be very quick here, so
4023 # save all maps without fsync, and later call a global sync
4024 # (which in turn might be very very slow)
4025 local $USE_FSYNC = 0;
3554 4026
3555 cf::sync_job { 4027 cf::sync_job {
4028 cf::write_runtime_sync; # external watchdog should not bark
4029
3556 # use a peculiar iteration method to avoid tripping on perl 4030 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 4031 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 4032 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 4033 info "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 4034 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 4035 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 4036 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4037 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 4038 $pl->save;
3565 } 4039 }
3566 warn "end emergency player save\n"; 4040 info "emergency_perl_save: end player save\n";
3567 4041
3568 warn "begin emergency map save\n"; 4042 cf::write_runtime_sync; # external watchdog should not bark
4043
4044 info "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 4045 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 4046 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 4047 $map->valid or next;
3572 $map->save; 4048 $map->save;
3573 } 4049 }
3574 warn "end emergency map save\n"; 4050 info "emergency_perl_save: end map save\n";
3575 4051
3576 warn "begin emergency database checkpoint\n"; 4052 cf::write_runtime_sync; # external watchdog should not bark
4053
4054 info "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 4055 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 4056 info "emergency_perl_save: end database checkpoint\n";
3579 4057
3580 warn "begin write uuid\n"; 4058 info "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 4059 write_uuid_sync 1;
3582 warn "end write uuid\n"; 4060 info "emergency_perl_save: end write uuid\n";
4061
4062 cf::write_runtime_sync; # external watchdog should not bark
4063
4064 trace "emergency_perl_save: syncing database to disk";
4065 BDB::db_env_txn_checkpoint $DB_ENV;
4066
4067 info "emergency_perl_save: starting sync\n";
4068 IO::AIO::aio_sync sub {
4069 info "emergency_perl_save: finished sync\n";
4070 };
4071
4072 cf::write_runtime_sync; # external watchdog should not bark
4073
4074 trace "emergency_perl_save: flushing outstanding aio requests";
4075 while (IO::AIO::nreqs || BDB::nreqs) {
4076 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4077 }
4078
4079 cf::write_runtime_sync; # external watchdog should not bark
3583 }; 4080 };
3584 4081
3585 warn "leave emergency perl save\n"; 4082 info "emergency_perl_save: leave\n";
3586} 4083}
3587 4084
3588sub post_cleanup { 4085sub post_cleanup {
3589 my ($make_core) = @_; 4086 my ($make_core) = @_;
3590 4087
4088 IO::AIO::flush;
4089
3591 warn Carp::longmess "post_cleanup backtrace" 4090 error Carp::longmess "post_cleanup backtrace"
3592 if $make_core; 4091 if $make_core;
3593 4092
3594 my $fh = pidfile; 4093 my $fh = pidfile;
3595 unlink $PIDFILE if <$fh> == $$; 4094 unlink $PIDFILE if <$fh> == $$;
3596} 4095}
3616 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4115 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3617 for my $name (keys %$leaf_symtab) { 4116 for my $name (keys %$leaf_symtab) {
3618 _gv_clear *{"$pkg$name"}; 4117 _gv_clear *{"$pkg$name"};
3619# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4118# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3620 } 4119 }
3621 warn "cleared package $pkg\n";#d#
3622} 4120}
3623 4121
3624sub do_reload_perl() { 4122sub do_reload_perl() {
3625 # can/must only be called in main 4123 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 4124 unless (in_main) {
3627 warn "can only reload from main coroutine"; 4125 error "can only reload from main coroutine";
3628 return; 4126 return;
3629 } 4127 }
3630 4128
3631 return if $RELOAD++; 4129 return if $RELOAD++;
3632 4130
4131 my $t1 = AE::time;
4132
3633 while ($RELOAD) { 4133 while ($RELOAD) {
3634 warn "reloading..."; 4134 cf::get_slot 0.1, -1, "reload_perl";
4135 info "perl_reload: reloading...";
3635 4136
3636 warn "entering sync_job"; 4137 trace "perl_reload: entering sync_job";
3637 4138
3638 cf::sync_job { 4139 cf::sync_job {
3639 cf::write_runtime_sync; # external watchdog should not bark
3640 cf::emergency_save; 4140 #cf::emergency_save;
3641 cf::write_runtime_sync; # external watchdog should not bark
3642 4141
3643 warn "syncing database to disk";
3644 BDB::db_env_txn_checkpoint $DB_ENV;
3645
3646 # if anything goes wrong in here, we should simply crash as we already saved
3647
3648 warn "flushing outstanding aio requests";
3649 while (IO::AIO::nreqs || BDB::nreqs) {
3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3651 }
3652
3653 warn "cancelling all extension coros"; 4142 trace "perl_reload: cancelling all extension coros";
3654 $_->cancel for values %EXT_CORO; 4143 $_->cancel for values %EXT_CORO;
3655 %EXT_CORO = (); 4144 %EXT_CORO = ();
3656 4145
3657 warn "removing commands"; 4146 trace "perl_reload: removing commands";
3658 %COMMAND = (); 4147 %COMMAND = ();
3659 4148
3660 warn "removing ext/exti commands"; 4149 trace "perl_reload: removing ext/exti commands";
3661 %EXTCMD = (); 4150 %EXTCMD = ();
3662 %EXTICMD = (); 4151 %EXTICMD = ();
3663 4152
3664 warn "unloading/nuking all extensions"; 4153 trace "perl_reload: unloading/nuking all extensions";
3665 for my $pkg (@EXTS) { 4154 for my $pkg (@EXTS) {
3666 warn "... unloading $pkg"; 4155 trace "... unloading $pkg";
3667 4156
3668 if (my $cb = $pkg->can ("unload")) { 4157 if (my $cb = $pkg->can ("unload")) {
3669 eval { 4158 eval {
3670 $cb->($pkg); 4159 $cb->($pkg);
3671 1 4160 1
3672 } or warn "$pkg unloaded, but with errors: $@"; 4161 } or error "$pkg unloaded, but with errors: $@";
3673 } 4162 }
3674 4163
3675 warn "... clearing $pkg"; 4164 trace "... clearing $pkg";
3676 clear_package $pkg; 4165 clear_package $pkg;
3677 } 4166 }
3678 4167
3679 warn "unloading all perl modules loaded from $LIBDIR"; 4168 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) { 4169 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4170 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682 4171
3683 warn "... unloading $k"; 4172 trace "... unloading $k";
3684 delete $INC{$k}; 4173 delete $INC{$k};
3685 4174
3686 $k =~ s/\.pm$//; 4175 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g; 4176 $k =~ s/\//::/g;
3688 4177
3691 } 4180 }
3692 4181
3693 clear_package $k; 4182 clear_package $k;
3694 } 4183 }
3695 4184
3696 warn "getting rid of safe::, as good as possible"; 4185 trace "perl_reload: getting rid of safe::, as good as possible";
3697 clear_package "safe::$_" 4186 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4187 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 4188
3700 warn "unloading cf.pm \"a bit\""; 4189 trace "perl_reload: unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 4190 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 4191 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 4192
3704 # don't, removes xs symbols, too, 4193 # don't, removes xs symbols, too,
3705 # and global variables created in xs 4194 # and global variables created in xs
3706 #clear_package __PACKAGE__; 4195 #clear_package __PACKAGE__;
3707 4196
3708 warn "unload completed, starting to reload now"; 4197 info "perl_reload: unload completed, starting to reload now";
3709 4198
3710 warn "reloading cf.pm"; 4199 trace "perl_reload: reloading cf.pm";
3711 require cf; 4200 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4201 cf::_connect_to_perl_1;
3713 4202
3714 warn "loading config and database again"; 4203 trace "perl_reload: loading config and database again";
3715 cf::reload_config; 4204 cf::reload_config;
3716 4205
3717 warn "loading extensions"; 4206 trace "perl_reload: loading extensions";
3718 cf::load_extensions; 4207 cf::load_extensions;
3719 4208
4209 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 4210 trace "perl_reload: reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 4211 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 4212 trace "perl_reload: reattaching attachments to maps";
3723 reattach $_ for values %MAP; 4213 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 4214 trace "perl_reload: reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 4215 reattach $_ for values %PLAYER;
4216 }
3726 4217
3727 warn "running post_load"; 4218 cf::_post_init 1;
3728 (pop @POST_INIT)->(1) while @POST_INIT;
3729 4219
3730 warn "leaving sync_job"; 4220 trace "perl_reload: leaving sync_job";
3731 4221
3732 1 4222 1
3733 } or do { 4223 } or do {
3734 warn $@; 4224 error $@;
3735 cf::cleanup "error while reloading, exiting."; 4225 cf::cleanup "perl_reload: error, exiting.";
3736 }; 4226 };
3737 4227
3738 warn "reloaded";
3739 --$RELOAD; 4228 --$RELOAD;
3740 } 4229 }
4230
4231 $t1 = AE::time - $t1;
4232 info "perl_reload: completed in ${t1}s\n";
3741}; 4233};
3742 4234
3743our $RELOAD_WATCHER; # used only during reload 4235our $RELOAD_WATCHER; # used only during reload
3744 4236
3745sub reload_perl() { 4237sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 4238 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 4239 # coro crashes during coro_state_free->destroy here.
3748 4240
4241 $RELOAD_WATCHER ||= cf::async {
4242 Coro::AIO::aio_wait cache_extensions;
4243
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4244 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 4245 do_reload_perl;
3751 undef $RELOAD_WATCHER; 4246 undef $RELOAD_WATCHER;
4247 };
3752 }; 4248 };
3753} 4249}
3754 4250
3755register_command "reload" => sub { 4251register_command "reload" => sub {
3756 my ($who, $arg) = @_; 4252 my ($who, $arg) = @_;
3762 reload_perl; 4258 reload_perl;
3763 }; 4259 };
3764 } 4260 }
3765}; 4261};
3766 4262
3767unshift @INC, $LIBDIR; 4263#############################################################################
3768 4264
3769my $bug_warning = 0; 4265my $bug_warning = 0;
3770 4266
3771our @WAIT_FOR_TICK;
3772our @WAIT_FOR_TICK_BEGIN;
3773
3774sub wait_for_tick { 4267sub wait_for_tick() {
3775 return if tick_inhibit || $Coro::current == $Coro::main; 4268 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3776 4269
3777 my $signal = new Coro::Signal; 4270 $WAIT_FOR_TICK->wait;
3778 push @WAIT_FOR_TICK, $signal;
3779 $signal->wait;
3780} 4271}
3781 4272
3782sub wait_for_tick_begin { 4273sub wait_for_tick_begin() {
3783 return if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3784 4275
3785 my $signal = new Coro::Signal; 4276 my $signal = new Coro::Signal;
3786 push @WAIT_FOR_TICK_BEGIN, $signal; 4277 push @WAIT_FOR_TICK_BEGIN, $signal;
3787 $signal->wait; 4278 $signal->wait;
3788} 4279}
3792 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4283 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3793 unless ++$bug_warning > 10; 4284 unless ++$bug_warning > 10;
3794 return; 4285 return;
3795 } 4286 }
3796 4287
3797 cf::server_tick; # one server iteration 4288 cf::one_tick; # one server iteration
4289
4290 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3798 4291
3799 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4292 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3800 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4293 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3801 Coro::async_pool { 4294 Coro::async_pool {
3802 $Coro::current->{desc} = "runtime saver"; 4295 $Coro::current->{desc} = "runtime saver";
3803 write_runtime_sync 4296 write_runtime_sync
3804 or warn "ERROR: unable to write runtime file: $!"; 4297 or error "ERROR: unable to write runtime file: $!";
3805 }; 4298 };
3806 } 4299 }
3807 4300
3808 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4301 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3809 $sig->send; 4302 $sig->send;
3810 } 4303 }
3811 while (my $sig = shift @WAIT_FOR_TICK) { 4304 $WAIT_FOR_TICK->broadcast;
3812 $sig->send;
3813 }
3814 4305
3815 $LOAD = ($NOW - $TICK_START) / $TICK; 4306 $LOAD = ($NOW - $TICK_START) / $TICK;
3816 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4307 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3817 4308
3818 if (0) { 4309 if (0) {
3819 if ($NEXT_TICK) { 4310 if ($NEXT_TICK) {
3820 my $jitter = $TICK_START - $NEXT_TICK; 4311 my $jitter = $TICK_START - $NEXT_TICK;
3821 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4312 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3822 warn "jitter $JITTER\n";#d# 4313 debug "jitter $JITTER\n";#d#
3823 } 4314 }
3824 } 4315 }
3825} 4316}
3826 4317
3827{ 4318{
3828 # configure BDB 4319 # configure BDB
4320 info "initialising database";
3829 4321
3830 BDB::min_parallel 8; 4322 BDB::min_parallel 16;
3831 BDB::max_poll_reqs $TICK * 0.1; 4323 BDB::max_poll_reqs $TICK * 0.1;
3832 $AnyEvent::BDB::WATCHER->priority (1); 4324 #$AnyEvent::BDB::WATCHER->priority (1);
3833 4325
3834 unless ($DB_ENV) { 4326 unless ($DB_ENV) {
3835 $DB_ENV = BDB::db_env_create; 4327 $DB_ENV = BDB::db_env_create;
3836 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4328 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3837 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4329 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3862 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4354 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3863 }; 4355 };
3864 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4356 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3865 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4357 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3866 }; 4358 };
4359
4360 info "database initialised";
3867} 4361}
3868 4362
3869{ 4363{
3870 # configure IO::AIO 4364 # configure IO::AIO
3871 4365
4366 info "initialising aio";
3872 IO::AIO::min_parallel 8; 4367 IO::AIO::min_parallel 8;
3873 IO::AIO::max_poll_time $TICK * 0.1; 4368 IO::AIO::max_poll_time $TICK * 0.1;
3874 undef $AnyEvent::AIO::WATCHER; 4369 undef $AnyEvent::AIO::WATCHER;
4370 info "aio initialised";
3875} 4371}
3876 4372
3877my $_log_backtrace; 4373our $_log_backtrace;
4374our $_log_backtrace_last;
3878 4375
3879sub _log_backtrace { 4376sub _log_backtrace {
3880 my ($msg, @addr) = @_; 4377 my ($msg, @addr) = @_;
3881 4378
3882 $msg =~ s/\n//; 4379 $msg =~ s/\n$//;
3883 4380
4381 if ($_log_backtrace_last eq $msg) {
4382 LOG llevInfo, "[ABT] $msg\n";
4383 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3884 # limit the # of concurrent backtraces 4384 # limit the # of concurrent backtraces
3885 if ($_log_backtrace < 2) { 4385 } elsif ($_log_backtrace < 2) {
4386 $_log_backtrace_last = $msg;
3886 ++$_log_backtrace; 4387 ++$_log_backtrace;
3887 my $perl_bt = Carp::longmess $msg; 4388 my $perl_bt = Carp::longmess $msg;
3888 async { 4389 async {
3889 $Coro::current->{desc} = "abt $msg"; 4390 $Coro::current->{desc} = "abt $msg";
3890 4391
3910 LOG llevInfo, "[ABT] $_\n" for @bt; 4411 LOG llevInfo, "[ABT] $_\n" for @bt;
3911 --$_log_backtrace; 4412 --$_log_backtrace;
3912 }; 4413 };
3913 } else { 4414 } else {
3914 LOG llevInfo, "[ABT] $msg\n"; 4415 LOG llevInfo, "[ABT] $msg\n";
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 4416 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3916 } 4417 }
3917} 4418}
3918 4419
3919# load additional modules 4420# load additional modules
3920use cf::pod; 4421require "cf/$_.pm" for @EXTRA_MODULES;
4422cf::_connect_to_perl_2;
3921 4423
3922END { cf::emergency_save } 4424END { cf::emergency_save }
3923 4425
39241 44261
3925 4427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines