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.462 by root, Tue Dec 23 06:58:23 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;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 63use Compress::LZF;
62use Digest::MD5 (); 64use Digest::MD5 ();
63 65
64AnyEvent::detect; 66AnyEvent::detect;
65 67
72 74
73# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::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
76 78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83
84our @ORIG_INC;
78 85
79our %COMMAND = (); 86our %COMMAND = ();
80our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
81 88
82our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
83our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
84our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
85our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
87 96
88our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
90 101
91our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
92our $DATADIR = datadir; 104our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
96our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 117
105our %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;
106 125
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 128our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 129our $USE_FSYNC = 1; # use fsync to write maps - default on
111 130
112our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 134our $DB_ENV;
116 135
136our @EXTRA_MODULES = qw(pod match mapscript incloader);
137
117our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
118 140
119our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
121our $NOW; 144our $NOW;
122 145
123our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
124our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
125our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
132our $JITTER; # average jitter 155our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 156our $TICK_START; # for load detecting purposes
134 157
135our @POST_INIT; 158our @POST_INIT;
136 159
137our $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;
138 165
139binmode STDOUT; 166binmode STDOUT;
140binmode STDERR; 167binmode STDERR;
141 168
142# read virtual server time, if available 169# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 171 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 172 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 173 $RUNTIME = <$fh> + 0.;
147} 174}
148 175
176eval "sub TICK() { $TICK } 1" or die;
177
149mkdir $_ 178mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 179 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 180
152our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
153 182
154sub cf::map::normalise; 183sub cf::map::normalise;
155 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
156############################################################################# 189#############################################################################
157 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
158=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
159 203
160=over 4 204=over 4
161 205
162=item $cf::UPTIME 206=item $cf::UPTIME
163 207
164The 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.
165 224
166=item $cf::RUNTIME 225=item $cf::RUNTIME
167 226
168The 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
169every server tick. 228every server tick.
170 229
171=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
172$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
173$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
174 233
175Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
176directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
177unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
178database environment. 237database environment.
179 238
180=item $cf::NOW
181
182The time of the last (current) server tick.
183
184=item $cf::TICK
185
186The interval between server ticks, in seconds.
187
188=item $cf::LOADAVG 239=item $cf::LOADAVG
189 240
190The 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
191(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
192objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
200Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
201from wherever your confdir points to. 252from wherever your confdir points to.
202 253
203=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
204 255
205These 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.
206returns 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
207per 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();
208 277
209=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
210 279
211This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
212C<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
213that call. 282that call.
214 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
215=back 290=back
216 291
217=cut 292=cut
218 293
219BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
220 *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 {
221 my $msg = join "", @_; 301 my $msg = join "", @_;
222 302
223 $msg .= "\n" 303 $msg .= "\n"
224 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
225 305
226 $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;
227 307
228 LOG llevError, $msg; 308 LOG llevWarn, $msg;
229 }; 309};
230}
231 310
232$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
234 313
235 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 318 return;#d#
238 }#d# 319 }#d#
239 320
240 # kill coroutine otherwise 321 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 322 Coro::terminate
243}; 323};
244
245$SIG{__DIE__} = sub { }; #d#?
246 324
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 342)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 344}
267 345
268$EV::DIED = sub { 346$EV::DIED = sub {
269 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
270}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
271 354
272############################################################################# 355#############################################################################
273 356
274=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
275 358
296 $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;
297 $d 380 $d
298 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
299} 382}
300 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
301=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
302 437
303Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
304 439
305=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
311our $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
312 447
313sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
315 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
316=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
317 483
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
320 486
321The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 488is a reload or not.
323 489
324=cut 490=cut
325 491
326sub post_init(&) { 492sub post_init(&) {
327 push @POST_INIT, shift; 493 push @POST_INIT, shift;
328} 494}
329 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
330=item cf::lock_wait $string 513=item cf::lock_wait $string
331 514
332Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
333 516
334=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
335 518
336Wait 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
337a 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,
371} 554}
372 555
373=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
374 557
375Like 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
376get spread over timer. 559get spread over time.
377 560
378=cut 561=cut
379 562
380sub periodic($$) { 563sub periodic($$) {
381 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
386} 569}
387 570
388=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
389 572
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
391This 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
392of 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.
393 580
394The 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
395used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
396 583
397Useful for short background jobs. 584Useful for short background jobs.
398 585
399=cut 586=cut
400 587
401our @SLOT_QUEUE; 588our @SLOT_QUEUE;
402our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
403 591
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
407 595
408 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
409 598
410 while () { 599 while () {
411 next_job: 600 next_job:
601
602 Coro::cede;
603
412 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 605
414 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
608 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 610 $job->[2]->send;
418 Coro::cede;
419 goto next_job; 611 goto next_job;
420 } 612 } else {
613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 614 }
422 } 615 }
423 616
424 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else { 619 } else {
620 $busy = 0;
429 Coro::schedule; 621 Coro::schedule;
430 } 622 }
431 } 623 }
432}; 624};
433 625
434sub get_slot($;$$) { 626sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
436 628
437 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
438 630
439 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
440 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
441 634
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
456BEGIN { *async = \&Coro::async_pool } 649BEGIN { *async = \&Coro::async_pool }
457 650
458=item cf::sync_job { BLOCK } 651=item cf::sync_job { BLOCK }
459 652
460The design of Deliantra requires that the main coroutine ($Coro::main) 653The design of Deliantra requires that the main coroutine ($Coro::main)
461is always able to handle events or runnable, as Deliantra is only 654is always able to handle events or is runnable, as Deliantra is only
462partly 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
463acceptable. 656acceptable.
464 657
465If 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
466the given BLOCK in another coroutine while waiting for the result. The 659the given BLOCK in another coroutine while waiting for the result. The
470=cut 663=cut
471 664
472sub sync_job(&) { 665sub sync_job(&) {
473 my ($job) = @_; 666 my ($job) = @_;
474 667
475 if ($Coro::current == $Coro::main) { 668 if (in_main) {
476 my $time = EV::time; 669 my $time = AE::time;
477 670
478 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
480 673
481 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
482 675
483 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
484 677
485 my $busy = 1; 678 my $busy = 1;
486 my @res; 679 my @res;
487 680
488 (async { 681 (async {
489 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 683 @res = eval { $job->() };
491 warn $@ if $@; 684 error $@ if $@;
492 undef $busy; 685 undef $busy;
493 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
494 687
495 while ($busy) { 688 while ($busy) {
496 if (Coro::nready) { 689 if (Coro::nready) {
497 Coro::cede_notself; 690 Coro::cede_notself;
498 } else { 691 } else {
499 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
500 } 693 }
501 } 694 }
502 695
503 my $time = EV::time - $time; 696 my $time = AE::time - $time;
504 697
505 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
506 699
507 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
508 } else { 701 } else {
530 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
531 724
532 $coro 725 $coro
533} 726}
534 727
535=item fork_call { }, $args 728=item fork_call { }, @args
536 729
537Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 733never block itself or use any form of event handling.
541 734
542=cut 735=cut
543 736
737sub post_fork {
738 reset_signals;
739}
740
544sub fork_call(&@) { 741sub fork_call(&@) {
545 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
546 743
547 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious)
550
551 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
552 reset_signals; 745 cf::post_fork;
553 &$cb 746 &$cb
554 }, @args; 747 } @args;
555 748
556 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 )
557} 761}
558 762
559=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
560 764
561=cut 765=cut
598within each server. 802within each server.
599 803
600=cut 804=cut
601 805
602sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
603 my ($name) = @_; 810 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
605 812
606 eval { 813 eval {
607 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
617} 824}
618 825
619our $DB; 826our $DB;
620 827
621sub db_init { 828sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
624 };
625} 830}
626 831
627sub db_get($$) { 832sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
629 834
630 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
631 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
632 839
633 $! ? () 840 $! ? ()
634 : $data 841 : $data
635 }
636} 842}
637 843
638sub db_put($$$) { 844sub db_put($$$) {
639 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 874
669 my @data; 875 my @data;
670 my $md5; 876 my $md5;
671 877
672 for (0 .. $#$src) { 878 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 880 }
676 881
677 # if processing is expensive, check 882 # if processing is expensive, check
678 # checksum first 883 # checksum first
679 if (1) { 884 if (1) {
692 897
693 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
694 } 899 }
695 } 900 }
696 901
697 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
698 my $data = $process->(\@data); 903 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
700 905
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 907
703 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
706 911
716 921
717=cut 922=cut
718 923
719sub datalog($@) { 924sub datalog($@) {
720 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 927}
723 928
724=back 929=back
725 930
726=cut 931=cut
921 1126
922 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1129
925 } elsif (ref $type) { 1130 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
927 1132
928 } else { 1133 } else {
929 shift @arg; 1134 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
931 } 1136 }
932 } 1137 }
933} 1138}
934 1139
935sub _object_attach { 1140sub _object_attach {
945 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
946 } 1151 }
947 1152
948 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
949 } else { 1154 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1156 }
952 1157
953 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
954} 1159}
955 1160
1014 1219
1015 for (@$callbacks) { 1220 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1017 1222
1018 if ($@) { 1223 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1225 override;
1022 } 1226 }
1023 1227
1024 return 1 if $override; 1228 return 1 if $override;
1025 } 1229 }
1104 for (@$attach) { 1308 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1107 } 1311 }
1108 } else { 1312 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1314 }
1111 } 1315 }
1112} 1316}
1113 1317
1114cf::attachable->attach ( 1318cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1142 1346
1143 sync_job { 1347 sync_job {
1144 if (length $$rdata) { 1348 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1148 1353
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1361 aio_close $fh;
1154 1362
1155 if (@$objs) { 1363 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1365 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1372 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1374 }
1164 } else { 1375 } else {
1165 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1169 1380
1170 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1383 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1174 } 1385 }
1175 } else { 1386 } else {
1176 aio_unlink $filename; 1387 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1178 } 1389 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1414 $av = $st->{objs};
1204 } 1415 }
1205 1416
1206 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1209 1421
1210 ($data, $av) 1422 ($data, $av)
1211} 1423}
1212 1424
1213=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1217=cut 1429=cut
1218 1430
1219############################################################################# 1431#############################################################################
1220# command handling &c 1432# command handling &c
1221 1433
1222=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1223 1435
1224Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1225$name. 1437$name.
1226 1438
1227=cut 1439=cut
1233 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1234 1446
1235 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1236} 1448}
1237 1449
1238=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1239 1451
1240Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1241extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1242received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1243the 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
1244has logged in successfully. 1456has logged in successfully.
1245 1457
1246If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1247called.
1248 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
1249=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1250 1466
1251Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1252exticmd 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
1253are 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
1254is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1255log-in. 1471log-in.
1256 1472
1257If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1258called.
1259 1474
1260=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1261 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
1262sub register_extcmd { 1482sub register_extcmd($$) {
1263 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1264 1484
1265 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1266} 1486}
1267 1487
1268sub register_exticmd { 1488sub register_async_extcmd($$) {
1269 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1270 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1271 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1272} 1498}
1273 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1274use File::Glob (); 1506use File::Glob ();
1275 1507
1276cf::player->attach ( 1508cf::player->attach (
1277 on_command => sub { 1509 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1279 1511
1280 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1281 or return; 1513 or return;
1282 1514
1290 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1291 1523
1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1293 1525
1294 if (ref $msg) { 1526 if (ref $msg) {
1295 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1296 "ARRAY" eq ref $msg
1297 ? @$msg
1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1299 1528
1300 my @reply;
1301
1302 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}) {
1303 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1304 } 1547 }
1305 1548
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1309 } else { 1549 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1551 }
1312 1552
1313 cf::override; 1553 cf::override;
1314 }, 1554 },
1315); 1555);
1316 1556
1317# "readahead" all extensions 1557# "readahead" all extensions
1318sub cache_extensions { 1558sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1559 my $grp = IO::AIO::aio_group;
1320 1560
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1561 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1562 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1563 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1564 }
1325 }; 1565 };
1326 1566
1327 $grp 1567 $grp
1328} 1568}
1329 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
1330sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1331 cf::sync_job { 1586 cf::sync_job {
1332 my %todo; 1587 my %todo;
1333 1588
1334 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1590 next unless -r $path;
1353 1608
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1611
1357 $ext{source} = 1612 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1360 . $source 1615 . $source
1361 . "\n};\n1"; 1616 . "\n};\n1";
1362 1617
1363 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1364 } 1619 }
1365 1620
1621 my $pass = 0;
1366 my %done; 1622 my %done;
1367 while (%todo) { 1623 while (%todo) {
1368 my $progress; 1624 my $progress;
1369 1625
1626 ++$pass;
1627
1628 ext:
1370 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1631 next ext
1373 unless exists $done{$_}; 1632 unless exists $done{$_};
1374 } 1633 }
1375 1634
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1636
1378 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 $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1650
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1652 if exists $v->{meta}{mandatory};
1386 1653
1387 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;
1388 } 1663 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1664 }
1394 1665
1395 skip: 1666 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 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 }
1398 } 1676 }
1399 }; 1677 };
1400} 1678}
1401 1679
1402############################################################################# 1680#############################################################################
1486 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1487 } 1765 }
1488 } 1766 }
1489} 1767}
1490 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
1491sub save($) { 1782sub save($) {
1492 my ($pl) = @_; 1783 my ($pl) = @_;
1493 1784
1494 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1495 1786
1500 1791
1501 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1503 1794
1504 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];
1505 1799
1506 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1801 cf::cede_to_tick;
1508} 1802}
1509 1803
1543 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1544 1838
1545 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1546 $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
1547 1841
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1843 $pl->deactivate;
1844
1550 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;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1553 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1554 1850
1555 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1611 \@logins 1907 \@logins
1612} 1908}
1613 1909
1614=item $player->maps 1910=item $player->maps
1615 1911
1912=item cf::player::maps $login
1913
1616Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1617player. May block. 1915player. May block.
1618 1916
1619=cut 1917=cut
1620 1918
1641 1939
1642=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1643 1941
1644Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1645 1943
1646=item $player->ext_reply ($msgid, @msg)
1647
1648Sends an ext reply to the player.
1649
1650=cut
1651
1652sub ext_reply($$@) {
1653 my ($self, $id, @msg) = @_;
1654
1655 $self->ns->ext_reply ($id, @msg)
1656}
1657
1658=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1659 1945
1660Sends an ext event to the client. 1946Sends an ext event to the client.
1661 1947
1662=cut 1948=cut
1681 1967
1682=cut 1968=cut
1683 1969
1684sub find_by_path($) { 1970sub find_by_path($) {
1685 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1686 1974
1687 my ($match, $specificity); 1975 my ($match, $specificity);
1688 1976
1689 for my $region (list) { 1977 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1719sub generate_random_map { 2007sub generate_random_map {
1720 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1721 2009
1722 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
1723 2011
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1733 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1734 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1735 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1736 (cf::region::find $rmp->{region}), $rmp->{custom}
1737 )
1738} 2013}
1739 2014
1740=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1741 2016
1742Register 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
1747 2022
1748sub register { 2023sub register {
1749 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 2025 my $pkg = caller;
1751 2026
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 2028
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 2030}
1757 2031
1758# also paths starting with '/' 2032# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 2034
1761sub thawer_merge { 2035sub thawer_merge {
1762 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1763 2037
1764 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1769} 2043}
1770 2044
1771sub normalise { 2045sub normalise {
1772 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1773 2047
1774 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1775 2049
1776 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1777 2051
1778 # map plan: 2052 # map plan:
1779 # 2053 #
1794 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 2069 $path = "$base/$path";
1796 } 2070 }
1797 2071
1798 for ($path) { 2072 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1802 } 2075 }
1803 2076
1804 $path 2077 $path
1818 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1819 return $self; 2092 return $self;
1820 } 2093 }
1821 } 2094 }
1822 2095
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 2097 ()
1825} 2098}
1826 2099
2100# may re-bless or do other evil things
1827sub init { 2101sub init {
1828 my ($self) = @_; 2102 my ($self) = @_;
1829 2103
1830 $self 2104 $self
1831} 2105}
1896 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1897 2171
1898 1 2172 1
1899} 2173}
1900 2174
2175# used to laod the header of an original map
1901sub load_header_orig { 2176sub load_header_orig {
1902 my ($self) = @_; 2177 my ($self) = @_;
1903 2178
1904 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1905} 2180}
1906 2181
2182# used to laod the header of an instantiated map
1907sub load_header_temp { 2183sub load_header_temp {
1908 my ($self) = @_; 2184 my ($self) = @_;
1909 2185
1910 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1911} 2187}
1912 2188
2189# called after loading the header from an instantiated map
1913sub prepare_temp { 2190sub prepare_temp {
1914 my ($self) = @_; 2191 my ($self) = @_;
1915 2192
1916 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1917 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1918 # safety 2195 # safety
1919 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1920 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1921} 2198}
1922 2199
2200# called after loading the header from an original map
1923sub prepare_orig { 2201sub prepare_orig {
1924 my ($self) = @_; 2202 my ($self) = @_;
1925 2203
1926 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1927 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1951 2229
1952sub find; 2230sub find;
1953sub find { 2231sub find {
1954 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1955 2233
2234 cf::cede_to_tick;
2235
1956 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1957 2237
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2240
1961 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1978 2258
1979 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1980 } 2260 }
1981} 2261}
1982 2262
1983sub pre_load { } 2263sub pre_load { }
1984sub post_load { } 2264#sub post_load { } # XS
1985 2265
1986sub load { 2266sub load {
1987 my ($self) = @_; 2267 my ($self) = @_;
1988 2268
1989 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
1992 2272
1993 { 2273 {
1994 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
1995 2275
1996 return unless $self->valid; 2276 return unless $self->valid;
1997 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
1998
1999 $self->in_memory (cf::MAP_LOADING);
2000 2278
2001 $self->alloc; 2279 $self->alloc;
2002 2280
2003 $self->pre_load; 2281 $self->pre_load;
2004 cf::cede_to_tick; 2282 cf::cede_to_tick;
2005 2283
2284 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2286 $f->skip_block;
2008 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2009 or return; 2288 or return;
2010 2289
2011 $self->post_load_original 2290 $self->post_load_original
2012 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2013 2292
2014 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2294 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2297 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2021 } 2301 }
2022 } 2302 }
2023 }
2024 2303
2025 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2026 2311
2027 cf::cede_to_tick; 2312 cf::cede_to_tick;
2028 # now do the right thing for maps 2313 # now do the right thing for maps
2029 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2034 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2320 $self->decay_objects;
2036 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2037 $self->update_buttons; 2322 $self->update_buttons;
2038 cf::cede_to_tick; 2323 cf::cede_to_tick;
2039 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2040 } 2325 }
2041 2326
2042 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2044
2045 $self->in_memory (cf::MAP_ACTIVE);
2046 } 2329 }
2047 2330
2048 $self->post_load; 2331 $self->post_load;
2049}
2050 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
2051sub customise_for { 2339sub customise_for {
2052 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2053 2341
2054 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2343 if $self->per_player;
2058# if $self->per_party; 2346# if $self->per_party;
2059 2347
2060 $self 2348 $self
2061} 2349}
2062 2350
2063# find and load all maps in the 3x3 area around a map
2064sub load_neighbours {
2065 my ($map) = @_;
2066
2067 my @neigh; # diagonal neighbours
2068
2069 for (0 .. 3) {
2070 my $neigh = $map->tile_path ($_)
2071 or next;
2072 $neigh = find $neigh, $map
2073 or next;
2074 $neigh->load;
2075
2076 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 }
2080
2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
2083 my $neigh = find $path, $origin
2084 or next;
2085 $neigh->load;
2086 }
2087}
2088
2089sub find_sync { 2351sub find_sync {
2090 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2091 2353
2092 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
2093} 2359}
2094 2360
2095sub do_load_sync { 2361sub do_load_sync {
2096 my ($map) = @_; 2362 my ($map) = @_;
2097 2363
2364 # it's a bug to call this from the main context
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2100 2367
2101 cf::sync_job { $map->load }; 2368 $map->load;
2102} 2369}
2103 2370
2104our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2106 2373
2107sub find_async { 2374sub find_async {
2108 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2109 2376
2110 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2111 2378
2112 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2114 } 2381 }
2115 2382
2116 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2117 2384
2118 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2119 $Coro::current->{desc} = "map prefetcher"; 2386 $Coro::current->{desc} = "map prefetcher";
2120 2387
2121 while (%MAP_PREFETCH) { 2388 while (%MAP_PREFETCH) {
2122 while (my ($k, $v) = each %MAP_PREFETCH) { 2389 for my $k (keys %MAP_PREFETCH) {
2123 if (my $map = find $k) { 2390 if (my $map = find $k) {
2124 $map->load if $v; 2391 $map->load if $MAP_PREFETCH{$k};
2125 } 2392 }
2126 2393
2127 delete $MAP_PREFETCH{$k}; 2394 delete $MAP_PREFETCH{$k};
2128 } 2395 }
2129 } 2396 }
2132 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2133 2400
2134 () 2401 ()
2135} 2402}
2136 2403
2404# common code, used by both ->save and ->swapout
2137sub save { 2405sub _save {
2138 my ($self) = @_; 2406 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2407
2142 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2143 2409
2144 return unless $self->dirty; 2410 return unless $self->dirty;
2145 2411
2165 } else { 2431 } else {
2166 $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);
2167 } 2433 }
2168} 2434}
2169 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2170sub swap_out { 2444sub swap_out {
2171 my ($self) = @_; 2445 my ($self) = @_;
2172 2446
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2178 return if $self->players; 2451 return if $self->players;
2179 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
2180 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2181 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
2182 $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};
2183 2503
2184 $self->deactivate; 2504 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2506 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2507
2232 $self->unlink_save; 2508 $self->unlink_save;
2233 $self->destroy; 2509 $self->destroy;
2234} 2510}
2235 2511
2243 2519
2244 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2245 2521
2246 $self->unlink_save; 2522 $self->unlink_save;
2247 2523
2248 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2529
2310 : normalise $_ 2586 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2588 ]
2313} 2589}
2314 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
2315=back 2623=back
2316 2624
2317=head3 cf::object 2625=head3 cf::object
2318 2626
2319=cut 2627=cut
2342 2650
2343Creates 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.
2344 2652
2345=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2346 2654
2347returns 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,
2348even if the object actually exists. May block. 2656even if the object actually exists. May block.
2349 2657
2350=cut 2658=cut
2351 2659
2352sub deref { 2660sub deref {
2384 2692
2385our $SAY_CHANNEL = { 2693our $SAY_CHANNEL = {
2386 id => "say", 2694 id => "say",
2387 title => "Map", 2695 title => "Map",
2388 reply => "say ", 2696 reply => "say ",
2389 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.",
2390}; 2698};
2391 2699
2392our $CHAT_CHANNEL = { 2700our $CHAT_CHANNEL = {
2393 id => "chat", 2701 id => "chat",
2394 title => "Chat", 2702 title => "Chat",
2434=item $player_object->may ("access") 2742=item $player_object->may ("access")
2435 2743
2436Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2437(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2438 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
2439=cut 2772=cut
2440 2773
2441sub cf::object::player::may { 2774sub cf::object::player::may {
2442 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2443 2776
2444 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2445 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2446 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2447 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2448} 2781}
2449 2782
2450=item $player_object->enter_link 2783=item $player_object->enter_link
2451 2784
2452Freezes 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}>).
2453 2786
2454The 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.
2455for 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,
2456though, 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
2457map. 2790map.
2458 2791
2459Will 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.
2460 2799
2461=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2462 2801
2463Moves 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
2464map. 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
2482sub cf::object::player::enter_link { 2821sub cf::object::player::enter_link {
2483 my ($self) = @_; 2822 my ($self) = @_;
2484 2823
2485 $self->deactivate_recursive; 2824 $self->deactivate_recursive;
2486 2825
2826 ++$self->{_link_recursion};
2827
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2828 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2829
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2830 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2831 if $self->map && $self->map->{path} ne "{link}";
2491 2832
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2833 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2834}
2494 2835
2495sub cf::object::player::leave_link { 2836sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2837 my ($self, $map, $x, $y) = @_;
2497 2838
2514 ($x, $y) = (-1, -1) 2855 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2856 unless (defined $x) && (defined $y);
2516 2857
2517 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2520 2861
2521 $map->load; 2862 $map->load;
2522 $map->load_neighbours;
2523 2863
2524 return unless $self->contr->active; 2864 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2865
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2867 if ($self->enter_map ($map, $x, $y)) {
2530} 2868 # entering was successful
2869 delete $self->{_link_recursion};
2870 # only activate afterwards, to support waiting in hooks
2871 $self->activate_recursive;
2872 }
2531 2873
2874}
2875
2532=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)]])
2533 2877
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2879her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2544 2888
2545our $GOTOGEN; 2889our $GOTOGEN;
2546 2890
2547sub cf::object::player::goto { 2891sub cf::object::player::goto {
2548 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 }
2549 2899
2550 # 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
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2901 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2902
2553 $self->enter_link; 2903 $self->enter_link;
2573 ($path, $x, $y) = (undef, undef, undef); 2923 ($path, $x, $y) = (undef, undef, undef);
2574 } 2924 }
2575 } 2925 }
2576 2926
2577 my $map = eval { 2927 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2928 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2579 2929
2580 if ($map) { 2930 if ($map) {
2581 $map = $map->customise_for ($self); 2931 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2932 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2933 } else {
2584 $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);
2585 } 2935 }
2586 2936
2587 $map 2937 $map
2595 if ($gen == $self->{_goto_generation}) { 2945 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2946 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2947 $self->leave_link ($map, $x, $y);
2598 } 2948 }
2599 2949
2600 $done->() if $done; 2950 $done->($self) if $done;
2601 })->prio (1); 2951 })->prio (1);
2602} 2952}
2603 2953
2604=item $player_object->enter_exit ($exit_object) 2954=item $player_object->enter_exit ($exit_object)
2605 2955
2673 $Coro::current->{desc} = "enter_exit"; 3023 $Coro::current->{desc} = "enter_exit";
2674 3024
2675 unless (eval { 3025 unless (eval {
2676 $self->deactivate_recursive; # just to be sure 3026 $self->deactivate_recursive; # just to be sure
2677 3027
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3028 my $map = cf::map::normalise $exit->slaying, $exit->map;
2687 my $x = $exit->stats->hp; 3029 my $x = $exit->stats->hp;
2688 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 }
2689 3054
2690 $self->goto ($map, $x, $y); 3055 $self->goto ($map, $x, $y);
2691 3056
2692 # if exit is damned, update players death & WoR home-position 3057 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y) 3058 $self->contr->savebed ($map, $x, $y)
2698 $self->message ("Something went wrong deep within the deliantra server. " 3063 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "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. "
2700 . "Please report this to the dungeon master!", 3065 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 3066 cf::NDI_UNIQUE | cf::NDI_RED);
2702 3067
2703 warn "ERROR in enter_exit: $@"; 3068 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 3069 $self->leave_link;
2705 } 3070 }
2706 })->prio (1); 3071 })->prio (1);
2707} 3072}
2708 3073
2709=head3 cf::client 3074=head3 cf::client
2710 3075
2711=over 4 3076=over 4
2712 3077
2713=item $client->send_drawinfo ($text, $flags) 3078=item $client->send_big_packet ($pkt)
2714 3079
2715Sends a drawinfo packet to the client. Circumvents output buffering so 3080Like C<send_packet>, but tries to compress large packets, and fragments
2716should not be used under normal circumstances. 3081them as required.
2717 3082
2718=cut 3083=cut
2719 3084
3085our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3086
2720sub cf::client::send_drawinfo { 3087sub cf::client::send_big_packet {
2721 my ($self, $text, $flags) = @_; 3088 my ($self, $pkt) = @_;
2722 3089
2723 utf8::encode $text; 3090 # try lzf for large packets
2724 $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);
2725} 3101}
2726 3102
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 3104
2729Send 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
2730client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
2731the 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
2732the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
2733 3109
2734=cut 3110=cut
2735 3111
2736# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 3113our %CHANNEL = (
3114 "c/motd" => {
3115 id => "infobox",
3116 title => "MOTD",
3117 reply => undef,
3118 tooltip => "The message of the day",
3119 },
2738 "c/identify" => { 3120 "c/identify" => {
2739 id => "infobox", 3121 id => "infobox",
2740 title => "Identify", 3122 title => "Identify",
2741 reply => undef, 3123 reply => undef,
2742 tooltip => "Items recently identified", 3124 tooltip => "Items recently identified",
2744 "c/examine" => { 3126 "c/examine" => {
2745 id => "infobox", 3127 id => "infobox",
2746 title => "Examine", 3128 title => "Examine",
2747 reply => undef, 3129 reply => undef,
2748 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",
2749 }, 3137 },
2750 "c/book" => { 3138 "c/book" => {
2751 id => "infobox", 3139 id => "infobox",
2752 title => "Book", 3140 title => "Book",
2753 reply => undef, 3141 reply => undef,
2769 id => "infobox", 3157 id => "infobox",
2770 title => "Body Parts", 3158 title => "Body Parts",
2771 reply => undef, 3159 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 3160 tooltip => "Shows which body parts you posess and are available",
2773 }, 3161 },
3162 "c/statistics" => {
3163 id => "infobox",
3164 title => "Statistics",
3165 reply => undef,
3166 tooltip => "Shows your primary statistics",
3167 },
2774 "c/skills" => { 3168 "c/skills" => {
2775 id => "infobox", 3169 id => "infobox",
2776 title => "Skills", 3170 title => "Skills",
2777 reply => undef, 3171 reply => undef,
2778 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",
2779 }, 3197 },
2780 "c/uptime" => { 3198 "c/uptime" => {
2781 id => "infobox", 3199 id => "infobox",
2782 title => "Uptime", 3200 title => "Uptime",
2783 reply => undef, 3201 reply => undef,
2793 id => "party", 3211 id => "party",
2794 title => "Party", 3212 title => "Party",
2795 reply => "gsay ", 3213 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 3214 tooltip => "Messages and chat related to your party",
2797 }, 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 },
2798 "c/say" => $SAY_CHANNEL, 3228 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 3229 "c/chat" => $CHAT_CHANNEL,
2800); 3230);
2801 3231
2802sub cf::client::send_msg { 3232sub cf::client::send_msg {
2809 3239
2810 # check predefined channels, for the benefit of C 3240 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3241 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3242 $channel = $CHANNEL{$channel};
2813 3243
2814 $self->ext_msg (channel_info => $channel) 3244 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3245 $channel = $channel->{id};
2818 3246
2819 } elsif (ref $channel) { 3247 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3248 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3249 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3250 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3251 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3252 }
2826 3253
2827 $channel = $channel->{id}; 3254 $channel = $channel->{id};
2828 } 3255 }
2829 3256
2830 return unless @extra || length $msg; 3257 return unless @extra || length $msg;
2831 3258
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3259 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3260 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3261 if $color & cf::NDI_DEF;
2836 3262
2837 my $pkt = "msg " 3263 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3264 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3265 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3266 );
2841 3267
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3268 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 3269}
2879 3270
2880=item $client->ext_msg ($type, @msg) 3271=item $client->ext_msg ($type, @msg)
2881 3272
2882Sends an ext event to the client. 3273Sends an ext event to the client.
2884=cut 3275=cut
2885 3276
2886sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
2888 3279
2889 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 }
2895}
2896
2897=item $client->ext_reply ($msgid, @msg)
2898
2899Sends an ext reply to the client.
2900
2901=cut
2902
2903sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_;
2905
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 }
2913} 3281}
2914 3282
2915=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
2916 3284
2917Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
2937 3305
2938 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
2939 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
2940 3308
2941 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;
2942} 3349}
2943 3350
2944cf::client->attach ( 3351cf::client->attach (
2945 on_connect => sub { 3352 on_connect => sub {
2946 my ($ns) = @_; 3353 my ($ns) = @_;
2972 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
2973 3380
2974 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2975 3382
2976 if (ref $msg) { 3383 if (ref $msg) {
2977 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2978 "ARRAY" eq ref $msg
2979 ? @$msg
2980 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2981 3385
2982 my @reply;
2983
2984 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}) {
2985 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
2986 } 3404 }
2987
2988 $ns->ext_reply ($reply, @reply)
2989 if $reply;
2990
2991 } else { 3405 } else {
2992 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";
2993 } 3407 }
2994 3408
2995 cf::override; 3409 cf::override;
2996 }, 3410 },
2997); 3411);
3017 3431
3018 $coro 3432 $coro
3019} 3433}
3020 3434
3021cf::client->attach ( 3435cf::client->attach (
3022 on_destroy => sub { 3436 on_client_destroy => sub {
3023 my ($ns) = @_; 3437 my ($ns) = @_;
3024 3438
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3439 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3440 },
3027); 3441);
3043our $safe_hole = new Safe::Hole; 3457our $safe_hole = new Safe::Hole;
3044 3458
3045$SIG{FPE} = 'IGNORE'; 3459$SIG{FPE} = 'IGNORE';
3046 3460
3047$safe->permit_only (Opcode::opset qw( 3461$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3462 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3463 grepstart grepwhile mapstart mapwhile
3050 sort time 3464 sort time
3051)); 3465));
3052 3466
3053# here we export the classes and methods available to script code 3467# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3471The following functions and methods are available within a safe environment:
3058 3472
3059 cf::object 3473 cf::object
3060 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
3061 insert remove name archname title slaying race decrease split 3475 insert remove name archname title slaying race decrease split
3476 value
3062 3477
3063 cf::object::player 3478 cf::object::player
3064 player 3479 player
3065 3480
3066 cf::player 3481 cf::player
3072=cut 3487=cut
3073 3488
3074for ( 3489for (
3075 ["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
3076 insert remove inv nrof name archname title slaying race 3491 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3492 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3493 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3494 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3495 ["cf::map" => qw(trigger)],
3081) { 3496) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3497 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3498 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3499 for @funs;
3086} 3500}
3087 3501
3102 3516
3103 my $qcode = $code; 3517 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3518 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3519 $qcode =~ s/\n/\\n/g;
3106 3520
3521 %vars = (_dummy => 0) unless %vars;
3522
3523 my @res;
3107 local $_; 3524 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3525
3110 my $eval = 3526 my $eval =
3111 "do {\n" 3527 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3528 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3529 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3530 . $code
3115 . "\n}" 3531 . "\n}"
3116 ; 3532 ;
3117 3533
3534 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3535 sub_generation_inc;
3536 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3537 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 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 }
3121 3543
3122 if ($@) { 3544 if ($@) {
3123 warn "$@"; 3545 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3546 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3547 "with arguments " . (join " ", %vars) . "\n";
3126 } 3548 }
3127 3549
3128 wantarray ? @res : $res[0] 3550 wantarray ? @res : $res[0]
3129} 3551}
3130 3552
3144=cut 3566=cut
3145 3567
3146sub register_script_function { 3568sub register_script_function {
3147 my ($fun, $cb) = @_; 3569 my ($fun, $cb) = @_;
3148 3570
3149 no strict 'refs'; 3571 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3572 *$fun = $safe_hole->wrap ($cb);
3151} 3573}
3152 3574
3153=back 3575=back
3154 3576
3155=cut 3577=cut
3156 3578
3157############################################################################# 3579#############################################################################
3158# the server's init and main functions 3580# the server's init and main functions
3159 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
3160sub load_facedata($) { 3659sub load_facedata($) {
3161 my ($path) = @_; 3660 my ($path) = @_;
3162 3661
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3663
3169 warn "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3170 3665
3171 my $facedata; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3172 0 < aio_load $path, $facedata
3173 or die "$path: $!";
3174
3175 $facedata = Coro::Storable::thaw $facedata;
3176 3667
3177 $facedata->{version} == 2 3668 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3179 3670
3180 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3181 $facedata->{resource}{"res/exp_table"} = { 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3182 type => FT_RSRC, 3673
3183 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
3184 }; 3675
3185 cf::cede_to_tick; 3676 # BEGIN ATOMIC
3677 # from here on, everything must be atomic - no thread switch allowed
3678 my $t1 = EV::time;
3186 3679
3187 { 3680 {
3188 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3189 3682
3190 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3686
3193 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3195 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};
3196 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};
3197 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3198 cf::cede_to_tick; 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3693 delete $cf::face::META[$idx];
3199 } 3694 }
3200 3695
3201 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3202 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3203 3698
3206 3701
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3702 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3705 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3707 }
3213
3214 cf::cede_to_tick;
3215 } 3708 }
3216 } 3709 }
3217 3710
3218 { 3711 {
3219 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3220 3713
3221 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3222 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3223 cf::cede_to_tick;
3224 } 3716 }
3225 3717
3226 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3227 } 3719 }
3228 3720
3229 { 3721 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3233 3723
3234 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3235 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
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3728
3239 if ($info->{type} & 1) {
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 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;
3254 } else { 3735 } else {
3255 $RESOURCE{$name} = $info; 3736# $RESOURCE{$name} = $info; # unused
3256 } 3737 }
3257
3258 cf::cede_to_tick;
3259 } 3738 }
3260 } 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;
3261 3750
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3752
3753 aio_close $fh if $fh; # close old facedata
3754
3264 1 3755 1
3265} 3756}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3757
3287register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3759 my ($ns, $want) = @_;
3289 3760
3290 while (my ($k, $v) = each %$want) { 3761 while (my ($k, $v) = each %$want) {
3298 my $status = load_resource_file_ $_[0]; 3769 my $status = load_resource_file_ $_[0];
3299 get_slot 0.1, 100; 3770 get_slot 0.1, 100;
3300 cf::arch::commit_load; 3771 cf::arch::commit_load;
3301 3772
3302 $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;
3303} 3788}
3304 3789
3305sub reload_regions { 3790sub reload_regions {
3306 # 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
3307 # for this (global event?) 3792 # for this (global event?)
3315 if exists $_->{match}; 3800 if exists $_->{match};
3316 } 3801 }
3317} 3802}
3318 3803
3319sub reload_facedata { 3804sub reload_facedata {
3320 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3321 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3322} 3807}
3323 3808
3324sub reload_archetypes { 3809sub reload_archetypes {
3325 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3326 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;
3327} 3838}
3328 3839
3329sub reload_treasures { 3840sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3332} 3843}
3333 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
3334sub reload_resources { 3865sub reload_resources {
3335 warn "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3336 3867
3868 reload_materials;
3337 reload_facedata; 3869 reload_facedata;
3870 reload_exp_table;
3871 reload_sound;
3338 reload_archetypes; 3872 reload_archetypes;
3339 reload_regions; 3873 reload_regions;
3340 reload_treasures; 3874 reload_treasures;
3341 3875
3342 warn "finished reloading resource files\n"; 3876 trace "finished reloading resource files\n";
3343} 3877}
3344 3878
3345sub reload_config { 3879sub reload_config {
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3880 trace "reloading config file...\n";
3347 or return;
3348 3881
3349 local $/; 3882 my $config = load_file "$CONFDIR/config";
3350 *CFG = YAML::Load <$fh>; 3883 utf8::decode $config;
3884 *CFG = decode_yaml $config;
3351 3885
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3886 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3887
3354 $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};
3355 $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};
3356 3890
3357 if (exists $CFG{mlockall}) { 3891 if (exists $CFG{mlockall}) {
3380 3914
3381 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3382 print $fh $$; 3916 print $fh $$;
3383} 3917}
3384 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
3385sub main { 3928sub main {
3386 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
3387 3930
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 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.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392 3935
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $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
3399 3937
3400 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3402 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#
3403 (async { 3941 (async {
3404 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3405 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3406 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3407 }; 3945 };
3408 3946
3409 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3410 3948
3411 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
3412 reload_resources; 3960 reload_resources;
3413 reload_config; 3961 reload_config;
3414 db_init;
3415 3962
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3963 cf::init_uuid;
3419 cf::init_signals; 3964 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3965 cf::init_skills;
3422 3966
3423 cf::init_beforeplay; 3967 cf::init_beforeplay;
3424 3968
3425 atomic; 3969 atomic;
3427 load_extensions; 3971 load_extensions;
3428 3972
3429 utime time, time, $RUNTIMEFILE; 3973 utime time, time, $RUNTIMEFILE;
3430 3974
3431 # no (long-running) fork's whatsoever before this point(!) 3975 # no (long-running) fork's whatsoever before this point(!)
3976 use POSIX ();
3432 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};
3433 3978
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3979 cf::_post_init 0;
3435 }; 3980 };
3436 3981
3437 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;
3438} 3990}
3439 3991
3440############################################################################# 3992#############################################################################
3441# initialisation and cleanup 3993# initialisation and cleanup
3442 3994
3443# install some emergency cleanup handlers 3995# install some emergency cleanup handlers
3444BEGIN { 3996BEGIN {
3445 our %SIGWATCHER = (); 3997 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3998 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3999 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 4000 cf::cleanup "SIG$signal";
3449 }; 4001 };
3450 } 4002 }
3451} 4003}
3452 4004
3453sub write_runtime_sync { 4005sub write_runtime_sync {
4006 my $t0 = AE::time;
4007
3454 # first touch the runtime file to show we are still running: 4008 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 4009 # the fsync below can take a very very long time.
3456 4010
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4011 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 4012
3459 my $guard = cf::lock_acquire "write_runtime"; 4013 my $guard = cf::lock_acquire "write_runtime";
3460 4014
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4015 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 4016 or return;
3463 4017
3464 my $value = $cf::RUNTIME + 90 + 10; 4018 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 4019 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 4020 # 60 allows for the watchdog to kill the server.
3479 or return; 4033 or return;
3480 4034
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4035 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 4036 and return;
3483 4037
3484 warn "runtime file written.\n"; 4038 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 4039
3486 1 4040 1
3487} 4041}
3488 4042
3489our $uuid_lock; 4043our $uuid_lock;
3501 or return; 4055 or return;
3502 4056
3503 my $value = uuid_seq uuid_cur; 4057 my $value = uuid_seq uuid_cur;
3504 4058
3505 unless ($value) { 4059 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 4060 info "cowardly refusing to write zero uuid value!\n";
3507 return; 4061 return;
3508 } 4062 }
3509 4063
3510 my $value = uuid_str $value + $uuid_skip; 4064 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 4065 $uuid_skip = 0;
3521 or return; 4075 or return;
3522 4076
3523 aio_rename "$uuid~", $uuid 4077 aio_rename "$uuid~", $uuid
3524 and return; 4078 and return;
3525 4079
3526 warn "uuid file written ($value).\n"; 4080 trace "uuid file written ($value).\n";
3527 4081
3528 1 4082 1
3529 4083
3530} 4084}
3531 4085
3537} 4091}
3538 4092
3539sub emergency_save() { 4093sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 4094 my $freeze_guard = cf::freeze_mainloop;
3541 4095
3542 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;
3543 4102
3544 cf::sync_job { 4103 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 4104 cf::write_runtime_sync; # external watchdog should not bark
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549 4105
3550 # use a peculiar iteration method to avoid tripping on perl 4106 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 4107 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 4108 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 4109 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 4110 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 4111 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 4112 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4113 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 4114 $pl->save;
3559 } 4115 }
3560 warn "emergency_perl_save: end player save\n"; 4116 info "emergency_perl_save: end player save\n";
3561 4117
4118 cf::write_runtime_sync; # external watchdog should not bark
4119
3562 warn "emergency_perl_save: begin map save\n"; 4120 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 4121 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 4122 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 4123 $map->valid or next;
3566 $map->save; 4124 $map->save;
3567 } 4125 }
3568 warn "emergency_perl_save: end map save\n"; 4126 info "emergency_perl_save: end map save\n";
3569 4127
4128 cf::write_runtime_sync; # external watchdog should not bark
4129
3570 warn "emergency_perl_save: begin database checkpoint\n"; 4130 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 4131 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 4132 info "emergency_perl_save: end database checkpoint\n";
3573 4133
3574 warn "emergency_perl_save: begin write uuid\n"; 4134 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 4135 write_uuid_sync 1;
3576 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
3577 }; 4156 };
3578 4157
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3584 warn "emergency_perl_save: leave\n"; 4158 info "emergency_perl_save: leave\n";
3585} 4159}
3586 4160
3587sub post_cleanup { 4161sub post_cleanup {
3588 my ($make_core) = @_; 4162 my ($make_core) = @_;
3589 4163
4164 IO::AIO::flush;
4165
3590 warn Carp::longmess "post_cleanup backtrace" 4166 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 4167 if $make_core;
3592 4168
3593 my $fh = pidfile; 4169 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 4170 unlink $PIDFILE if <$fh> == $$;
3595} 4171}
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4191 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 4192 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 4193 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4194# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 4195 }
3620 warn "cleared package $pkg\n";#d#
3621} 4196}
3622 4197
3623sub do_reload_perl() { 4198sub do_reload_perl() {
3624 # can/must only be called in main 4199 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 4200 unless (in_main) {
3626 warn "can only reload from main coroutine"; 4201 error "can only reload from main coroutine";
3627 return; 4202 return;
3628 } 4203 }
3629 4204
3630 return if $RELOAD++; 4205 return if $RELOAD++;
3631 4206
3632 my $t1 = EV::time; 4207 my $t1 = AE::time;
3633 4208
3634 while ($RELOAD) { 4209 while ($RELOAD) {
3635 warn "reloading..."; 4210 cf::get_slot 0.1, -1, "reload_perl";
4211 info "perl_reload: reloading...";
3636 4212
3637 warn "entering sync_job"; 4213 trace "perl_reload: entering sync_job";
3638 4214
3639 cf::sync_job { 4215 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 4216 #cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 4217
3644 warn "syncing database to disk";
3645 BDB::db_env_txn_checkpoint $DB_ENV;
3646
3647 # if anything goes wrong in here, we should simply crash as we already saved
3648
3649 warn "flushing outstanding aio requests";
3650 while (IO::AIO::nreqs || BDB::nreqs) {
3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3652 }
3653
3654 warn "cancelling all extension coros"; 4218 trace "perl_reload: cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 4219 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 4220 %EXT_CORO = ();
3657 4221
3658 warn "removing commands"; 4222 trace "perl_reload: removing commands";
3659 %COMMAND = (); 4223 %COMMAND = ();
3660 4224
3661 warn "removing ext/exti commands"; 4225 trace "perl_reload: removing ext/exti commands";
3662 %EXTCMD = (); 4226 %EXTCMD = ();
3663 %EXTICMD = (); 4227 %EXTICMD = ();
3664 4228
3665 warn "unloading/nuking all extensions"; 4229 trace "perl_reload: unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 4230 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 4231 trace "... unloading $pkg";
3668 4232
3669 if (my $cb = $pkg->can ("unload")) { 4233 if (my $cb = $pkg->can ("unload")) {
3670 eval { 4234 eval {
3671 $cb->($pkg); 4235 $cb->($pkg);
3672 1 4236 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 4237 } or error "$pkg unloaded, but with errors: $@";
3674 } 4238 }
3675 4239
3676 warn "... clearing $pkg"; 4240 trace "... clearing $pkg";
3677 clear_package $pkg; 4241 clear_package $pkg;
3678 } 4242 }
3679 4243
3680 warn "unloading all perl modules loaded from $LIBDIR"; 4244 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 4245 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 4247
3684 warn "... unloading $k"; 4248 trace "... unloading $k";
3685 delete $INC{$k}; 4249 delete $INC{$k};
3686 4250
3687 $k =~ s/\.pm$//; 4251 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 4252 $k =~ s/\//::/g;
3689 4253
3692 } 4256 }
3693 4257
3694 clear_package $k; 4258 clear_package $k;
3695 } 4259 }
3696 4260
3697 warn "getting rid of safe::, as good as possible"; 4261 trace "perl_reload: getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 4262 clear_package "safe::$_"
3699 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);
3700 4264
3701 warn "unloading cf.pm \"a bit\""; 4265 trace "perl_reload: unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 4266 delete $INC{"cf.pm"};
3703 delete $INC{"cf/pod.pm"}; 4267 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 4268
3705 # don't, removes xs symbols, too, 4269 # don't, removes xs symbols, too,
3706 # and global variables created in xs 4270 # and global variables created in xs
3707 #clear_package __PACKAGE__; 4271 #clear_package __PACKAGE__;
3708 4272
3709 warn "unload completed, starting to reload now"; 4273 info "perl_reload: unload completed, starting to reload now";
3710 4274
3711 warn "reloading cf.pm"; 4275 trace "perl_reload: reloading cf.pm";
3712 require cf; 4276 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4277 cf::_connect_to_perl_1;
3714 4278
3715 warn "loading config and database again"; 4279 trace "perl_reload: loading config and database again";
3716 cf::reload_config; 4280 cf::reload_config;
3717 4281
3718 warn "loading extensions"; 4282 trace "perl_reload: loading extensions";
3719 cf::load_extensions; 4283 cf::load_extensions;
3720 4284
3721 if ($REATTACH_ON_RELOAD) { 4285 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 4286 trace "perl_reload: reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 4287 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 4288 trace "perl_reload: reattaching attachments to maps";
3725 reattach $_ for values %MAP; 4289 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 4290 trace "perl_reload: reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 4291 reattach $_ for values %PLAYER;
3728 } 4292 }
3729 4293
3730 warn "running post_init jobs"; 4294 cf::_post_init 1;
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732 4295
3733 warn "leaving sync_job"; 4296 trace "perl_reload: leaving sync_job";
3734 4297
3735 1 4298 1
3736 } or do { 4299 } or do {
3737 warn $@; 4300 error $@;
3738 cf::cleanup "error while reloading, exiting."; 4301 cf::cleanup "perl_reload: error, exiting.";
3739 }; 4302 };
3740 4303
3741 warn "reloaded";
3742 --$RELOAD; 4304 --$RELOAD;
3743 } 4305 }
3744 4306
3745 $t1 = EV::time - $t1; 4307 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 4308 info "perl_reload: completed in ${t1}s\n";
3747}; 4309};
3748 4310
3749our $RELOAD_WATCHER; # used only during reload 4311our $RELOAD_WATCHER; # used only during reload
3750 4312
3751sub reload_perl() { 4313sub reload_perl() {
3753 # coro crashes during coro_state_free->destroy here. 4315 # coro crashes during coro_state_free->destroy here.
3754 4316
3755 $RELOAD_WATCHER ||= cf::async { 4317 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 4318 Coro::AIO::aio_wait cache_extensions;
3757 4319
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4320 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 4321 do_reload_perl;
3760 undef $RELOAD_WATCHER; 4322 undef $RELOAD_WATCHER;
3761 }; 4323 };
3762 }; 4324 };
3763} 4325}
3772 reload_perl; 4334 reload_perl;
3773 }; 4335 };
3774 } 4336 }
3775}; 4337};
3776 4338
3777unshift @INC, $LIBDIR; 4339#############################################################################
3778 4340
3779my $bug_warning = 0; 4341my $bug_warning = 0;
3780 4342
3781our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN;
3783
3784sub wait_for_tick { 4343sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3786 4345
3787 my $signal = new Coro::Signal; 4346 $WAIT_FOR_TICK->wait;
3788 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait;
3790} 4347}
3791 4348
3792sub wait_for_tick_begin { 4349sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4350 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3794 4351
3795 my $signal = new Coro::Signal; 4352 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4353 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4354 $signal->wait;
3798} 4355}
3802 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"
3803 unless ++$bug_warning > 10; 4360 unless ++$bug_warning > 10;
3804 return; 4361 return;
3805 } 4362 }
3806 4363
3807 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#
3808 4367
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4368 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $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.;
3811 Coro::async_pool { 4370 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4371 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4372 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4373 or error "ERROR: unable to write runtime file: $!";
3815 }; 4374 };
3816 } 4375 }
3817 4376
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4377 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4378 $sig->send;
3820 } 4379 }
3821 while (my $sig = shift @WAIT_FOR_TICK) { 4380 $WAIT_FOR_TICK->broadcast;
3822 $sig->send;
3823 }
3824 4381
3825 $LOAD = ($NOW - $TICK_START) / $TICK; 4382 $LOAD = ($NOW - $TICK_START) / $TICK;
3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3827 4384
3828 if (0) { 4385 if (0) {
3829 if ($NEXT_TICK) { 4386 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4387 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4388 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4389 debug "jitter $JITTER\n";#d#
3833 } 4390 }
3834 } 4391 }
3835} 4392}
3836 4393
3837{ 4394{
3838 # configure BDB 4395 # configure BDB
4396 info "initialising database";
3839 4397
3840 BDB::min_parallel 8; 4398 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
3843 4401
3844 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3847 $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;
3872 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3873 }; 4431 };
3874 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3875 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3876 }; 4434 };
4435
4436 info "database initialised";
3877} 4437}
3878 4438
3879{ 4439{
3880 # configure IO::AIO 4440 # configure IO::AIO
3881 4441
4442 info "initialising aio";
3882 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
3885} 4447}
3886 4448
3887my $_log_backtrace; 4449our $_log_backtrace;
4450our $_log_backtrace_last;
3888 4451
3889sub _log_backtrace { 4452sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4453 my ($msg, @addr) = @_;
3891 4454
3892 $msg =~ s/\n//; 4455 $msg =~ s/\n$//;
3893 4456
4457 if ($_log_backtrace_last eq $msg) {
4458 LOG llevInfo, "[ABT] $msg\n";
4459 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4460 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4461 } elsif ($_log_backtrace < 2) {
4462 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4463 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4464 my $perl_bt = Carp::longmess $msg;
3898 async { 4465 async {
3899 $Coro::current->{desc} = "abt $msg"; 4466 $Coro::current->{desc} = "abt $msg";
3900 4467
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4487 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4488 --$_log_backtrace;
3922 }; 4489 };
3923 } else { 4490 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4491 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4492 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4493 }
3927} 4494}
3928 4495
3929# load additional modules 4496# load additional modules
3930use cf::pod; 4497require "cf/$_.pm" for @EXTRA_MODULES;
4498cf::_connect_to_perl_2;
3931 4499
3932END { cf::emergency_save } 4500END { cf::emergency_save }
3933 4501
39341 45021
3935 4503

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines