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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines