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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines