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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines