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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines