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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.604 by root, Thu Nov 15 07:08:08 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines