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.460 by root, Mon Dec 15 17:04:53 2008 UTC vs.
Revision 1.614 by root, Mon Nov 26 15:12:16 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
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;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
328} 511}
329 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.
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;
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) {
498 } else { 691 } else {
499 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
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}
1862 2136
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1865} 2139}
1866 2140
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874}
1875
1876sub decay_objects { 2141sub decay_objects {
1877 my ($self) = @_; 2142 my ($self) = @_;
1878 2143
1879 return if $self->{deny_reset}; 2144 return if $self->{deny_reset};
1880 2145
1905 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1906 2171
1907 1 2172 1
1908} 2173}
1909 2174
2175# used to laod the header of an original map
1910sub load_header_orig { 2176sub load_header_orig {
1911 my ($self) = @_; 2177 my ($self) = @_;
1912 2178
1913 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1914} 2180}
1915 2181
2182# used to laod the header of an instantiated map
1916sub load_header_temp { 2183sub load_header_temp {
1917 my ($self) = @_; 2184 my ($self) = @_;
1918 2185
1919 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1920} 2187}
1921 2188
2189# called after loading the header from an instantiated map
1922sub prepare_temp { 2190sub prepare_temp {
1923 my ($self) = @_; 2191 my ($self) = @_;
1924 2192
1925 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1926 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1927 # safety 2195 # safety
1928 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1929 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1930} 2198}
1931 2199
2200# called after loading the header from an original map
1932sub prepare_orig { 2201sub prepare_orig {
1933 my ($self) = @_; 2202 my ($self) = @_;
1934 2203
1935 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1936 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1960 2229
1961sub find; 2230sub find;
1962sub find { 2231sub find {
1963 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1964 2233
2234 cf::cede_to_tick;
2235
1965 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1966 2237
1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1968 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1969 2240
1970 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1987 2258
1988 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1989 } 2260 }
1990} 2261}
1991 2262
1992sub pre_load { } 2263sub pre_load { }
1993sub post_load { } 2264#sub post_load { } # XS
1994 2265
1995sub load { 2266sub load {
1996 my ($self) = @_; 2267 my ($self) = @_;
1997 2268
1998 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2001 2272
2002 { 2273 {
2003 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2004 2275
2005 return unless $self->valid; 2276 return unless $self->valid;
2006 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2007
2008 $self->in_memory (cf::MAP_LOADING);
2009 2278
2010 $self->alloc; 2279 $self->alloc;
2011 2280
2012 $self->pre_load; 2281 $self->pre_load;
2013 cf::cede_to_tick; 2282 cf::cede_to_tick;
2014 2283
2284 if (exists $self->{load_path}) {
2015 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2016 $f->skip_block; 2286 $f->skip_block;
2017 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2018 or return; 2288 or return;
2019 2289
2020 $self->post_load_original 2290 $self->post_load_original
2021 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2022 2292
2023 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2024 utf8::encode $uniq; 2294 utf8::encode $uniq;
2025 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2026 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2027 $self->clear_unique_items; 2297 $self->clear_unique_items;
2028 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2029 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2030 } 2301 }
2031 } 2302 }
2032 }
2033 2303
2034 $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);
2035 2311
2036 cf::cede_to_tick; 2312 cf::cede_to_tick;
2037 # now do the right thing for maps 2313 # now do the right thing for maps
2038 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2039 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2043 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2320 $self->decay_objects;
2045 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2046 $self->update_buttons; 2322 $self->update_buttons;
2047 cf::cede_to_tick; 2323 cf::cede_to_tick;
2048 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2049 cf::cede_to_tick;
2050 $self->activate;
2051 } 2325 }
2052 2326
2053 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2055
2056 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2329 }
2058 2330
2059 $self->post_load; 2331 $self->post_load;
2060}
2061 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
2062sub customise_for { 2339sub customise_for {
2063 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2064 2341
2065 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2343 if $self->per_player;
2069# if $self->per_party; 2346# if $self->per_party;
2070 2347
2071 $self 2348 $self
2072} 2349}
2073 2350
2074# find and load all maps in the 3x3 area around a map
2075sub load_neighbours {
2076 my ($map) = @_;
2077
2078 my @neigh; # diagonal neighbours
2079
2080 for (0 .. 3) {
2081 my $neigh = $map->tile_path ($_)
2082 or next;
2083 $neigh = find $neigh, $map
2084 or next;
2085 $neigh->load;
2086
2087 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 }
2091
2092 for (grep defined $_->[0], @neigh) {
2093 my ($path, $origin) = @$_;
2094 my $neigh = find $path, $origin
2095 or next;
2096 $neigh->load;
2097 }
2098}
2099
2100sub find_sync { 2351sub find_sync {
2101 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2102 2353
2103 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
2104} 2359}
2105 2360
2106sub do_load_sync { 2361sub do_load_sync {
2107 my ($map) = @_; 2362 my ($map) = @_;
2108 2363
2364 # it's a bug to call this from the main context
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2111 2367
2112 cf::sync_job { $map->load }; 2368 $map->load;
2113} 2369}
2114 2370
2115our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2117 2373
2118sub find_async { 2374sub find_async {
2119 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2120 2376
2121 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2122 2378
2123 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2125 } 2381 }
2126 2382
2127 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2128 2384
2129 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2143 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2144 2400
2145 () 2401 ()
2146} 2402}
2147 2403
2404# common code, used by both ->save and ->swapout
2148sub save { 2405sub _save {
2149 my ($self) = @_; 2406 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2407
2153 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2154 2409
2155 return unless $self->dirty; 2410 return unless $self->dirty;
2156 2411
2176 } else { 2431 } else {
2177 $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);
2178 } 2433 }
2179} 2434}
2180 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2181sub swap_out { 2444sub swap_out {
2182 my ($self) = @_; 2445 my ($self) = @_;
2183 2446
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2189 return if $self->players; 2451 return if $self->players;
2190 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
2191 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2192 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
2193 $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};
2194 2503
2195 $self->deactivate; 2504 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2506 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2507
2243 $self->unlink_save; 2508 $self->unlink_save;
2244 $self->destroy; 2509 $self->destroy;
2245} 2510}
2246 2511
2254 2519
2255 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2256 2521
2257 $self->unlink_save; 2522 $self->unlink_save;
2258 2523
2259 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2529
2321 : normalise $_ 2586 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2588 ]
2324} 2589}
2325 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
2326=back 2623=back
2327 2624
2328=head3 cf::object 2625=head3 cf::object
2329 2626
2330=cut 2627=cut
2353 2650
2354Creates 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.
2355 2652
2356=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2357 2654
2358returns 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,
2359even if the object actually exists. May block. 2656even if the object actually exists. May block.
2360 2657
2361=cut 2658=cut
2362 2659
2363sub deref { 2660sub deref {
2395 2692
2396our $SAY_CHANNEL = { 2693our $SAY_CHANNEL = {
2397 id => "say", 2694 id => "say",
2398 title => "Map", 2695 title => "Map",
2399 reply => "say ", 2696 reply => "say ",
2400 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.",
2401}; 2698};
2402 2699
2403our $CHAT_CHANNEL = { 2700our $CHAT_CHANNEL = {
2404 id => "chat", 2701 id => "chat",
2405 title => "Chat", 2702 title => "Chat",
2445=item $player_object->may ("access") 2742=item $player_object->may ("access")
2446 2743
2447Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2448(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2449 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
2450=cut 2772=cut
2451 2773
2452sub cf::object::player::may { 2774sub cf::object::player::may {
2453 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2454 2776
2455 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2456 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2457 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2458 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2459} 2781}
2460 2782
2461=item $player_object->enter_link 2783=item $player_object->enter_link
2462 2784
2463Freezes 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}>).
2464 2786
2465The 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.
2466for 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,
2467though, 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
2468map. 2790map.
2469 2791
2470Will never block. 2792Will never block.
2471 2793
2472=item $player_object->leave_link ($map, $x, $y) 2794=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2815sub cf::object::player::enter_link {
2494 my ($self) = @_; 2816 my ($self) = @_;
2495 2817
2496 $self->deactivate_recursive; 2818 $self->deactivate_recursive;
2497 2819
2820 ++$self->{_link_recursion};
2821
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2822 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2823
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2824 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2825 if $self->map && $self->map->{path} ne "{link}";
2502 2826
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2827 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2828}
2505 2829
2506sub cf::object::player::leave_link { 2830sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2831 my ($self, $map, $x, $y) = @_;
2508 2832
2525 ($x, $y) = (-1, -1) 2849 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2850 unless (defined $x) && (defined $y);
2527 2851
2528 # use -1 or undef as default coordinates, not 0, 0 2852 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2853 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2854 if $x <= 0 && $y <= 0;
2531 2855
2532 $map->load; 2856 $map->load;
2533 $map->load_neighbours;
2534 2857
2535 return unless $self->contr->active; 2858 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2859
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2860 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2861 if ($self->enter_map ($map, $x, $y)) {
2541} 2862 # entering was successful
2863 delete $self->{_link_recursion};
2864 # only activate afterwards, to support waiting in hooks
2865 $self->activate_recursive;
2866 }
2542 2867
2868}
2869
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2870=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2544 2871
2545Moves the player to the given map-path and coordinates by first freezing 2872Moves the player to the given map-path and coordinates by first freezing
2546her, loading and preparing them map, calling the provided $check callback 2873her, loading and preparing them map, calling the provided $check callback
2547that has to return the map if sucecssful, and then unfreezes the player on 2874that has to return the map if sucecssful, and then unfreezes the player on
2548the new (success) or old (failed) map position. In either case, $done will 2875the new (success) or old (failed) map position. In either case, $done will
2555 2882
2556our $GOTOGEN; 2883our $GOTOGEN;
2557 2884
2558sub cf::object::player::goto { 2885sub cf::object::player::goto {
2559 my ($self, $path, $x, $y, $check, $done) = @_; 2886 my ($self, $path, $x, $y, $check, $done) = @_;
2887
2888 if ($self->{_link_recursion} >= $MAX_LINKS) {
2889 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2890 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2891 ($path, $x, $y) = @$EMERGENCY_POSITION;
2892 }
2560 2893
2561 # do generation counting so two concurrent goto's will be executed in-order 2894 # do generation counting so two concurrent goto's will be executed in-order
2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2895 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2563 2896
2564 $self->enter_link; 2897 $self->enter_link;
2584 ($path, $x, $y) = (undef, undef, undef); 2917 ($path, $x, $y) = (undef, undef, undef);
2585 } 2918 }
2586 } 2919 }
2587 2920
2588 my $map = eval { 2921 my $map = eval {
2589 my $map = defined $path ? cf::map::find $path : undef; 2922 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2590 2923
2591 if ($map) { 2924 if ($map) {
2592 $map = $map->customise_for ($self); 2925 $map = $map->customise_for ($self);
2593 $map = $check->($map) if $check && $map; 2926 $map = $check->($map, $x, $y, $self) if $check && $map;
2594 } else { 2927 } else {
2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2928 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2596 } 2929 }
2597 2930
2598 $map 2931 $map
2606 if ($gen == $self->{_goto_generation}) { 2939 if ($gen == $self->{_goto_generation}) {
2607 delete $self->{_goto_generation}; 2940 delete $self->{_goto_generation};
2608 $self->leave_link ($map, $x, $y); 2941 $self->leave_link ($map, $x, $y);
2609 } 2942 }
2610 2943
2611 $done->() if $done; 2944 $done->($self) if $done;
2612 })->prio (1); 2945 })->prio (1);
2613} 2946}
2614 2947
2615=item $player_object->enter_exit ($exit_object) 2948=item $player_object->enter_exit ($exit_object)
2616 2949
2684 $Coro::current->{desc} = "enter_exit"; 3017 $Coro::current->{desc} = "enter_exit";
2685 3018
2686 unless (eval { 3019 unless (eval {
2687 $self->deactivate_recursive; # just to be sure 3020 $self->deactivate_recursive; # just to be sure
2688 3021
2689 # random map handling
2690 {
2691 my $guard = cf::lock_acquire "exit_prepare:$exit";
2692
2693 prepare_random_map $exit
2694 if $exit->slaying eq "/!";
2695 }
2696
2697 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3022 my $map = cf::map::normalise $exit->slaying, $exit->map;
2698 my $x = $exit->stats->hp; 3023 my $x = $exit->stats->hp;
2699 my $y = $exit->stats->sp; 3024 my $y = $exit->stats->sp;
3025
3026 # special map handling
3027 my $slaying = $exit->slaying;
3028
3029 # special map handling
3030 if ($slaying eq "/!") {
3031 my $guard = cf::lock_acquire "exit_prepare:$exit";
3032
3033 prepare_random_map $exit
3034 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3035
3036 $map = $exit->slaying;
3037
3038 } elsif ($slaying eq '!up') {
3039 $map = $exit->map->tile_path (cf::TILE_UP);
3040 $x = $exit->x;
3041 $y = $exit->y;
3042
3043 } elsif ($slaying eq '!down') {
3044 $map = $exit->map->tile_path (cf::TILE_DOWN);
3045 $x = $exit->x;
3046 $y = $exit->y;
3047 }
2700 3048
2701 $self->goto ($map, $x, $y); 3049 $self->goto ($map, $x, $y);
2702 3050
2703 # if exit is damned, update players death & WoR home-position 3051 # if exit is damned, update players death & WoR home-position
2704 $self->contr->savebed ($map, $x, $y) 3052 $self->contr->savebed ($map, $x, $y)
2709 $self->message ("Something went wrong deep within the deliantra server. " 3057 $self->message ("Something went wrong deep within the deliantra server. "
2710 . "I'll try to bring you back to the map you were before. " 3058 . "I'll try to bring you back to the map you were before. "
2711 . "Please report this to the dungeon master!", 3059 . "Please report this to the dungeon master!",
2712 cf::NDI_UNIQUE | cf::NDI_RED); 3060 cf::NDI_UNIQUE | cf::NDI_RED);
2713 3061
2714 warn "ERROR in enter_exit: $@"; 3062 error "ERROR in enter_exit: $@";
2715 $self->leave_link; 3063 $self->leave_link;
2716 } 3064 }
2717 })->prio (1); 3065 })->prio (1);
2718} 3066}
2719 3067
2720=head3 cf::client 3068=head3 cf::client
2721 3069
2722=over 4 3070=over 4
2723 3071
2724=item $client->send_drawinfo ($text, $flags) 3072=item $client->send_big_packet ($pkt)
2725 3073
2726Sends a drawinfo packet to the client. Circumvents output buffering so 3074Like C<send_packet>, but tries to compress large packets, and fragments
2727should not be used under normal circumstances. 3075them as required.
2728 3076
2729=cut 3077=cut
2730 3078
3079our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3080
2731sub cf::client::send_drawinfo { 3081sub cf::client::send_big_packet {
2732 my ($self, $text, $flags) = @_; 3082 my ($self, $pkt) = @_;
2733 3083
2734 utf8::encode $text; 3084 # try lzf for large packets
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3085 $pkt = "lzf " . Compress::LZF::compress $pkt
3086 if 1024 <= length $pkt and $self->{can_lzf};
3087
3088 # split very large packets
3089 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3090 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3091 $pkt = "frag";
3092 }
3093
3094 $self->send_packet ($pkt);
2736} 3095}
2737 3096
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 3097=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 3098
2740Send a drawinfo or msg packet to the client, formatting the msg for the 3099Send a msg packet to the client, formatting the msg for the client if
2741client if neccessary. C<$type> should be a string identifying the type of 3100necessary. C<$type> should be a string identifying the type of the
2742the message, with C<log> being the default. If C<$color> is negative, suppress 3101message, with C<log> being the default. If C<$color> is negative, suppress
2743the message unless the client supports the msg packet. 3102the message unless the client supports the msg packet.
2744 3103
2745=cut 3104=cut
2746 3105
2747# non-persistent channels (usually the info channel) 3106# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 3107our %CHANNEL = (
3108 "c/motd" => {
3109 id => "infobox",
3110 title => "MOTD",
3111 reply => undef,
3112 tooltip => "The message of the day",
3113 },
2749 "c/identify" => { 3114 "c/identify" => {
2750 id => "infobox", 3115 id => "infobox",
2751 title => "Identify", 3116 title => "Identify",
2752 reply => undef, 3117 reply => undef,
2753 tooltip => "Items recently identified", 3118 tooltip => "Items recently identified",
2755 "c/examine" => { 3120 "c/examine" => {
2756 id => "infobox", 3121 id => "infobox",
2757 title => "Examine", 3122 title => "Examine",
2758 reply => undef, 3123 reply => undef,
2759 tooltip => "Signs and other items you examined", 3124 tooltip => "Signs and other items you examined",
3125 },
3126 "c/shopinfo" => {
3127 id => "infobox",
3128 title => "Shop Info",
3129 reply => undef,
3130 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 3131 },
2761 "c/book" => { 3132 "c/book" => {
2762 id => "infobox", 3133 id => "infobox",
2763 title => "Book", 3134 title => "Book",
2764 reply => undef, 3135 reply => undef,
2780 id => "infobox", 3151 id => "infobox",
2781 title => "Body Parts", 3152 title => "Body Parts",
2782 reply => undef, 3153 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 3154 tooltip => "Shows which body parts you posess and are available",
2784 }, 3155 },
3156 "c/statistics" => {
3157 id => "infobox",
3158 title => "Statistics",
3159 reply => undef,
3160 tooltip => "Shows your primary statistics",
3161 },
2785 "c/skills" => { 3162 "c/skills" => {
2786 id => "infobox", 3163 id => "infobox",
2787 title => "Skills", 3164 title => "Skills",
2788 reply => undef, 3165 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 3166 tooltip => "Shows your experience per skill and item power",
3167 },
3168 "c/shopitems" => {
3169 id => "infobox",
3170 title => "Shop Items",
3171 reply => undef,
3172 tooltip => "Shows the items currently for sale in this shop",
3173 },
3174 "c/resistances" => {
3175 id => "infobox",
3176 title => "Resistances",
3177 reply => undef,
3178 tooltip => "Shows your resistances",
3179 },
3180 "c/pets" => {
3181 id => "infobox",
3182 title => "Pets",
3183 reply => undef,
3184 tooltip => "Shows information abotu your pets/a specific pet",
3185 },
3186 "c/perceiveself" => {
3187 id => "infobox",
3188 title => "Perceive Self",
3189 reply => undef,
3190 tooltip => "You gained detailed knowledge about yourself",
2790 }, 3191 },
2791 "c/uptime" => { 3192 "c/uptime" => {
2792 id => "infobox", 3193 id => "infobox",
2793 title => "Uptime", 3194 title => "Uptime",
2794 reply => undef, 3195 reply => undef,
2804 id => "party", 3205 id => "party",
2805 title => "Party", 3206 title => "Party",
2806 reply => "gsay ", 3207 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 3208 tooltip => "Messages and chat related to your party",
2808 }, 3209 },
3210 "c/death" => {
3211 id => "death",
3212 title => "Death",
3213 reply => undef,
3214 tooltip => "Reason for and more info about your most recent death",
3215 },
3216 "c/fatal" => {
3217 id => "fatal",
3218 title => "Fatal Error",
3219 reply => undef,
3220 tooltip => "Reason for the server disconnect",
3221 },
3222 "c/say" => $SAY_CHANNEL,
3223 "c/chat" => $CHAT_CHANNEL,
2809); 3224);
2810 3225
2811sub cf::client::send_msg { 3226sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 3227 my ($self, $channel, $msg, $color, @extra) = @_;
2813 3228
2818 3233
2819 # check predefined channels, for the benefit of C 3234 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 3235 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 3236 $channel = $CHANNEL{$channel};
2822 3237
2823 $self->ext_msg (channel_info => $channel) 3238 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 3239 $channel = $channel->{id};
2827 3240
2828 } elsif (ref $channel) { 3241 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 3242 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 3243 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 3244 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 3245 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 3246 }
2835 3247
2836 $channel = $channel->{id}; 3248 $channel = $channel->{id};
2837 } 3249 }
2838 3250
2839 return unless @extra || length $msg; 3251 return unless @extra || length $msg;
2840 3252
2841 if ($self->can_msg) {
2842 # default colour, mask it out 3253 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3254 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 3255 if $color & cf::NDI_DEF;
2845 3256
2846 my $pkt = "msg " 3257 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 3258 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3259 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 3260 );
2850 3261
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt); 3262 $self->send_big_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 3263}
2888 3264
2889=item $client->ext_msg ($type, @msg) 3265=item $client->ext_msg ($type, @msg)
2890 3266
2891Sends an ext event to the client. 3267Sends an ext event to the client.
2893=cut 3269=cut
2894 3270
2895sub cf::client::ext_msg($$@) { 3271sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 3272 my ($self, $type, @msg) = @_;
2897 3273
2898 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3274 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 }
2904}
2905
2906=item $client->ext_reply ($msgid, @msg)
2907
2908Sends an ext reply to the client.
2909
2910=cut
2911
2912sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_;
2914
2915 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 }
2922} 3275}
2923 3276
2924=item $success = $client->query ($flags, "text", \&cb) 3277=item $success = $client->query ($flags, "text", \&cb)
2925 3278
2926Queues a query to the client, calling the given callback with 3279Queues a query to the client, calling the given callback with
2946 3299
2947 $self->send_packet ($self->{query_queue}[0][0]) 3300 $self->send_packet ($self->{query_queue}[0][0])
2948 if @{ $self->{query_queue} } == 1; 3301 if @{ $self->{query_queue} } == 1;
2949 3302
2950 1 3303 1
3304}
3305
3306=item $client->update_command_faces
3307
3308=cut
3309
3310our %COMMAND_FACE;
3311
3312sub cf::client::update_command_faces {
3313 my ($self) = @_;
3314
3315 my @faces = grep $_,
3316 $COMMAND_FACE{preferred},
3317 $COMMAND_FACE{standard},
3318 $COMMAND_FACE{skill},
3319 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3320 $COMMAND_FACE{emote},
3321 ;
3322
3323 $self->send_face ($_)
3324 for @faces;
3325 $self->flush_fx;
3326
3327 $self->ext_msg (command_list => @faces);
3328}
3329
3330=item cf::client::set_command_face $type, $commands
3331
3332=cut
3333
3334sub cf::client::set_command_face {
3335 my ($type, $list) = @_;
3336
3337 my $idx = &cf::face::set ( #d# ugly forward reference
3338 "command_list/$type" => cf::FT_RSRC,
3339 JSON::XS->new->utf8->encode ([ sort @$list ])
3340 );
3341
3342 $COMMAND_FACE{$type} = $idx;
2951} 3343}
2952 3344
2953cf::client->attach ( 3345cf::client->attach (
2954 on_connect => sub { 3346 on_connect => sub {
2955 my ($ns) = @_; 3347 my ($ns) = @_;
2981 my ($ns, $buf) = @_; 3373 my ($ns, $buf) = @_;
2982 3374
2983 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3375 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2984 3376
2985 if (ref $msg) { 3377 if (ref $msg) {
2986 my ($type, $reply, @payload) = 3378 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2987 "ARRAY" eq ref $msg
2988 ? @$msg
2989 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2990 3379
2991 my @reply;
2992
2993 if (my $cb = $EXTICMD{$type}) { 3380 if (my $cb = $EXTIACMD{$type}) {
3381 $cb->(
3382 $ns,
3383 sub {
3384 $ns->ext_msg ("reply-$reply", @_)
3385 if $reply;
3386 },
3387 @payload
3388 );
3389 } else {
3390 my @reply;
3391
3392 if (my $cb = $EXTICMD{$type}) {
2994 @reply = $cb->($ns, @payload); 3393 @reply = $cb->($ns, @payload);
3394 }
3395
3396 $ns->ext_msg ("reply-$reply", @reply)
3397 if $reply;
2995 } 3398 }
2996
2997 $ns->ext_reply ($reply, @reply)
2998 if $reply;
2999
3000 } else { 3399 } else {
3001 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3400 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3002 } 3401 }
3003 3402
3004 cf::override; 3403 cf::override;
3005 }, 3404 },
3006); 3405);
3026 3425
3027 $coro 3426 $coro
3028} 3427}
3029 3428
3030cf::client->attach ( 3429cf::client->attach (
3031 on_destroy => sub { 3430 on_client_destroy => sub {
3032 my ($ns) = @_; 3431 my ($ns) = @_;
3033 3432
3034 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3433 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035 }, 3434 },
3036); 3435);
3052our $safe_hole = new Safe::Hole; 3451our $safe_hole = new Safe::Hole;
3053 3452
3054$SIG{FPE} = 'IGNORE'; 3453$SIG{FPE} = 'IGNORE';
3055 3454
3056$safe->permit_only (Opcode::opset qw( 3455$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math 3456 :base_core :base_mem :base_orig :base_math :base_loop
3058 grepstart grepwhile mapstart mapwhile 3457 grepstart grepwhile mapstart mapwhile
3059 sort time 3458 sort time
3060)); 3459));
3061 3460
3062# here we export the classes and methods available to script code 3461# here we export the classes and methods available to script code
3066The following functions and methods are available within a safe environment: 3465The following functions and methods are available within a safe environment:
3067 3466
3068 cf::object 3467 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3468 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3469 insert remove name archname title slaying race decrease split
3470 value
3071 3471
3072 cf::object::player 3472 cf::object::player
3073 player 3473 player
3074 3474
3075 cf::player 3475 cf::player
3081=cut 3481=cut
3082 3482
3083for ( 3483for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3484 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race 3485 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3486 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3487 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3488 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3489 ["cf::map" => qw(trigger)],
3090) { 3490) {
3091 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3491 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3492 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3094 for @funs; 3493 for @funs;
3095} 3494}
3096 3495
3111 3510
3112 my $qcode = $code; 3511 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3512 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3513 $qcode =~ s/\n/\\n/g;
3115 3514
3515 %vars = (_dummy => 0) unless %vars;
3516
3517 my @res;
3116 local $_; 3518 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars;
3118 3519
3119 my $eval = 3520 my $eval =
3120 "do {\n" 3521 "do {\n"
3121 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3522 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122 . "#line 0 \"{$qcode}\"\n" 3523 . "#line 0 \"{$qcode}\"\n"
3123 . $code 3524 . $code
3124 . "\n}" 3525 . "\n}"
3125 ; 3526 ;
3126 3527
3528 if ($CFG{safe_eval}) {
3127 sub_generation_inc; 3529 sub_generation_inc;
3530 local @safe::cf::_safe_eval_args = values %vars;
3128 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3531 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129 sub_generation_inc; 3532 sub_generation_inc;
3533 } else {
3534 local @cf::_safe_eval_args = values %vars;
3535 @res = wantarray ? eval eval : scalar eval $eval;
3536 }
3130 3537
3131 if ($@) { 3538 if ($@) {
3132 warn "$@"; 3539 warn "$@",
3133 warn "while executing safe code '$code'\n"; 3540 "while executing safe code '$code'\n",
3134 warn "with arguments " . (join " ", %vars) . "\n"; 3541 "with arguments " . (join " ", %vars) . "\n";
3135 } 3542 }
3136 3543
3137 wantarray ? @res : $res[0] 3544 wantarray ? @res : $res[0]
3138} 3545}
3139 3546
3153=cut 3560=cut
3154 3561
3155sub register_script_function { 3562sub register_script_function {
3156 my ($fun, $cb) = @_; 3563 my ($fun, $cb) = @_;
3157 3564
3158 no strict 'refs'; 3565 $fun = "safe::$fun" if $CFG{safe_eval};
3159 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3566 *$fun = $safe_hole->wrap ($cb);
3160} 3567}
3161 3568
3162=back 3569=back
3163 3570
3164=cut 3571=cut
3165 3572
3166############################################################################# 3573#############################################################################
3167# the server's init and main functions 3574# the server's init and main functions
3168 3575
3576{
3577 package cf::face;
3578
3579 our %HASH; # hash => idx
3580 our @DATA; # dynamically-created facedata, only faceste 0 used
3581 our @FOFS; # file offset, if > 0
3582 our @SIZE; # size of face, in octets
3583 our @META; # meta hash of face, if any
3584 our $DATAFH; # facedata filehandle
3585
3586 # internal api, not finalised
3587 sub set {
3588 my ($name, $type, $data) = @_;
3589
3590 my $idx = cf::face::find $name;
3591
3592 if ($idx) {
3593 delete $HASH{cf::face::get_csum $idx};
3594 } else {
3595 $idx = cf::face::alloc $name;
3596 }
3597
3598 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3599
3600 cf::face::set_type $idx, $type;
3601 cf::face::set_csum $idx, 0, $hash;
3602
3603 # we need to destroy the SV itself, not just modify it, as a running ix
3604 # might hold a reference to it: "delete" achieves that.
3605 delete $FOFS[0][$idx];
3606 delete $DATA[0][$idx];
3607 $DATA[0][$idx] = $data;
3608 $SIZE[0][$idx] = length $data;
3609 delete $META[$idx];
3610 $HASH{$hash} = $idx;#d#
3611
3612 $idx
3613 }
3614
3615 sub _get_data($$$) {
3616 my ($idx, $set, $cb) = @_;
3617
3618 if (defined $DATA[$set][$idx]) {
3619 $cb->($DATA[$set][$idx]);
3620 } elsif (my $fofs = $FOFS[$set][$idx]) {
3621 my $size = $SIZE[$set][$idx];
3622 my $buf;
3623 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3624 if ($_[0] == $size) {
3625 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3626 $cb->($buf);
3627 } else {
3628 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3629 }
3630 };
3631 } else {
3632 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3633 }
3634 }
3635
3636 # rather ineffient
3637 sub cf::face::get_data($;$) {
3638 my ($idx, $set) = @_;
3639
3640 _get_data $idx, $set, Coro::rouse_cb;
3641 Coro::rouse_wait
3642 }
3643
3644 sub cf::face::ix {
3645 my ($ns, $set, $idx, $pri) = @_;
3646
3647 _get_data $idx, $set, sub {
3648 $ns->ix_send ($idx, $pri, $_[0]);
3649 };
3650 }
3651}
3652
3169sub load_facedata($) { 3653sub load_facedata($) {
3170 my ($path) = @_; 3654 my ($path) = @_;
3171 3655
3172 # HACK to clear player env face cache, we need some signal framework
3173 # for this (global event?)
3174 %ext::player_env::MUSIC_FACE_CACHE = ();
3175
3176 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3656 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177 3657
3178 warn "loading facedata from $path\n"; 3658 trace "loading facedata from $path\n";
3179 3659
3180 my $facedata; 3660 my $facedata = decode_storable load_file "$path/faceinfo";
3181 0 < aio_load $path, $facedata
3182 or die "$path: $!";
3183
3184 $facedata = Coro::Storable::thaw $facedata;
3185 3661
3186 $facedata->{version} == 2 3662 $facedata->{version} == 2
3187 or cf::cleanup "$path: version mismatch, cannot proceed."; 3663 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3188 3664
3189 # patch in the exptable 3665 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3190 $facedata->{resource}{"res/exp_table"} = { 3666 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3191 type => FT_RSRC, 3667
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3668 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3193 }; 3669
3194 cf::cede_to_tick; 3670 # BEGIN ATOMIC
3671 # from here on, everything must be atomic - no thread switch allowed
3672 my $t1 = EV::time;
3195 3673
3196 { 3674 {
3197 my $faces = $facedata->{faceinfo}; 3675 my $faces = $facedata->{faceinfo};
3198 3676
3199 while (my ($face, $info) = each %$faces) { 3677 for my $face (sort keys %$faces) {
3678 my $info = $faces->{$face};
3200 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3679 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201 3680
3202 cf::face::set_visibility $idx, $info->{visibility}; 3681 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap}; 3682 cf::face::set_magicmap $idx, $info->{magicmap};
3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3683 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3684 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3206 3685 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3207 cf::cede_to_tick; 3686 $cf::face::HASH{$info->{hash64}} = $idx;
3687 delete $cf::face::META[$idx];
3208 } 3688 }
3209 3689
3210 while (my ($face, $info) = each %$faces) { 3690 while (my ($face, $info) = each %$faces) {
3211 next unless $info->{smooth}; 3691 next unless $info->{smooth};
3212 3692
3215 3695
3216 if (my $smooth = cf::face::find $info->{smooth}) { 3696 if (my $smooth = cf::face::find $info->{smooth}) {
3217 cf::face::set_smooth $idx, $smooth; 3697 cf::face::set_smooth $idx, $smooth;
3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3698 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3219 } else { 3699 } else {
3220 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3700 error "smooth face '$info->{smooth}' not found for face '$face'";
3221 } 3701 }
3222
3223 cf::cede_to_tick;
3224 } 3702 }
3225 } 3703 }
3226 3704
3227 { 3705 {
3228 my $anims = $facedata->{animinfo}; 3706 my $anims = $facedata->{animinfo};
3229 3707
3230 while (my ($anim, $info) = each %$anims) { 3708 while (my ($anim, $info) = each %$anims) {
3231 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3709 cf::anim::set $anim, $info->{frames}, $info->{facings};
3232 cf::cede_to_tick;
3233 } 3710 }
3234 3711
3235 cf::anim::invalidate_all; # d'oh 3712 cf::anim::invalidate_all; # d'oh
3236 } 3713 }
3237 3714
3238 { 3715 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource}; 3716 my $res = $facedata->{resource};
3242 3717
3243 while (my ($name, $info) = each %$res) { 3718 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) { 3719 if (defined (my $type = $info->{type})) {
3720 # TODO: different hash - must free and use new index, or cache ixface data queue
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3721 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247 3722
3248 if ($info->{type} & 1) {
3249 # prepend meta info
3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type}; 3723 cf::face::set_type $idx, $type;
3724 cf::face::set_csum $idx, 0, $info->{hash};
3725 $cf::face::SIZE[0][$idx] = $info->{size};
3726 $cf::face::FOFS[0][$idx] = $info->{fofs};
3727 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3728 $cf::face::HASH{$info->{hash}} = $idx;
3263 } else { 3729 } else {
3264 $RESOURCE{$name} = $info; 3730# $RESOURCE{$name} = $info; # unused
3265 } 3731 }
3266
3267 cf::cede_to_tick;
3268 } 3732 }
3269 } 3733 }
3734
3735 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3736
3737 # HACK to clear player env face cache, we need some signal framework
3738 # for this (global event?)
3739 %ext::player_env::MUSIC_FACE_CACHE = ();
3740
3741 # END ATOMIC
3742
3743 cf::debug "facedata atomic update time ", EV::time - $t1;
3270 3744
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3745 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272 3746
3747 aio_close $fh if $fh; # close old facedata
3748
3273 1 3749 1
3274} 3750}
3275
3276cf::global->attach (on_resource_update => sub {
3277 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281 my $sound = $soundconf->{compat}[$_]
3282 or next;
3283
3284 my $face = cf::face::find "sound/$sound->[1]";
3285 cf::sound::set $sound->[0] => $face;
3286 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287 }
3288
3289 while (my ($k, $v) = each %{$soundconf->{event}}) {
3290 my $face = cf::face::find "sound/$v";
3291 cf::sound::set $k => $face;
3292 }
3293 }
3294});
3295 3751
3296register_exticmd fx_want => sub { 3752register_exticmd fx_want => sub {
3297 my ($ns, $want) = @_; 3753 my ($ns, $want) = @_;
3298 3754
3299 while (my ($k, $v) = each %$want) { 3755 while (my ($k, $v) = each %$want) {
3307 my $status = load_resource_file_ $_[0]; 3763 my $status = load_resource_file_ $_[0];
3308 get_slot 0.1, 100; 3764 get_slot 0.1, 100;
3309 cf::arch::commit_load; 3765 cf::arch::commit_load;
3310 3766
3311 $status 3767 $status
3768}
3769
3770sub reload_exp_table {
3771 _reload_exp_table;
3772
3773 cf::face::set
3774 "res/exp_table" => FT_RSRC,
3775 JSON::XS->new->utf8->canonical->encode (
3776 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3777 );
3778}
3779
3780sub reload_materials {
3781 _reload_materials;
3312} 3782}
3313 3783
3314sub reload_regions { 3784sub reload_regions {
3315 # HACK to clear player env face cache, we need some signal framework 3785 # HACK to clear player env face cache, we need some signal framework
3316 # for this (global event?) 3786 # for this (global event?)
3324 if exists $_->{match}; 3794 if exists $_->{match};
3325 } 3795 }
3326} 3796}
3327 3797
3328sub reload_facedata { 3798sub reload_facedata {
3329 load_facedata "$DATADIR/facedata" 3799 load_facedata $DATADIR
3330 or die "unable to load facedata\n"; 3800 or die "unable to load facedata\n";
3331} 3801}
3332 3802
3333sub reload_archetypes { 3803sub reload_archetypes {
3334 load_resource_file "$DATADIR/archetypes" 3804 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n"; 3805 or die "unable to load archetypes\n";
3806
3807 cf::face::set
3808 "res/skill_info" => FT_RSRC,
3809 JSON::XS->new->utf8->canonical->encode (
3810 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3811 );
3812
3813 cf::face::set
3814 "res/spell_paths" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3817 );
3818
3819 # command completion
3820 my @commands;
3821
3822 for (0..cf::arch::skillvec_size - 1) {
3823 my $skill = cf::arch::skillvec $_;
3824 my $name = $skill->name;
3825 my $flags = cf::skill_flags $skill->subtype;
3826
3827 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3828 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3829 }
3830
3831 cf::client::set_command_face skill => \@commands;
3336} 3832}
3337 3833
3338sub reload_treasures { 3834sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3835 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3836 or die "unable to load treasurelists\n";
3341} 3837}
3342 3838
3839sub reload_sound {
3840 trace "loading sound config from $DATADIR/sound\n";
3841
3842 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3843
3844 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3845 my $sound = $soundconf->{compat}[$_]
3846 or next;
3847
3848 my $face = cf::face::find "sound/$sound->[1]";
3849 cf::sound::set $sound->[0] => $face;
3850 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3851 }
3852
3853 while (my ($k, $v) = each %{$soundconf->{event}}) {
3854 my $face = cf::face::find "sound/$v";
3855 cf::sound::set $k => $face;
3856 }
3857}
3858
3343sub reload_resources { 3859sub reload_resources {
3344 warn "reloading resource files...\n"; 3860 trace "reloading resource files...\n";
3345 3861
3862 reload_materials;
3346 reload_facedata; 3863 reload_facedata;
3864 reload_exp_table;
3865 reload_sound;
3347 reload_archetypes; 3866 reload_archetypes;
3348 reload_regions; 3867 reload_regions;
3349 reload_treasures; 3868 reload_treasures;
3350 3869
3351 warn "finished reloading resource files\n"; 3870 trace "finished reloading resource files\n";
3352} 3871}
3353 3872
3354sub reload_config { 3873sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3874 trace "reloading config file...\n";
3356 or return;
3357 3875
3358 local $/; 3876 my $config = load_file "$CONFDIR/config";
3359 *CFG = YAML::Load <$fh>; 3877 utf8::decode $config;
3878 *CFG = decode_yaml $config;
3360 3879
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3880 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3881
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3882 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3883 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3884
3366 if (exists $CFG{mlockall}) { 3885 if (exists $CFG{mlockall}) {
3389 3908
3390 seek $fh, 0, 0; 3909 seek $fh, 0, 0;
3391 print $fh $$; 3910 print $fh $$;
3392} 3911}
3393 3912
3913sub main_loop {
3914 trace "EV::loop starting\n";
3915 if (1) {
3916 EV::loop;
3917 }
3918 trace "EV::loop returned\n";
3919 goto &main_loop unless $REALLY_UNLOOP;
3920}
3921
3394sub main { 3922sub main {
3395 cf::init_globals; # initialise logging 3923 cf::init_globals; # initialise logging
3396 3924
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3925 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3926 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3927 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3928 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401 3929
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3930 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3931
3410 # we must not ever block the main coroutine 3932 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3933 $Coro::idle = sub {
3412 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3934 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3413 (async { 3935 (async {
3414 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3936 $Coro::current->{desc} = "IDLE BUG HANDLER";
3415 EV::loop EV::LOOP_ONESHOT; 3937 EV::loop EV::LOOP_ONESHOT;
3416 })->prio (Coro::PRIO_MAX); 3938 })->prio (Coro::PRIO_MAX);
3417 }; 3939 };
3418 3940
3419 evthread_start IO::AIO::poll_fileno; 3941 evthread_start IO::AIO::poll_fileno;
3420 3942
3421 cf::sync_job { 3943 cf::sync_job {
3944 cf::incloader::init ();
3945
3946 db_init;
3947
3948 cf::init_anim;
3949 cf::init_attackmess;
3950 cf::init_dynamic;
3951
3952 cf::load_settings;
3953
3422 reload_resources; 3954 reload_resources;
3423 reload_config; 3955 reload_config;
3424 db_init;
3425 3956
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid; 3957 cf::init_uuid;
3429 cf::init_signals; 3958 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills; 3959 cf::init_skills;
3432 3960
3433 cf::init_beforeplay; 3961 cf::init_beforeplay;
3434 3962
3435 atomic; 3963 atomic;
3437 load_extensions; 3965 load_extensions;
3438 3966
3439 utime time, time, $RUNTIMEFILE; 3967 utime time, time, $RUNTIMEFILE;
3440 3968
3441 # no (long-running) fork's whatsoever before this point(!) 3969 # no (long-running) fork's whatsoever before this point(!)
3970 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3971 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3972
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3973 cf::_post_init 0;
3445 }; 3974 };
3446 3975
3447 EV::loop; 3976 cf::object::thawer::errors_are_fatal 0;
3977 info "parse errors in files are no longer fatal from this point on.\n";
3978
3979 AE::postpone {
3980 undef &main; # free gobs of memory :)
3981 };
3982
3983 goto &main_loop;
3448} 3984}
3449 3985
3450############################################################################# 3986#############################################################################
3451# initialisation and cleanup 3987# initialisation and cleanup
3452 3988
3453# install some emergency cleanup handlers 3989# install some emergency cleanup handlers
3454BEGIN { 3990BEGIN {
3455 our %SIGWATCHER = (); 3991 our %SIGWATCHER = ();
3456 for my $signal (qw(INT HUP TERM)) { 3992 for my $signal (qw(INT HUP TERM)) {
3457 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3993 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3458 cf::cleanup "SIG$signal"; 3994 cf::cleanup "SIG$signal";
3459 }; 3995 };
3460 } 3996 }
3461} 3997}
3462 3998
3463sub write_runtime_sync { 3999sub write_runtime_sync {
4000 my $t0 = AE::time;
4001
3464 # first touch the runtime file to show we are still running: 4002 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 4003 # the fsync below can take a very very long time.
3466 4004
3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4005 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 4006
3469 my $guard = cf::lock_acquire "write_runtime"; 4007 my $guard = cf::lock_acquire "write_runtime";
3470 4008
3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4009 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472 or return; 4010 or return;
3473 4011
3474 my $value = $cf::RUNTIME + 90 + 10; 4012 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 4013 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 4014 # 60 allows for the watchdog to kill the server.
3489 or return; 4027 or return;
3490 4028
3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4029 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 4030 and return;
3493 4031
3494 warn "runtime file written.\n"; 4032 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3495 4033
3496 1 4034 1
3497} 4035}
3498 4036
3499our $uuid_lock; 4037our $uuid_lock;
3511 or return; 4049 or return;
3512 4050
3513 my $value = uuid_seq uuid_cur; 4051 my $value = uuid_seq uuid_cur;
3514 4052
3515 unless ($value) { 4053 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n"; 4054 info "cowardly refusing to write zero uuid value!\n";
3517 return; 4055 return;
3518 } 4056 }
3519 4057
3520 my $value = uuid_str $value + $uuid_skip; 4058 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 4059 $uuid_skip = 0;
3531 or return; 4069 or return;
3532 4070
3533 aio_rename "$uuid~", $uuid 4071 aio_rename "$uuid~", $uuid
3534 and return; 4072 and return;
3535 4073
3536 warn "uuid file written ($value).\n"; 4074 trace "uuid file written ($value).\n";
3537 4075
3538 1 4076 1
3539 4077
3540} 4078}
3541 4079
3547} 4085}
3548 4086
3549sub emergency_save() { 4087sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 4088 my $freeze_guard = cf::freeze_mainloop;
3551 4089
3552 warn "emergency_perl_save: enter\n"; 4090 info "emergency_perl_save: enter\n";
4091
4092 # this is a trade-off: we want to be very quick here, so
4093 # save all maps without fsync, and later call a global sync
4094 # (which in turn might be very very slow)
4095 local $USE_FSYNC = 0;
3553 4096
3554 cf::sync_job { 4097 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so 4098 cf::write_runtime_sync; # external watchdog should not bark
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559 4099
3560 # use a peculiar iteration method to avoid tripping on perl 4100 # use a peculiar iteration method to avoid tripping on perl
3561 # refcount bugs in for. also avoids problems with players 4101 # refcount bugs in for. also avoids problems with players
3562 # and maps saved/destroyed asynchronously. 4102 # and maps saved/destroyed asynchronously.
3563 warn "emergency_perl_save: begin player save\n"; 4103 info "emergency_perl_save: begin player save\n";
3564 for my $login (keys %cf::PLAYER) { 4104 for my $login (keys %cf::PLAYER) {
3565 my $pl = $cf::PLAYER{$login} or next; 4105 my $pl = $cf::PLAYER{$login} or next;
3566 $pl->valid or next; 4106 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4107 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3568 $pl->save; 4108 $pl->save;
3569 } 4109 }
3570 warn "emergency_perl_save: end player save\n"; 4110 info "emergency_perl_save: end player save\n";
3571 4111
4112 cf::write_runtime_sync; # external watchdog should not bark
4113
3572 warn "emergency_perl_save: begin map save\n"; 4114 info "emergency_perl_save: begin map save\n";
3573 for my $path (keys %cf::MAP) { 4115 for my $path (keys %cf::MAP) {
3574 my $map = $cf::MAP{$path} or next; 4116 my $map = $cf::MAP{$path} or next;
3575 $map->valid or next; 4117 $map->valid or next;
3576 $map->save; 4118 $map->save;
3577 } 4119 }
3578 warn "emergency_perl_save: end map save\n"; 4120 info "emergency_perl_save: end map save\n";
3579 4121
4122 cf::write_runtime_sync; # external watchdog should not bark
4123
3580 warn "emergency_perl_save: begin database checkpoint\n"; 4124 info "emergency_perl_save: begin database checkpoint\n";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 4125 BDB::db_env_txn_checkpoint $DB_ENV;
3582 warn "emergency_perl_save: end database checkpoint\n"; 4126 info "emergency_perl_save: end database checkpoint\n";
3583 4127
3584 warn "emergency_perl_save: begin write uuid\n"; 4128 info "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1; 4129 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n"; 4130 info "emergency_perl_save: end write uuid\n";
4131
4132 cf::write_runtime_sync; # external watchdog should not bark
4133
4134 trace "emergency_perl_save: syncing database to disk";
4135 BDB::db_env_txn_checkpoint $DB_ENV;
4136
4137 info "emergency_perl_save: starting sync\n";
4138 IO::AIO::aio_sync sub {
4139 info "emergency_perl_save: finished sync\n";
4140 };
4141
4142 cf::write_runtime_sync; # external watchdog should not bark
4143
4144 trace "emergency_perl_save: flushing outstanding aio requests";
4145 while (IO::AIO::nreqs || BDB::nreqs) {
4146 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4147 }
4148
4149 cf::write_runtime_sync; # external watchdog should not bark
3587 }; 4150 };
3588 4151
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3594 warn "emergency_perl_save: leave\n"; 4152 info "emergency_perl_save: leave\n";
3595} 4153}
3596 4154
3597sub post_cleanup { 4155sub post_cleanup {
3598 my ($make_core) = @_; 4156 my ($make_core) = @_;
3599 4157
4158 IO::AIO::flush;
4159
3600 warn Carp::longmess "post_cleanup backtrace" 4160 error Carp::longmess "post_cleanup backtrace"
3601 if $make_core; 4161 if $make_core;
3602 4162
3603 my $fh = pidfile; 4163 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$; 4164 unlink $PIDFILE if <$fh> == $$;
3605} 4165}
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4185 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) { 4186 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"}; 4187 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4188# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 } 4189 }
3630 warn "cleared package $pkg\n";#d#
3631} 4190}
3632 4191
3633sub do_reload_perl() { 4192sub do_reload_perl() {
3634 # can/must only be called in main 4193 # can/must only be called in main
3635 if ($Coro::current != $Coro::main) { 4194 unless (in_main) {
3636 warn "can only reload from main coroutine"; 4195 error "can only reload from main coroutine";
3637 return; 4196 return;
3638 } 4197 }
3639 4198
3640 return if $RELOAD++; 4199 return if $RELOAD++;
3641 4200
3642 my $t1 = EV::time; 4201 my $t1 = AE::time;
3643 4202
3644 while ($RELOAD) { 4203 while ($RELOAD) {
3645 warn "reloading..."; 4204 cf::get_slot 0.1, -1, "reload_perl";
4205 info "perl_reload: reloading...";
3646 4206
3647 warn "entering sync_job"; 4207 trace "perl_reload: entering sync_job";
3648 4208
3649 cf::sync_job { 4209 cf::sync_job {
3650 cf::write_runtime_sync; # external watchdog should not bark
3651 cf::emergency_save; 4210 #cf::emergency_save;
3652 cf::write_runtime_sync; # external watchdog should not bark
3653 4211
3654 warn "syncing database to disk";
3655 BDB::db_env_txn_checkpoint $DB_ENV;
3656
3657 # if anything goes wrong in here, we should simply crash as we already saved
3658
3659 warn "flushing outstanding aio requests";
3660 while (IO::AIO::nreqs || BDB::nreqs) {
3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3662 }
3663
3664 warn "cancelling all extension coros"; 4212 trace "perl_reload: cancelling all extension coros";
3665 $_->cancel for values %EXT_CORO; 4213 $_->cancel for values %EXT_CORO;
3666 %EXT_CORO = (); 4214 %EXT_CORO = ();
3667 4215
3668 warn "removing commands"; 4216 trace "perl_reload: removing commands";
3669 %COMMAND = (); 4217 %COMMAND = ();
3670 4218
3671 warn "removing ext/exti commands"; 4219 trace "perl_reload: removing ext/exti commands";
3672 %EXTCMD = (); 4220 %EXTCMD = ();
3673 %EXTICMD = (); 4221 %EXTICMD = ();
3674 4222
3675 warn "unloading/nuking all extensions"; 4223 trace "perl_reload: unloading/nuking all extensions";
3676 for my $pkg (@EXTS) { 4224 for my $pkg (@EXTS) {
3677 warn "... unloading $pkg"; 4225 trace "... unloading $pkg";
3678 4226
3679 if (my $cb = $pkg->can ("unload")) { 4227 if (my $cb = $pkg->can ("unload")) {
3680 eval { 4228 eval {
3681 $cb->($pkg); 4229 $cb->($pkg);
3682 1 4230 1
3683 } or warn "$pkg unloaded, but with errors: $@"; 4231 } or error "$pkg unloaded, but with errors: $@";
3684 } 4232 }
3685 4233
3686 warn "... clearing $pkg"; 4234 trace "... clearing $pkg";
3687 clear_package $pkg; 4235 clear_package $pkg;
3688 } 4236 }
3689 4237
3690 warn "unloading all perl modules loaded from $LIBDIR"; 4238 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) { 4239 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4240 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693 4241
3694 warn "... unloading $k"; 4242 trace "... unloading $k";
3695 delete $INC{$k}; 4243 delete $INC{$k};
3696 4244
3697 $k =~ s/\.pm$//; 4245 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g; 4246 $k =~ s/\//::/g;
3699 4247
3702 } 4250 }
3703 4251
3704 clear_package $k; 4252 clear_package $k;
3705 } 4253 }
3706 4254
3707 warn "getting rid of safe::, as good as possible"; 4255 trace "perl_reload: getting rid of safe::, as good as possible";
3708 clear_package "safe::$_" 4256 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4257 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 4258
3711 warn "unloading cf.pm \"a bit\""; 4259 trace "perl_reload: unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 4260 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 4261 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 4262
3715 # don't, removes xs symbols, too, 4263 # don't, removes xs symbols, too,
3716 # and global variables created in xs 4264 # and global variables created in xs
3717 #clear_package __PACKAGE__; 4265 #clear_package __PACKAGE__;
3718 4266
3719 warn "unload completed, starting to reload now"; 4267 info "perl_reload: unload completed, starting to reload now";
3720 4268
3721 warn "reloading cf.pm"; 4269 trace "perl_reload: reloading cf.pm";
3722 require cf; 4270 require cf;
3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4271 cf::_connect_to_perl_1;
3724 4272
3725 warn "loading config and database again"; 4273 trace "perl_reload: loading config and database again";
3726 cf::reload_config; 4274 cf::reload_config;
3727 4275
3728 warn "loading extensions"; 4276 trace "perl_reload: loading extensions";
3729 cf::load_extensions; 4277 cf::load_extensions;
3730 4278
3731 if ($REATTACH_ON_RELOAD) { 4279 if ($REATTACH_ON_RELOAD) {
3732 warn "reattaching attachments to objects/players"; 4280 trace "perl_reload: reattaching attachments to objects/players";
3733 _global_reattach; # objects, sockets 4281 _global_reattach; # objects, sockets
3734 warn "reattaching attachments to maps"; 4282 trace "perl_reload: reattaching attachments to maps";
3735 reattach $_ for values %MAP; 4283 reattach $_ for values %MAP;
3736 warn "reattaching attachments to players"; 4284 trace "perl_reload: reattaching attachments to players";
3737 reattach $_ for values %PLAYER; 4285 reattach $_ for values %PLAYER;
3738 } 4286 }
3739 4287
3740 warn "running post_init jobs"; 4288 cf::_post_init 1;
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742 4289
3743 warn "leaving sync_job"; 4290 trace "perl_reload: leaving sync_job";
3744 4291
3745 1 4292 1
3746 } or do { 4293 } or do {
3747 warn $@; 4294 error $@;
3748 cf::cleanup "error while reloading, exiting."; 4295 cf::cleanup "perl_reload: error, exiting.";
3749 }; 4296 };
3750 4297
3751 warn "reloaded";
3752 --$RELOAD; 4298 --$RELOAD;
3753 } 4299 }
3754 4300
3755 $t1 = EV::time - $t1; 4301 $t1 = AE::time - $t1;
3756 warn "reload completed in ${t1}s\n"; 4302 info "perl_reload: completed in ${t1}s\n";
3757}; 4303};
3758 4304
3759our $RELOAD_WATCHER; # used only during reload 4305our $RELOAD_WATCHER; # used only during reload
3760 4306
3761sub reload_perl() { 4307sub reload_perl() {
3763 # coro crashes during coro_state_free->destroy here. 4309 # coro crashes during coro_state_free->destroy here.
3764 4310
3765 $RELOAD_WATCHER ||= cf::async { 4311 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions; 4312 Coro::AIO::aio_wait cache_extensions;
3767 4313
3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4314 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3769 do_reload_perl; 4315 do_reload_perl;
3770 undef $RELOAD_WATCHER; 4316 undef $RELOAD_WATCHER;
3771 }; 4317 };
3772 }; 4318 };
3773} 4319}
3782 reload_perl; 4328 reload_perl;
3783 }; 4329 };
3784 } 4330 }
3785}; 4331};
3786 4332
3787unshift @INC, $LIBDIR; 4333#############################################################################
3788 4334
3789my $bug_warning = 0; 4335my $bug_warning = 0;
3790 4336
3791our @WAIT_FOR_TICK;
3792our @WAIT_FOR_TICK_BEGIN;
3793
3794sub wait_for_tick { 4337sub wait_for_tick() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4338 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3796 4339
3797 my $signal = new Coro::Signal; 4340 $WAIT_FOR_TICK->wait;
3798 push @WAIT_FOR_TICK, $signal;
3799 $signal->wait;
3800} 4341}
3801 4342
3802sub wait_for_tick_begin { 4343sub wait_for_tick_begin() {
3803 return if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3804 4345
3805 my $signal = new Coro::Signal; 4346 my $signal = new Coro::Signal;
3806 push @WAIT_FOR_TICK_BEGIN, $signal; 4347 push @WAIT_FOR_TICK_BEGIN, $signal;
3807 $signal->wait; 4348 $signal->wait;
3808} 4349}
3812 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4353 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3813 unless ++$bug_warning > 10; 4354 unless ++$bug_warning > 10;
3814 return; 4355 return;
3815 } 4356 }
3816 4357
3817 cf::server_tick; # one server iteration 4358 cf::one_tick; # one server iteration
4359
4360 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3818 4361
3819 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4362 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4363 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3821 Coro::async_pool { 4364 Coro::async_pool {
3822 $Coro::current->{desc} = "runtime saver"; 4365 $Coro::current->{desc} = "runtime saver";
3823 write_runtime_sync 4366 write_runtime_sync
3824 or warn "ERROR: unable to write runtime file: $!"; 4367 or error "ERROR: unable to write runtime file: $!";
3825 }; 4368 };
3826 } 4369 }
3827 4370
3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4371 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3829 $sig->send; 4372 $sig->send;
3830 } 4373 }
3831 while (my $sig = shift @WAIT_FOR_TICK) { 4374 $WAIT_FOR_TICK->broadcast;
3832 $sig->send;
3833 }
3834 4375
3835 $LOAD = ($NOW - $TICK_START) / $TICK; 4376 $LOAD = ($NOW - $TICK_START) / $TICK;
3836 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4377 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3837 4378
3838 if (0) { 4379 if (0) {
3839 if ($NEXT_TICK) { 4380 if ($NEXT_TICK) {
3840 my $jitter = $TICK_START - $NEXT_TICK; 4381 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4382 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d# 4383 debug "jitter $JITTER\n";#d#
3843 } 4384 }
3844 } 4385 }
3845} 4386}
3846 4387
3847{ 4388{
3848 # configure BDB 4389 # configure BDB
4390 info "initialising database";
3849 4391
3850 BDB::min_parallel 8; 4392 BDB::min_parallel 16;
3851 BDB::max_poll_reqs $TICK * 0.1; 4393 BDB::max_poll_reqs $TICK * 0.1;
3852 $AnyEvent::BDB::WATCHER->priority (1); 4394 #$AnyEvent::BDB::WATCHER->priority (1);
3853 4395
3854 unless ($DB_ENV) { 4396 unless ($DB_ENV) {
3855 $DB_ENV = BDB::db_env_create; 4397 $DB_ENV = BDB::db_env_create;
3856 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4398 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3857 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4399 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3882 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4424 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3883 }; 4425 };
3884 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4426 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3885 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4427 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3886 }; 4428 };
4429
4430 info "database initialised";
3887} 4431}
3888 4432
3889{ 4433{
3890 # configure IO::AIO 4434 # configure IO::AIO
3891 4435
4436 info "initialising aio";
3892 IO::AIO::min_parallel 8; 4437 IO::AIO::min_parallel 8;
3893 IO::AIO::max_poll_time $TICK * 0.1; 4438 IO::AIO::max_poll_time $TICK * 0.1;
3894 undef $AnyEvent::AIO::WATCHER; 4439 undef $AnyEvent::AIO::WATCHER;
4440 info "aio initialised";
3895} 4441}
3896 4442
3897my $_log_backtrace; 4443our $_log_backtrace;
4444our $_log_backtrace_last;
3898 4445
3899sub _log_backtrace { 4446sub _log_backtrace {
3900 my ($msg, @addr) = @_; 4447 my ($msg, @addr) = @_;
3901 4448
3902 $msg =~ s/\n//; 4449 $msg =~ s/\n$//;
3903 4450
4451 if ($_log_backtrace_last eq $msg) {
4452 LOG llevInfo, "[ABT] $msg\n";
4453 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3904 # limit the # of concurrent backtraces 4454 # limit the # of concurrent backtraces
3905 if ($_log_backtrace < 2) { 4455 } elsif ($_log_backtrace < 2) {
4456 $_log_backtrace_last = $msg;
3906 ++$_log_backtrace; 4457 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg; 4458 my $perl_bt = Carp::longmess $msg;
3908 async { 4459 async {
3909 $Coro::current->{desc} = "abt $msg"; 4460 $Coro::current->{desc} = "abt $msg";
3910 4461
3930 LOG llevInfo, "[ABT] $_\n" for @bt; 4481 LOG llevInfo, "[ABT] $_\n" for @bt;
3931 --$_log_backtrace; 4482 --$_log_backtrace;
3932 }; 4483 };
3933 } else { 4484 } else {
3934 LOG llevInfo, "[ABT] $msg\n"; 4485 LOG llevInfo, "[ABT] $msg\n";
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 4486 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3936 } 4487 }
3937} 4488}
3938 4489
3939# load additional modules 4490# load additional modules
3940use cf::pod; 4491require "cf/$_.pm" for @EXTRA_MODULES;
4492cf::_connect_to_perl_2;
3941 4493
3942END { cf::emergency_save } 4494END { cf::emergency_save }
3943 4495
39441 44961
3945 4497

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines