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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines