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.493 by root, Mon Oct 26 02:34:37 2009 UTC vs.
Revision 1.589 by root, Sun Nov 4 01:01:13 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 Digest::MD5;
59use Fcntl; 60use Fcntl;
60use YAML::XS (); 61use YAML::XS ();
61use IO::AIO (); 62use IO::AIO ();
62use Time::HiRes; 63use Time::HiRes;
63use Compress::LZF; 64use Compress::LZF;
… …
79# strictly for debugging 80# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81 82
82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83 84
85our @ORIG_INC;
86
84our %COMMAND = (); 87our %COMMAND = ();
85our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
86 89
87our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
88our %EXTCMD = (); 91our %EXTCMD = ();
… …
94our @EVENT; 97our @EVENT;
95our @REFLECT; # set by XS 98our @REFLECT; # set by XS
96our %REFLECT; # set by us 99our %REFLECT; # set by us
97 100
98our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
99our $DATADIR = datadir; 103our $DATADIR = datadir;
100our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
101our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
102our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
103our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
104our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
106our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
107our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
108our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 116
112our %RESOURCE; 117#our %RESOURCE; # unused
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
113 124
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 127our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
119our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
121our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
122our $DB_ENV; 133our $DB_ENV;
123 134
124our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
125 136
126our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
127 139
128our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
129our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
130our $NOW; 143our $NOW;
131 144
132our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
133our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
134our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
143 156
144our @POST_INIT; 157our @POST_INIT;
145 158
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
148 164
149binmode STDOUT; 165binmode STDOUT;
150binmode STDERR; 166binmode STDERR;
151 167
152# read virtual server time, if available 168# read virtual server time, if available
… …
163 179
164our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
165 181
166sub cf::map::normalise; 182sub cf::map::normalise;
167 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
168############################################################################# 188#############################################################################
169 189
170%REFLECT = (); 190%REFLECT = ();
171for (@REFLECT) { 191for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 192 my $reflect = JSON::XS::decode_json $_;
… …
182 202
183=over 4 203=over 4
184 204
185=item $cf::UPTIME 205=item $cf::UPTIME
186 206
187The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
188 223
189=item $cf::RUNTIME 224=item $cf::RUNTIME
190 225
191The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
192every server tick. 227every server tick.
… …
198Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
199directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
200unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
201database environment. 236database environment.
202 237
203=item $cf::NOW
204
205The time of the last (current) server tick.
206
207=item $cf::TICK
208
209The interval between server ticks, in seconds.
210
211=item $cf::LOADAVG 238=item $cf::LOADAVG
212 239
213The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
214(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
215objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
224from wherever your confdir points to. 251from wherever your confdir points to.
225 252
226=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
227 254
228These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
229returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
230per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
231 275
232=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
233 277
234This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
243 287
244=back 288=back
245 289
246=cut 290=cut
247 291
292sub error(@) { LOG llevError, join "", @_ }
293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
248$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 299 my $msg = join "", @_;
250 300
251 $msg .= "\n" 301 $msg .= "\n"
252 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
253 303
254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
255 305
256 LOG llevError, $msg; 306 LOG llevWarn, $msg;
257}; 307};
258 308
259$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
261 311
262 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
263 313
264 if ($Coro::current == $Coro::main) {#d# 314 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 316 return;#d#
267 }#d# 317 }#d#
268 318
269 # kill coroutine otherwise 319 # kill coroutine otherwise
270 Coro::terminate 320 Coro::terminate
… …
290)) { 340)) {
291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
292} 342}
293 343
294$EV::DIED = sub { 344$EV::DIED = sub {
295 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
296}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
297 352
298############################################################################# 353#############################################################################
299 354
300=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
301 356
… …
322 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
323 $d 378 $d
324 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
325} 380}
326 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
327=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
328 435
329Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
330 437
331=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
338 445
339sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
340sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
341 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
342=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
343 481
344Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
346 484
347The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
348is a reload or not. 486is a reload or not.
349 487
350=cut 488=cut
351 489
352sub post_init(&) { 490sub post_init(&) {
353 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
354} 509}
355 510
356=item cf::lock_wait $string 511=item cf::lock_wait $string
357 512
358Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
397} 552}
398 553
399=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
400 555
401Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer. 557get spread over time.
403 558
404=cut 559=cut
405 560
406sub periodic($$) { 561sub periodic($$) {
407 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
… …
411 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
412} 567}
413 568
414=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
415 570
416Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
417This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
418of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
419 578
420The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
421used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
422 581
423Useful for short background jobs. 582Useful for short background jobs.
424 583
425=cut 584=cut
426 585
427our @SLOT_QUEUE; 586our @SLOT_QUEUE;
428our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
429 589
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
433 593
434 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
435 596
436 while () { 597 while () {
437 next_job: 598 next_job:
599
438 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 601
440 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 606 $job->[2]->send;
444 Coro::cede; 607 Coro::cede;
445 goto next_job; 608 goto next_job;
446 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 611 }
448 } 612 }
449 613
450 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
453 $signal->wait;
454 } else { 617 } else {
618 $busy = 0;
455 Coro::schedule; 619 Coro::schedule;
456 } 620 }
457 } 621 }
458}; 622};
459 623
460sub get_slot($;$$) { 624sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
462 626
463 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
464 628
465 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
466 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
467 632
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
… …
496=cut 661=cut
497 662
498sub sync_job(&) { 663sub sync_job(&) {
499 my ($job) = @_; 664 my ($job) = @_;
500 665
501 if ($Coro::current == $Coro::main) { 666 if (in_main) {
502 my $time = EV::time; 667 my $time = AE::time;
503 668
504 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
506 671
507 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
508 673
509 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
510 675
511 my $busy = 1; 676 my $busy = 1;
512 my @res; 677 my @res;
513 678
514 (async { 679 (async {
515 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 681 @res = eval { $job->() };
517 warn $@ if $@; 682 error $@ if $@;
518 undef $busy; 683 undef $busy;
519 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
520 685
521 while ($busy) { 686 while ($busy) {
522 if (Coro::nready) { 687 if (Coro::nready) {
… …
524 } else { 689 } else {
525 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
526 } 691 }
527 } 692 }
528 693
529 my $time = EV::time - $time; 694 my $time = AE::time - $time;
530 695
531 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
532 697
533 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
534 } else { 699 } else {
… …
556 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
557 722
558 $coro 723 $coro
559} 724}
560 725
561=item fork_call { }, $args 726=item fork_call { }, @args
562 727
563Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
564process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
565Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
566never block itself or use any form of event handling. 731never block itself or use any form of event handling.
567 732
568=cut 733=cut
569 734
735sub post_fork {
736 reset_signals;
737}
738
570sub fork_call(&@) { 739sub fork_call(&@) {
571 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
572 741
573 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
574 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
575 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
576 745
577 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
578 reset_signals; 747 cf::post_fork;
579 &$cb 748 &$cb
580 }, @args; 749 } @args;
581 750
582 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
583} 763}
584 764
585=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
586 766
587=cut 767=cut
… …
624within each server. 804within each server.
625 805
626=cut 806=cut
627 807
628sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
629 my ($name) = @_; 812 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
631 814
632 eval { 815 eval {
633 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
… …
643} 826}
644 827
645our $DB; 828our $DB;
646 829
647sub db_init { 830sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
650 };
651} 832}
652 833
653sub db_get($$) { 834sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
655 836
656 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
657 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
658 841
659 $! ? () 842 $! ? ()
660 : $data 843 : $data
661 }
662} 844}
663 845
664sub db_put($$$) { 846sub db_put($$$) {
665 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
694 876
695 my @data; 877 my @data;
696 my $md5; 878 my $md5;
697 879
698 for (0 .. $#$src) { 880 for (0 .. $#$src) {
699 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
700 or Carp::croak "$src->[$_]: $!";
701 } 882 }
702 883
703 # if processing is expensive, check 884 # if processing is expensive, check
704 # checksum first 885 # checksum first
705 if (1) { 886 if (1) {
… …
722 903
723 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 905 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
726 907
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 909
729 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
732 913
… …
742 923
743=cut 924=cut
744 925
745sub datalog($@) { 926sub datalog($@) {
746 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 929}
749 930
750=back 931=back
751 932
752=cut 933=cut
… …
947 1128
948 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 1131
951 } elsif (ref $type) { 1132 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
953 1134
954 } else { 1135 } else {
955 shift @arg; 1136 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
957 } 1138 }
958 } 1139 }
959} 1140}
960 1141
961sub _object_attach { 1142sub _object_attach {
… …
971 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
972 } 1153 }
973 1154
974 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
975 } else { 1156 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1158 }
978 1159
979 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
980} 1161}
981 1162
… …
1040 1221
1041 for (@$callbacks) { 1222 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1043 1224
1044 if ($@) { 1225 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1227 override;
1048 } 1228 }
1049 1229
1050 return 1 if $override; 1230 return 1 if $override;
1051 } 1231 }
… …
1130 for (@$attach) { 1310 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1133 } 1313 }
1134 } else { 1314 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1316 }
1137 } 1317 }
1138} 1318}
1139 1319
1140cf::attachable->attach ( 1320cf::attachable->attach (
… …
1167 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1168 1348
1169 sync_job { 1349 sync_job {
1170 if (length $$rdata) { 1350 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1174 1355
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
… …
1200 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1201 1382
1202 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1385 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1206 } 1387 }
1207 } else { 1388 } else {
1208 aio_unlink $filename; 1389 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1210 } 1391 }
… …
1234 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1416 $av = $st->{objs};
1236 } 1417 }
1237 1418
1238 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1241 1423
1242 ($data, $av) 1424 ($data, $av)
1243} 1425}
1244 1426
1245=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
… …
1304} 1486}
1305 1487
1306use File::Glob (); 1488use File::Glob ();
1307 1489
1308cf::player->attach ( 1490cf::player->attach (
1309 on_command => sub { 1491 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1311 1493
1312 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1313 or return; 1495 or return;
1314 1496
… …
1322 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1323 1505
1324 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1325 1507
1326 if (ref $msg) { 1508 if (ref $msg) {
1327 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1328 "ARRAY" eq ref $msg
1329 ? @$msg
1330 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1331 1510
1332 my @reply; 1511 my @reply;
1333 1512
1334 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1335 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1337 1516
1338 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1339 if $reply; 1518 if $reply;
1340 1519
1341 } else { 1520 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1522 }
1344 1523
1345 cf::override; 1524 cf::override;
1346 }, 1525 },
1347); 1526);
… …
1357 }; 1536 };
1358 1537
1359 $grp 1538 $grp
1360} 1539}
1361 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1362sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1363 cf::sync_job { 1557 cf::sync_job {
1364 my %todo; 1558 my %todo;
1365 1559
1366 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1561 next unless -r $path;
… …
1385 1579
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1582
1389 $ext{source} = 1583 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1392 . $source 1586 . $source
1393 . "\n};\n1"; 1587 . "\n};\n1";
1394 1588
1395 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1396 } 1590 }
1397 1591
1592 my $pass = 0;
1398 my %done; 1593 my %done;
1399 while (%todo) { 1594 while (%todo) {
1400 my $progress; 1595 my $progress;
1401 1596
1597 ++$pass;
1598
1599 ext:
1402 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1602 next ext
1405 unless exists $done{$_}; 1603 unless exists $done{$_};
1406 } 1604 }
1407 1605
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1607
1410 unless (eval $v->{source}) { 1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1617 my $active = eval $source;
1618
1619 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1621
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1623 if exists $v->{meta}{mandatory};
1418 1624
1419 warn $msg; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1627 } else {
1628 $done{$k} = delete $todo{$k};
1629 push @EXTS, $v->{pkg};
1630 $progress = 1;
1631
1632 info "$v->{base}: extension inactive.\n"
1633 unless $active;
1420 } 1634 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1635 }
1426 1636
1427 skip: 1637 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1639
1640 while (my ($k, $v) = each %todo) {
1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1642 if exists $v->{meta}{mandatory};
1643 }
1644
1645 last;
1646 }
1430 } 1647 }
1431 }; 1648 };
1432} 1649}
1433 1650
1434############################################################################# 1651#############################################################################
… …
1518 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1519 } 1736 }
1520 } 1737 }
1521} 1738}
1522 1739
1740cf::player->attach (
1741 on_load => sub {
1742 my ($pl, $path) = @_;
1743
1744 # restore slots saved in save, below
1745 my $slots = delete $pl->{_slots};
1746
1747 $pl->ob->current_weapon ($slots->[0]);
1748 $pl->combat_ob ($slots->[1]);
1749 $pl->ranged_ob ($slots->[2]);
1750 },
1751);
1752
1523sub save($) { 1753sub save($) {
1524 my ($pl) = @_; 1754 my ($pl) = @_;
1525 1755
1526 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1527 1757
… …
1532 1762
1533 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1535 1765
1536 cf::get_slot 0.01; 1766 cf::get_slot 0.01;
1767
1768 # save slots, to be restored later
1769 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1770
1538 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1772 cf::cede_to_tick;
1540} 1773}
1541 1774
… …
1575 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1576 1809
1577 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1812
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1581 $pl->deactivate; 1814 $pl->deactivate;
1815
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1585 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1586 1821
1587 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1589 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1643 \@logins 1878 \@logins
1644} 1879}
1645 1880
1646=item $player->maps 1881=item $player->maps
1647 1882
1883=item cf::player::maps $login
1884
1648Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1649player. May block. 1886player. May block.
1650 1887
1651=cut 1888=cut
1652 1889
… …
1714=cut 1951=cut
1715 1952
1716sub find_by_path($) { 1953sub find_by_path($) {
1717 my ($path) = @_; 1954 my ($path) = @_;
1718 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1719 my ($match, $specificity); 1958 my ($match, $specificity);
1720 1959
1721 for my $region (list) { 1960 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
… …
1751sub generate_random_map { 1990sub generate_random_map {
1752 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1753 1992
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1994
1756 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1766 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1767 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1768 (cf::region::find $rmp->{region}), $rmp->{custom}
1769 )
1770} 1996}
1771 1997
1772=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1773 1999
1774Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
… …
1779 2005
1780sub register { 2006sub register {
1781 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 2008 my $pkg = caller;
1783 2009
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 2011
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 2013}
1789 2014
1790# also paths starting with '/' 2015# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 2017
1793sub thawer_merge { 2018sub thawer_merge {
1794 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1795 2020
1796 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
… …
1801} 2026}
1802 2027
1803sub normalise { 2028sub normalise {
1804 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1805 2030
1806 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1807 2032
1808 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1809 2034
1810 # map plan: 2035 # map plan:
1811 # 2036 #
… …
1826 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1827 $path = "$base/$path"; 2052 $path = "$base/$path";
1828 } 2053 }
1829 2054
1830 for ($path) { 2055 for ($path) {
1831 redo if s{//}{/};
1832 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1833 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1834 } 2058 }
1835 2059
1836 $path 2060 $path
… …
1850 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1851 return $self; 2075 return $self;
1852 } 2076 }
1853 } 2077 }
1854 2078
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 2080 ()
1857} 2081}
1858 2082
2083# may re-bless or do other evil things
1859sub init { 2084sub init {
1860 my ($self) = @_; 2085 my ($self) = @_;
1861 2086
1862 $self 2087 $self
1863} 2088}
… …
1928 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1929 2154
1930 1 2155 1
1931} 2156}
1932 2157
2158# used to laod the header of an original map
1933sub load_header_orig { 2159sub load_header_orig {
1934 my ($self) = @_; 2160 my ($self) = @_;
1935 2161
1936 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1937} 2163}
1938 2164
2165# used to laod the header of an instantiated map
1939sub load_header_temp { 2166sub load_header_temp {
1940 my ($self) = @_; 2167 my ($self) = @_;
1941 2168
1942 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1943} 2170}
1944 2171
2172# called after loading the header from an instantiated map
1945sub prepare_temp { 2173sub prepare_temp {
1946 my ($self) = @_; 2174 my ($self) = @_;
1947 2175
1948 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1949 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1950 # safety 2178 # safety
1951 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1952 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1953} 2181}
1954 2182
2183# called after loading the header from an original map
1955sub prepare_orig { 2184sub prepare_orig {
1956 my ($self) = @_; 2185 my ($self) = @_;
1957 2186
1958 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1959 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
1983 2212
1984sub find; 2213sub find;
1985sub find { 2214sub find {
1986 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1987 2216
2217 cf::cede_to_tick;
2218
1988 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1989 2220
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1992 2223
1993 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2010 2241
2011 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
2012 } 2243 }
2013} 2244}
2014 2245
2015sub pre_load { } 2246sub pre_load { }
2016sub post_load { } 2247#sub post_load { } # XS
2017 2248
2018sub load { 2249sub load {
2019 my ($self) = @_; 2250 my ($self) = @_;
2020 2251
2021 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
… …
2024 2255
2025 { 2256 {
2026 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2027 2258
2028 return unless $self->valid; 2259 return unless $self->valid;
2029 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2030
2031 $self->in_memory (cf::MAP_LOADING);
2032 2261
2033 $self->alloc; 2262 $self->alloc;
2034 2263
2035 $self->pre_load; 2264 $self->pre_load;
2036 cf::cede_to_tick; 2265 cf::cede_to_tick;
2037 2266
2267 if (exists $self->{load_path}) {
2038 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2039 $f->skip_block; 2269 $f->skip_block;
2040 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2041 or return; 2271 or return;
2042 2272
2043 $self->post_load_original 2273 $self->post_load_original
2044 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2045 2275
2046 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2047 utf8::encode $uniq; 2277 utf8::encode $uniq;
2048 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2049 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2050 $self->clear_unique_items; 2280 $self->clear_unique_items;
2051 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2052 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2053 } 2284 }
2054 } 2285 }
2055 }
2056 2286
2057 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2058 2294
2059 cf::cede_to_tick; 2295 cf::cede_to_tick;
2060 # now do the right thing for maps 2296 # now do the right thing for maps
2061 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2062 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2066 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2067 $self->decay_objects; 2303 $self->decay_objects;
2068 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2069 $self->update_buttons; 2305 $self->update_buttons;
2070 cf::cede_to_tick; 2306 cf::cede_to_tick;
2071 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2072 } 2308 }
2073 2309
2074 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2076
2077 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2312 }
2079 2313
2080 $self->post_load; 2314 $self->post_load;
2081}
2082 2315
2316 1
2317}
2318
2319# customize the map for a given player, i.e.
2320# return the _real_ map. used by e.g. per-player
2321# maps to change the path to ~playername/mappath
2083sub customise_for { 2322sub customise_for {
2084 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2085 2324
2086 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2326 if $self->per_player;
… …
2090# if $self->per_party; 2329# if $self->per_party;
2091 2330
2092 $self 2331 $self
2093} 2332}
2094 2333
2095# find and load all maps in the 3x3 area around a map
2096sub load_neighbours {
2097 my ($map) = @_;
2098
2099 my @neigh; # diagonal neighbours
2100
2101 for (0 .. 3) {
2102 my $neigh = $map->tile_path ($_)
2103 or next;
2104 $neigh = find $neigh, $map
2105 or next;
2106 $neigh->load;
2107
2108 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 }
2112
2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
2115 my $neigh = find $path, $origin
2116 or next;
2117 $neigh->load;
2118 }
2119}
2120
2121sub find_sync { 2334sub find_sync {
2122 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2123 2336
2124 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2125} 2342}
2126 2343
2127sub do_load_sync { 2344sub do_load_sync {
2128 my ($map) = @_; 2345 my ($map) = @_;
2129 2346
2347 # it's a bug to call this from the main context
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2132 2350
2133 cf::sync_job { $map->load }; 2351 $map->load;
2134} 2352}
2135 2353
2136our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2138 2356
2139sub find_async { 2357sub find_async {
2140 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2141 2359
2142 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2143 2361
2144 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2146 } 2364 }
2147 2365
2148 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2149 2367
2150 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2164 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2165 2383
2166 () 2384 ()
2167} 2385}
2168 2386
2387# common code, used by both ->save and ->swapout
2169sub save { 2388sub _save {
2170 my ($self) = @_; 2389 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2390
2174 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2175 2392
2176 return unless $self->dirty; 2393 return unless $self->dirty;
2177 2394
… …
2197 } else { 2414 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2415 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2416 }
2200} 2417}
2201 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2202sub swap_out { 2427sub swap_out {
2203 my ($self) = @_; 2428 my ($self) = @_;
2204 2429
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2210 return if $self->players; 2434 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2435
2436 # first deactivate the map and "unlink" it from the core
2437 $self->deactivate;
2438 $_->clear_links_to ($self) for values %cf::MAP;
2439 $self->state (cf::MAP_SWAPPED);
2440
2441 # then atomically save
2442 $self->_save;
2443
2444 # then free the map
2445 $self->clear;
2446}
2447
2448sub reset_at {
2449 my ($self) = @_;
2450
2451 # TODO: safety, remove and allow resettable per-player maps
2212 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2213 2453
2454 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2455 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2456
2457 $time + $to
2458}
2459
2460sub should_reset {
2461 my ($self) = @_;
2462
2463 $self->reset_at <= $cf::RUNTIME
2464}
2465
2466sub reset {
2467 my ($self) = @_;
2468
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
2471 return if $self->players;
2472
2473 cf::trace "resetting map ", $self->path, "\n";
2474
2214 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2476
2477 # need to save uniques path
2478 unless ($self->{deny_save}) {
2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2480
2481 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2482 if $uniq;
2483 }
2484
2485 delete $cf::MAP{$self->path};
2215 2486
2216 $self->deactivate; 2487 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2489 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2490
2264 $self->unlink_save; 2491 $self->unlink_save;
2265 $self->destroy; 2492 $self->destroy;
2266} 2493}
2267 2494
… …
2275 2502
2276 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2277 2504
2278 $self->unlink_save; 2505 $self->unlink_save;
2279 2506
2280 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2512
… …
2515 2742
2516Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2517 2744
2518The player should be reasonably safe there for short amounts of time (e.g. 2745The player should be reasonably safe there for short amounts of time (e.g.
2519for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2746for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link 2747though, as the player cannot control the character while it is on the link
2521map. 2748map.
2522 2749
2523Will never block. 2750Will never block.
2524 2751
2525=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
… …
2546sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2547 my ($self) = @_; 2774 my ($self) = @_;
2548 2775
2549 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2550 2777
2778 ++$self->{_link_recursion};
2779
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2781
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2555 2784
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2786}
2558 2787
2559sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2561 2790
… …
2581 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2582 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2583 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2584 2813
2585 $map->load; 2814 $map->load;
2586 $map->load_neighbours;
2587 2815
2588 return unless $self->contr->active; 2816 return unless $self->contr->active;
2589 2817
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2592 2820 # entering was successful
2821 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2823 $self->activate_recursive;
2595} 2824 }
2596 2825
2826}
2827
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2829
2599Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2602the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
… …
2609 2840
2610our $GOTOGEN; 2841our $GOTOGEN;
2611 2842
2612sub cf::object::player::goto { 2843sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2614 2851
2615 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2854
2618 $self->enter_link; 2855 $self->enter_link;
… …
2638 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2639 } 2876 }
2640 } 2877 }
2641 2878
2642 my $map = eval { 2879 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2644 2881
2645 if ($map) { 2882 if ($map) {
2646 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2885 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2887 }
2651 2888
2652 $map 2889 $map
… …
2660 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2663 } 2900 }
2664 2901
2665 $done->() if $done; 2902 $done->($self) if $done;
2666 })->prio (1); 2903 })->prio (1);
2667} 2904}
2668 2905
2669=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2670 2907
… …
2738 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2739 2976
2740 unless (eval { 2977 unless (eval {
2741 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2742 2979
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2752 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2754 3006
2755 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2756 3008
2757 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
2763 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2767 3019
2768 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 3021 $self->leave_link;
2770 } 3022 }
2771 })->prio (1); 3023 })->prio (1);
2772} 3024}
2773 3025
… …
2785sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2786 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2787 3039
2788 utf8::encode $text; 3040 utf8::encode $text;
2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3041 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3042}
3043
3044=item $client->send_big_packet ($pkt)
3045
3046Like C<send_packet>, but tries to compress large packets, and fragments
3047them as required.
3048
3049=cut
3050
3051our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3052
3053sub cf::client::send_big_packet {
3054 my ($self, $pkt) = @_;
3055
3056 # try lzf for large packets
3057 $pkt = "lzf " . Compress::LZF::compress $pkt
3058 if 1024 <= length $pkt and $self->{can_lzf};
3059
3060 # split very large packets
3061 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3062 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3063 $pkt = "frag";
3064 }
3065
3066 $self->send_packet ($pkt);
2790} 3067}
2791 3068
2792=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2793 3070
2794Send a drawinfo or msg packet to the client, formatting the msg for the 3071Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2946 my $pkt = "msg " 3223 my $pkt = "msg "
2947 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2949 ); 3226 );
2950 3227
2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2954
2955 # split very large packets
2956 if (8192 < length $pkt and $self->{can_lzf}) {
2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2958 $pkt = "frag";
2959 }
2960
2961 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2962} 3229}
2963 3230
2964=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2965 3232
2966Sends an ext event to the client. 3233Sends an ext event to the client.
… …
2969 3236
2970sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2971 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2972 3239
2973 if ($self->extcmd == 2) { 3240 if ($self->extcmd == 2) {
2974 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2975 } elsif ($self->extcmd == 1) { # TODO: remove 3242 } elsif ($self->extcmd == 1) { # TODO: remove
2976 push @msg, msgtype => "event_$type"; 3243 push @msg, msgtype => "event_$type";
2977 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3244 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2978 } 3245 }
2979} 3246}
2980 3247
2981=item $client->ext_reply ($msgid, @msg) 3248=item $client->ext_reply ($msgid, @msg)
2982 3249
… …
2985=cut 3252=cut
2986 3253
2987sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
2988 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
2989 3256
2990 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
2991 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2992 } elsif ($self->extcmd == 1) {
2993 #TODO: version 1, remove
2994 unshift @msg, msgtype => "reply", msgid => $id;
2995 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2996 }
2997} 3260}
2998 3261
2999=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3000 3263
3001Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
… …
3056 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3057 3320
3058 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3059 3322
3060 if (ref $msg) { 3323 if (ref $msg) {
3061 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3062 "ARRAY" eq ref $msg
3063 ? @$msg
3064 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3065 3325
3066 my @reply; 3326 my @reply;
3067 3327
3068 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3069 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
… …
3071 3331
3072 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
3073 if $reply; 3333 if $reply;
3074 3334
3075 } else { 3335 } else {
3076 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3077 } 3337 }
3078 3338
3079 cf::override; 3339 cf::override;
3080 }, 3340 },
3081); 3341);
… …
3101 3361
3102 $coro 3362 $coro
3103} 3363}
3104 3364
3105cf::client->attach ( 3365cf::client->attach (
3106 on_destroy => sub { 3366 on_client_destroy => sub {
3107 my ($ns) = @_; 3367 my ($ns) = @_;
3108 3368
3109 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3369 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3110 }, 3370 },
3111); 3371);
… …
3127our $safe_hole = new Safe::Hole; 3387our $safe_hole = new Safe::Hole;
3128 3388
3129$SIG{FPE} = 'IGNORE'; 3389$SIG{FPE} = 'IGNORE';
3130 3390
3131$safe->permit_only (Opcode::opset qw( 3391$safe->permit_only (Opcode::opset qw(
3132 :base_core :base_mem :base_orig :base_math 3392 :base_core :base_mem :base_orig :base_math :base_loop
3133 grepstart grepwhile mapstart mapwhile 3393 grepstart grepwhile mapstart mapwhile
3134 sort time 3394 sort time
3135)); 3395));
3136 3396
3137# here we export the classes and methods available to script code 3397# here we export the classes and methods available to script code
… …
3162 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3163 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3164 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3165 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3166) { 3426) {
3167 no strict 'refs';
3168 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3170 for @funs; 3429 for @funs;
3171} 3430}
3172 3431
… …
3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3448 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3190 $qcode =~ s/\n/\\n/g; 3449 $qcode =~ s/\n/\\n/g;
3191 3450
3192 %vars = (_dummy => 0) unless %vars; 3451 %vars = (_dummy => 0) unless %vars;
3193 3452
3453 my @res;
3194 local $_; 3454 local $_;
3195 local @safe::cf::_safe_eval_args = values %vars;
3196 3455
3197 my $eval = 3456 my $eval =
3198 "do {\n" 3457 "do {\n"
3199 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3458 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3200 . "#line 0 \"{$qcode}\"\n" 3459 . "#line 0 \"{$qcode}\"\n"
3201 . $code 3460 . $code
3202 . "\n}" 3461 . "\n}"
3203 ; 3462 ;
3204 3463
3464 if ($CFG{safe_eval}) {
3205 sub_generation_inc; 3465 sub_generation_inc;
3466 local @safe::cf::_safe_eval_args = values %vars;
3206 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3467 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3207 sub_generation_inc; 3468 sub_generation_inc;
3469 } else {
3470 local @cf::_safe_eval_args = values %vars;
3471 @res = wantarray ? eval eval : scalar eval $eval;
3472 }
3208 3473
3209 if ($@) { 3474 if ($@) {
3210 warn "$@"; 3475 warn "$@",
3211 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3212 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3213 } 3478 }
3214 3479
3215 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3216} 3481}
3217 3482
… …
3231=cut 3496=cut
3232 3497
3233sub register_script_function { 3498sub register_script_function {
3234 my ($fun, $cb) = @_; 3499 my ($fun, $cb) = @_;
3235 3500
3236 no strict 'refs'; 3501 $fun = "safe::$fun" if $CFG{safe_eval};
3237 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3502 *$fun = $safe_hole->wrap ($cb);
3238} 3503}
3239 3504
3240=back 3505=back
3241 3506
3242=cut 3507=cut
3243 3508
3244############################################################################# 3509#############################################################################
3245# the server's init and main functions 3510# the server's init and main functions
3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3514# internal api, not fianlised
3515sub add_face {
3516 my ($name, $type, $data) = @_;
3517
3518 my $idx = cf::face::find $name;
3519
3520 if ($idx) {
3521 delete $FACEHASH{cf::face::get_chksum $idx};
3522 } else {
3523 $idx = cf::face::alloc $name;
3524 }
3525
3526 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3527
3528 cf::face::set_type $idx, $type;
3529 cf::face::set_data $idx, 0, $data, $hash;
3530 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3531 $FACEHASH{$hash} = $idx;#d#
3532
3533 $idx
3534}
3246 3535
3247sub load_facedata($) { 3536sub load_facedata($) {
3248 my ($path) = @_; 3537 my ($path) = @_;
3249 3538
3250 # HACK to clear player env face cache, we need some signal framework 3539 # HACK to clear player env face cache, we need some signal framework
3251 # for this (global event?) 3540 # for this (global event?)
3252 %ext::player_env::MUSIC_FACE_CACHE = (); 3541 %ext::player_env::MUSIC_FACE_CACHE = ();
3253 3542
3254 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3543 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3255 3544
3256 warn "loading facedata from $path\n"; 3545 trace "loading facedata from $path\n";
3257 3546
3258 my $facedata; 3547 my $facedata = decode_storable load_file $path;
3259 0 < aio_load $path, $facedata
3260 or die "$path: $!";
3261
3262 $facedata = Coro::Storable::thaw $facedata;
3263 3548
3264 $facedata->{version} == 2 3549 $facedata->{version} == 2
3265 or cf::cleanup "$path: version mismatch, cannot proceed."; 3550 or cf::cleanup "$path: version mismatch, cannot proceed.";
3266 3551
3267 # patch in the exptable
3268 $facedata->{resource}{"res/exp_table"} = {
3269 type => FT_RSRC,
3270 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3271 };
3272 cf::cede_to_tick; 3552 cf::cede_to_tick;
3273 3553
3274 { 3554 {
3275 my $faces = $facedata->{faceinfo}; 3555 my $faces = $facedata->{faceinfo};
3276 3556
3277 while (my ($face, $info) = each %$faces) { 3557 for my $face (sort keys %$faces) {
3558 my $info = $faces->{$face};
3278 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3559 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3279 3560
3280 cf::face::set_visibility $idx, $info->{visibility}; 3561 cf::face::set_visibility $idx, $info->{visibility};
3281 cf::face::set_magicmap $idx, $info->{magicmap}; 3562 cf::face::set_magicmap $idx, $info->{magicmap};
3282 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3563 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3283 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3564 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3565 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3566 $FACEHASH{$info->{hash64}} = $idx;#d#
3284 3567
3285 cf::cede_to_tick; 3568 cf::cede_to_tick;
3286 } 3569 }
3287 3570
3288 while (my ($face, $info) = each %$faces) { 3571 while (my ($face, $info) = each %$faces) {
… …
3293 3576
3294 if (my $smooth = cf::face::find $info->{smooth}) { 3577 if (my $smooth = cf::face::find $info->{smooth}) {
3295 cf::face::set_smooth $idx, $smooth; 3578 cf::face::set_smooth $idx, $smooth;
3296 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3579 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3297 } else { 3580 } else {
3298 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3581 error "smooth face '$info->{smooth}' not found for face '$face'";
3299 } 3582 }
3300 3583
3301 cf::cede_to_tick; 3584 cf::cede_to_tick;
3302 } 3585 }
3303 } 3586 }
… …
3312 3595
3313 cf::anim::invalidate_all; # d'oh 3596 cf::anim::invalidate_all; # d'oh
3314 } 3597 }
3315 3598
3316 { 3599 {
3317 # TODO: for gcfclient pleasure, we should give resources
3318 # that gcfclient doesn't grok a >10000 face index.
3319 my $res = $facedata->{resource}; 3600 my $res = $facedata->{resource};
3320 3601
3321 while (my ($name, $info) = each %$res) { 3602 while (my ($name, $info) = each %$res) {
3322 if (defined $info->{type}) { 3603 if (defined (my $type = $info->{type})) {
3604 # TODO: different hash - must free and use new index, or cache ixface data queue
3323 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3605 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3324 my $data;
3325 3606
3326 if ($info->{type} & 1) {
3327 # prepend meta info
3328
3329 my $meta = $enc->encode ({
3330 name => $name,
3331 %{ $info->{meta} || {} },
3332 });
3333
3334 $data = pack "(w/a*)*", $meta, $info->{data};
3335 } else {
3336 $data = $info->{data};
3337 }
3338
3339 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3340 cf::face::set_type $idx, $info->{type}; 3607 cf::face::set_type $idx, $type;
3608 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3609 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3610 $FACEHASH{$info->{hash}} = $idx;#d#
3341 } else { 3611 } else {
3342 $RESOURCE{$name} = $info; 3612# $RESOURCE{$name} = $info; # unused
3343 } 3613 }
3344 3614
3345 cf::cede_to_tick; 3615 cf::cede_to_tick;
3346 } 3616 }
3347 } 3617 }
3348 3618
3349 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3619 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3350 3620
3351 1 3621 1
3352} 3622}
3353
3354cf::global->attach (on_resource_update => sub {
3355 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3356 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3357
3358 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3359 my $sound = $soundconf->{compat}[$_]
3360 or next;
3361
3362 my $face = cf::face::find "sound/$sound->[1]";
3363 cf::sound::set $sound->[0] => $face;
3364 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3365 }
3366
3367 while (my ($k, $v) = each %{$soundconf->{event}}) {
3368 my $face = cf::face::find "sound/$v";
3369 cf::sound::set $k => $face;
3370 }
3371 }
3372});
3373 3623
3374register_exticmd fx_want => sub { 3624register_exticmd fx_want => sub {
3375 my ($ns, $want) = @_; 3625 my ($ns, $want) = @_;
3376 3626
3377 while (my ($k, $v) = each %$want) { 3627 while (my ($k, $v) = each %$want) {
… …
3385 my $status = load_resource_file_ $_[0]; 3635 my $status = load_resource_file_ $_[0];
3386 get_slot 0.1, 100; 3636 get_slot 0.1, 100;
3387 cf::arch::commit_load; 3637 cf::arch::commit_load;
3388 3638
3389 $status 3639 $status
3640}
3641
3642sub reload_exp_table {
3643 _reload_exp_table;
3644
3645 add_face "res/exp_table" => FT_RSRC,
3646 JSON::XS->new->utf8->canonical->encode (
3647 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3648 );
3649}
3650
3651sub reload_materials {
3652 _reload_materials;
3390} 3653}
3391 3654
3392sub reload_regions { 3655sub reload_regions {
3393 # HACK to clear player env face cache, we need some signal framework 3656 # HACK to clear player env face cache, we need some signal framework
3394 # for this (global event?) 3657 # for this (global event?)
… …
3409} 3672}
3410 3673
3411sub reload_archetypes { 3674sub reload_archetypes {
3412 load_resource_file "$DATADIR/archetypes" 3675 load_resource_file "$DATADIR/archetypes"
3413 or die "unable to load archetypes\n"; 3676 or die "unable to load archetypes\n";
3677
3678 add_face "res/skill_info" => FT_RSRC,
3679 JSON::XS->new->utf8->canonical->encode (
3680 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3681 );
3682 add_face "res/spell_paths" => FT_RSRC,
3683 JSON::XS->new->utf8->canonical->encode (
3684 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3685 );
3414} 3686}
3415 3687
3416sub reload_treasures { 3688sub reload_treasures {
3417 load_resource_file "$DATADIR/treasures" 3689 load_resource_file "$DATADIR/treasures"
3418 or die "unable to load treasurelists\n"; 3690 or die "unable to load treasurelists\n";
3419} 3691}
3420 3692
3693sub reload_sound {
3694 trace "loading sound config from $DATADIR/sound\n";
3695
3696 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3697
3698 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3699 my $sound = $soundconf->{compat}[$_]
3700 or next;
3701
3702 my $face = cf::face::find "sound/$sound->[1]";
3703 cf::sound::set $sound->[0] => $face;
3704 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3705 }
3706
3707 while (my ($k, $v) = each %{$soundconf->{event}}) {
3708 my $face = cf::face::find "sound/$v";
3709 cf::sound::set $k => $face;
3710 }
3711}
3712
3421sub reload_resources { 3713sub reload_resources {
3422 warn "reloading resource files...\n"; 3714 trace "reloading resource files...\n";
3423 3715
3716 reload_materials;
3424 reload_facedata; 3717 reload_facedata;
3718 reload_exp_table;
3719 reload_sound;
3425 reload_archetypes; 3720 reload_archetypes;
3426 reload_regions; 3721 reload_regions;
3427 reload_treasures; 3722 reload_treasures;
3428 3723
3429 warn "finished reloading resource files\n"; 3724 trace "finished reloading resource files\n";
3430} 3725}
3431 3726
3432sub reload_config { 3727sub reload_config {
3433 warn "reloading config file...\n"; 3728 trace "reloading config file...\n";
3434 3729
3435 open my $fh, "<:utf8", "$CONFDIR/config" 3730 my $config = load_file "$CONFDIR/config";
3436 or return; 3731 utf8::decode $config;
3732 *CFG = decode_yaml $config;
3437 3733
3438 local $/;
3439 *CFG = YAML::XS::Load scalar <$fh>;
3440
3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3734 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3442 3735
3443 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3736 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3737 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3445 3738
3446 if (exists $CFG{mlockall}) { 3739 if (exists $CFG{mlockall}) {
… …
3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3741 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3449 and die "WARNING: m(un)lockall failed: $!\n"; 3742 and die "WARNING: m(un)lockall failed: $!\n";
3450 }; 3743 };
3451 warn $@ if $@; 3744 warn $@ if $@;
3452 } 3745 }
3453
3454 warn "finished reloading resource files\n";
3455} 3746}
3456 3747
3457sub pidfile() { 3748sub pidfile() {
3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3749 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3459 or die "$PIDFILE: $!"; 3750 or die "$PIDFILE: $!";
… …
3472 seek $fh, 0, 0; 3763 seek $fh, 0, 0;
3473 print $fh $$; 3764 print $fh $$;
3474} 3765}
3475 3766
3476sub main_loop { 3767sub main_loop {
3477 warn "EV::loop starting\n"; 3768 trace "EV::loop starting\n";
3478 if (1) { 3769 if (1) {
3479 EV::loop; 3770 EV::loop;
3480 } 3771 }
3481 warn "EV::loop returned\n"; 3772 trace "EV::loop returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP; 3773 goto &main_loop unless $REALLY_UNLOOP;
3483} 3774}
3484 3775
3485sub main { 3776sub main {
3486 cf::init_globals; # initialise logging 3777 cf::init_globals; # initialise logging
3487 3778
3488 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3779 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3489 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3780 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3490 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3781 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3491 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3782 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3492 3783
3493 cf::init_experience;
3494 cf::init_anim;
3495 cf::init_attackmess;
3496 cf::init_dynamic;
3497
3498 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3784 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3499 3785
3500 # we must not ever block the main coroutine 3786 # we must not ever block the main coroutine
3501 local $Coro::idle = sub { 3787 $Coro::idle = sub {
3502 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3788 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3503 (async { 3789 (async {
3504 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3790 $Coro::current->{desc} = "IDLE BUG HANDLER";
3505 EV::loop EV::LOOP_ONESHOT; 3791 EV::loop EV::LOOP_ONESHOT;
3506 })->prio (Coro::PRIO_MAX); 3792 })->prio (Coro::PRIO_MAX);
3507 }; 3793 };
3508 3794
3509 evthread_start IO::AIO::poll_fileno; 3795 evthread_start IO::AIO::poll_fileno;
3510 3796
3511 cf::sync_job { 3797 cf::sync_job {
3798 cf::incloader::init ();
3799
3800 cf::init_anim;
3801 cf::init_attackmess;
3802 cf::init_dynamic;
3803
3804 cf::load_settings;
3805
3512 reload_resources; 3806 reload_resources;
3513 reload_config; 3807 reload_config;
3514 db_init; 3808 db_init;
3515 3809
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid; 3810 cf::init_uuid;
3519 cf::init_signals; 3811 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills; 3812 cf::init_skills;
3522 3813
3523 cf::init_beforeplay; 3814 cf::init_beforeplay;
3524 3815
3525 atomic; 3816 atomic;
… …
3530 3821
3531 # no (long-running) fork's whatsoever before this point(!) 3822 # no (long-running) fork's whatsoever before this point(!)
3532 use POSIX (); 3823 use POSIX ();
3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3824 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3534 3825
3535 (pop @POST_INIT)->(0) while @POST_INIT; 3826 cf::_post_init 0;
3536 }; 3827 };
3537 3828
3829 cf::object::thawer::errors_are_fatal 0;
3830 info "parse errors in files are no longer fatal from this point on.\n";
3831
3832 AE::postpone {
3833 undef &main; # free gobs of memory :)
3834 };
3835
3538 main_loop; 3836 goto &main_loop;
3539} 3837}
3540 3838
3541############################################################################# 3839#############################################################################
3542# initialisation and cleanup 3840# initialisation and cleanup
3543 3841
3544# install some emergency cleanup handlers 3842# install some emergency cleanup handlers
3545BEGIN { 3843BEGIN {
3546 our %SIGWATCHER = (); 3844 our %SIGWATCHER = ();
3547 for my $signal (qw(INT HUP TERM)) { 3845 for my $signal (qw(INT HUP TERM)) {
3548 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3846 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3549 cf::cleanup "SIG$signal"; 3847 cf::cleanup "SIG$signal";
3550 }; 3848 };
3551 } 3849 }
3552} 3850}
3553 3851
3554sub write_runtime_sync { 3852sub write_runtime_sync {
3853 my $t0 = AE::time;
3854
3555 # first touch the runtime file to show we are still running: 3855 # first touch the runtime file to show we are still running:
3556 # the fsync below can take a very very long time. 3856 # the fsync below can take a very very long time.
3557 3857
3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3858 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3559 3859
3560 my $guard = cf::lock_acquire "write_runtime"; 3860 my $guard = cf::lock_acquire "write_runtime";
3561 3861
3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3862 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3563 or return; 3863 or return;
3564 3864
3565 my $value = $cf::RUNTIME + 90 + 10; 3865 my $value = $cf::RUNTIME + 90 + 10;
3566 # 10 is the runtime save interval, for a monotonic clock 3866 # 10 is the runtime save interval, for a monotonic clock
3567 # 60 allows for the watchdog to kill the server. 3867 # 60 allows for the watchdog to kill the server.
… …
3580 or return; 3880 or return;
3581 3881
3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3882 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3583 and return; 3883 and return;
3584 3884
3585 warn "runtime file written.\n"; 3885 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3586 3886
3587 1 3887 1
3588} 3888}
3589 3889
3590our $uuid_lock; 3890our $uuid_lock;
… …
3602 or return; 3902 or return;
3603 3903
3604 my $value = uuid_seq uuid_cur; 3904 my $value = uuid_seq uuid_cur;
3605 3905
3606 unless ($value) { 3906 unless ($value) {
3607 warn "cowardly refusing to write zero uuid value!\n"; 3907 info "cowardly refusing to write zero uuid value!\n";
3608 return; 3908 return;
3609 } 3909 }
3610 3910
3611 my $value = uuid_str $value + $uuid_skip; 3911 my $value = uuid_str $value + $uuid_skip;
3612 $uuid_skip = 0; 3912 $uuid_skip = 0;
… …
3622 or return; 3922 or return;
3623 3923
3624 aio_rename "$uuid~", $uuid 3924 aio_rename "$uuid~", $uuid
3625 and return; 3925 and return;
3626 3926
3627 warn "uuid file written ($value).\n"; 3927 trace "uuid file written ($value).\n";
3628 3928
3629 1 3929 1
3630 3930
3631} 3931}
3632 3932
… …
3638} 3938}
3639 3939
3640sub emergency_save() { 3940sub emergency_save() {
3641 my $freeze_guard = cf::freeze_mainloop; 3941 my $freeze_guard = cf::freeze_mainloop;
3642 3942
3643 warn "emergency_perl_save: enter\n"; 3943 info "emergency_perl_save: enter\n";
3944
3945 # this is a trade-off: we want to be very quick here, so
3946 # save all maps without fsync, and later call a global sync
3947 # (which in turn might be very very slow)
3948 local $USE_FSYNC = 0;
3644 3949
3645 cf::sync_job { 3950 cf::sync_job {
3646 # this is a trade-off: we want to be very quick here, so 3951 cf::write_runtime_sync; # external watchdog should not bark
3647 # save all maps without fsync, and later call a global sync
3648 # (which in turn might be very very slow)
3649 local $USE_FSYNC = 0;
3650 3952
3651 # use a peculiar iteration method to avoid tripping on perl 3953 # use a peculiar iteration method to avoid tripping on perl
3652 # refcount bugs in for. also avoids problems with players 3954 # refcount bugs in for. also avoids problems with players
3653 # and maps saved/destroyed asynchronously. 3955 # and maps saved/destroyed asynchronously.
3654 warn "emergency_perl_save: begin player save\n"; 3956 info "emergency_perl_save: begin player save\n";
3655 for my $login (keys %cf::PLAYER) { 3957 for my $login (keys %cf::PLAYER) {
3656 my $pl = $cf::PLAYER{$login} or next; 3958 my $pl = $cf::PLAYER{$login} or next;
3657 $pl->valid or next; 3959 $pl->valid or next;
3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3960 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3659 $pl->save; 3961 $pl->save;
3660 } 3962 }
3661 warn "emergency_perl_save: end player save\n"; 3963 info "emergency_perl_save: end player save\n";
3662 3964
3965 cf::write_runtime_sync; # external watchdog should not bark
3966
3663 warn "emergency_perl_save: begin map save\n"; 3967 info "emergency_perl_save: begin map save\n";
3664 for my $path (keys %cf::MAP) { 3968 for my $path (keys %cf::MAP) {
3665 my $map = $cf::MAP{$path} or next; 3969 my $map = $cf::MAP{$path} or next;
3666 $map->valid or next; 3970 $map->valid or next;
3667 $map->save; 3971 $map->save;
3668 } 3972 }
3669 warn "emergency_perl_save: end map save\n"; 3973 info "emergency_perl_save: end map save\n";
3670 3974
3975 cf::write_runtime_sync; # external watchdog should not bark
3976
3671 warn "emergency_perl_save: begin database checkpoint\n"; 3977 info "emergency_perl_save: begin database checkpoint\n";
3672 BDB::db_env_txn_checkpoint $DB_ENV; 3978 BDB::db_env_txn_checkpoint $DB_ENV;
3673 warn "emergency_perl_save: end database checkpoint\n"; 3979 info "emergency_perl_save: end database checkpoint\n";
3674 3980
3675 warn "emergency_perl_save: begin write uuid\n"; 3981 info "emergency_perl_save: begin write uuid\n";
3676 write_uuid_sync 1; 3982 write_uuid_sync 1;
3677 warn "emergency_perl_save: end write uuid\n"; 3983 info "emergency_perl_save: end write uuid\n";
3984
3985 cf::write_runtime_sync; # external watchdog should not bark
3986
3987 trace "emergency_perl_save: syncing database to disk";
3988 BDB::db_env_txn_checkpoint $DB_ENV;
3989
3990 info "emergency_perl_save: starting sync\n";
3991 IO::AIO::aio_sync sub {
3992 info "emergency_perl_save: finished sync\n";
3993 };
3994
3995 cf::write_runtime_sync; # external watchdog should not bark
3996
3997 trace "emergency_perl_save: flushing outstanding aio requests";
3998 while (IO::AIO::nreqs || BDB::nreqs) {
3999 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4000 }
4001
4002 cf::write_runtime_sync; # external watchdog should not bark
3678 }; 4003 };
3679 4004
3680 warn "emergency_perl_save: starting sync()\n";
3681 IO::AIO::aio_sync sub {
3682 warn "emergency_perl_save: finished sync()\n";
3683 };
3684
3685 warn "emergency_perl_save: leave\n"; 4005 info "emergency_perl_save: leave\n";
3686} 4006}
3687 4007
3688sub post_cleanup { 4008sub post_cleanup {
3689 my ($make_core) = @_; 4009 my ($make_core) = @_;
3690 4010
4011 IO::AIO::flush;
4012
3691 warn Carp::longmess "post_cleanup backtrace" 4013 error Carp::longmess "post_cleanup backtrace"
3692 if $make_core; 4014 if $make_core;
3693 4015
3694 my $fh = pidfile; 4016 my $fh = pidfile;
3695 unlink $PIDFILE if <$fh> == $$; 4017 unlink $PIDFILE if <$fh> == $$;
3696} 4018}
… …
3716 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4038 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3717 for my $name (keys %$leaf_symtab) { 4039 for my $name (keys %$leaf_symtab) {
3718 _gv_clear *{"$pkg$name"}; 4040 _gv_clear *{"$pkg$name"};
3719# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4041# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3720 } 4042 }
3721 warn "cleared package $pkg\n";#d#
3722} 4043}
3723 4044
3724sub do_reload_perl() { 4045sub do_reload_perl() {
3725 # can/must only be called in main 4046 # can/must only be called in main
3726 if ($Coro::current != $Coro::main) { 4047 unless (in_main) {
3727 warn "can only reload from main coroutine"; 4048 error "can only reload from main coroutine";
3728 return; 4049 return;
3729 } 4050 }
3730 4051
3731 return if $RELOAD++; 4052 return if $RELOAD++;
3732 4053
3733 my $t1 = EV::time; 4054 my $t1 = AE::time;
3734 4055
3735 while ($RELOAD) { 4056 while ($RELOAD) {
3736 warn "reloading..."; 4057 cf::get_slot 0.1, -1, "reload_perl";
4058 info "perl_reload: reloading...";
3737 4059
3738 warn "entering sync_job"; 4060 trace "perl_reload: entering sync_job";
3739 4061
3740 cf::sync_job { 4062 cf::sync_job {
3741 cf::write_runtime_sync; # external watchdog should not bark
3742 cf::emergency_save; 4063 #cf::emergency_save;
3743 cf::write_runtime_sync; # external watchdog should not bark
3744 4064
3745 warn "syncing database to disk";
3746 BDB::db_env_txn_checkpoint $DB_ENV;
3747
3748 # if anything goes wrong in here, we should simply crash as we already saved
3749
3750 warn "flushing outstanding aio requests";
3751 while (IO::AIO::nreqs || BDB::nreqs) {
3752 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3753 }
3754
3755 warn "cancelling all extension coros"; 4065 trace "perl_reload: cancelling all extension coros";
3756 $_->cancel for values %EXT_CORO; 4066 $_->cancel for values %EXT_CORO;
3757 %EXT_CORO = (); 4067 %EXT_CORO = ();
3758 4068
3759 warn "removing commands"; 4069 trace "perl_reload: removing commands";
3760 %COMMAND = (); 4070 %COMMAND = ();
3761 4071
3762 warn "removing ext/exti commands"; 4072 trace "perl_reload: removing ext/exti commands";
3763 %EXTCMD = (); 4073 %EXTCMD = ();
3764 %EXTICMD = (); 4074 %EXTICMD = ();
3765 4075
3766 warn "unloading/nuking all extensions"; 4076 trace "perl_reload: unloading/nuking all extensions";
3767 for my $pkg (@EXTS) { 4077 for my $pkg (@EXTS) {
3768 warn "... unloading $pkg"; 4078 trace "... unloading $pkg";
3769 4079
3770 if (my $cb = $pkg->can ("unload")) { 4080 if (my $cb = $pkg->can ("unload")) {
3771 eval { 4081 eval {
3772 $cb->($pkg); 4082 $cb->($pkg);
3773 1 4083 1
3774 } or warn "$pkg unloaded, but with errors: $@"; 4084 } or error "$pkg unloaded, but with errors: $@";
3775 } 4085 }
3776 4086
3777 warn "... clearing $pkg"; 4087 trace "... clearing $pkg";
3778 clear_package $pkg; 4088 clear_package $pkg;
3779 } 4089 }
3780 4090
3781 warn "unloading all perl modules loaded from $LIBDIR"; 4091 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3782 while (my ($k, $v) = each %INC) { 4092 while (my ($k, $v) = each %INC) {
3783 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4093 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3784 4094
3785 warn "... unloading $k"; 4095 trace "... unloading $k";
3786 delete $INC{$k}; 4096 delete $INC{$k};
3787 4097
3788 $k =~ s/\.pm$//; 4098 $k =~ s/\.pm$//;
3789 $k =~ s/\//::/g; 4099 $k =~ s/\//::/g;
3790 4100
… …
3793 } 4103 }
3794 4104
3795 clear_package $k; 4105 clear_package $k;
3796 } 4106 }
3797 4107
3798 warn "getting rid of safe::, as good as possible"; 4108 trace "perl_reload: getting rid of safe::, as good as possible";
3799 clear_package "safe::$_" 4109 clear_package "safe::$_"
3800 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4110 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3801 4111
3802 warn "unloading cf.pm \"a bit\""; 4112 trace "perl_reload: unloading cf.pm \"a bit\"";
3803 delete $INC{"cf.pm"}; 4113 delete $INC{"cf.pm"};
3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4114 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3805 4115
3806 # don't, removes xs symbols, too, 4116 # don't, removes xs symbols, too,
3807 # and global variables created in xs 4117 # and global variables created in xs
3808 #clear_package __PACKAGE__; 4118 #clear_package __PACKAGE__;
3809 4119
3810 warn "unload completed, starting to reload now"; 4120 info "perl_reload: unload completed, starting to reload now";
3811 4121
3812 warn "reloading cf.pm"; 4122 trace "perl_reload: reloading cf.pm";
3813 require cf; 4123 require cf;
3814 cf::_connect_to_perl_1; 4124 cf::_connect_to_perl_1;
3815 4125
3816 warn "loading config and database again"; 4126 trace "perl_reload: loading config and database again";
3817 cf::reload_config; 4127 cf::reload_config;
3818 4128
3819 warn "loading extensions"; 4129 trace "perl_reload: loading extensions";
3820 cf::load_extensions; 4130 cf::load_extensions;
3821 4131
3822 if ($REATTACH_ON_RELOAD) { 4132 if ($REATTACH_ON_RELOAD) {
3823 warn "reattaching attachments to objects/players"; 4133 trace "perl_reload: reattaching attachments to objects/players";
3824 _global_reattach; # objects, sockets 4134 _global_reattach; # objects, sockets
3825 warn "reattaching attachments to maps"; 4135 trace "perl_reload: reattaching attachments to maps";
3826 reattach $_ for values %MAP; 4136 reattach $_ for values %MAP;
3827 warn "reattaching attachments to players"; 4137 trace "perl_reload: reattaching attachments to players";
3828 reattach $_ for values %PLAYER; 4138 reattach $_ for values %PLAYER;
3829 } 4139 }
3830 4140
3831 warn "running post_init jobs"; 4141 cf::_post_init 1;
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3833 4142
3834 warn "leaving sync_job"; 4143 trace "perl_reload: leaving sync_job";
3835 4144
3836 1 4145 1
3837 } or do { 4146 } or do {
3838 warn $@; 4147 error $@;
3839 cf::cleanup "error while reloading, exiting."; 4148 cf::cleanup "perl_reload: error, exiting.";
3840 }; 4149 };
3841 4150
3842 warn "reloaded";
3843 --$RELOAD; 4151 --$RELOAD;
3844 } 4152 }
3845 4153
3846 $t1 = EV::time - $t1; 4154 $t1 = AE::time - $t1;
3847 warn "reload completed in ${t1}s\n"; 4155 info "perl_reload: completed in ${t1}s\n";
3848}; 4156};
3849 4157
3850our $RELOAD_WATCHER; # used only during reload 4158our $RELOAD_WATCHER; # used only during reload
3851 4159
3852sub reload_perl() { 4160sub reload_perl() {
… …
3854 # coro crashes during coro_state_free->destroy here. 4162 # coro crashes during coro_state_free->destroy here.
3855 4163
3856 $RELOAD_WATCHER ||= cf::async { 4164 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions; 4165 Coro::AIO::aio_wait cache_extensions;
3858 4166
3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4167 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3860 do_reload_perl; 4168 do_reload_perl;
3861 undef $RELOAD_WATCHER; 4169 undef $RELOAD_WATCHER;
3862 }; 4170 };
3863 }; 4171 };
3864} 4172}
… …
3873 reload_perl; 4181 reload_perl;
3874 }; 4182 };
3875 } 4183 }
3876}; 4184};
3877 4185
3878unshift @INC, $LIBDIR; 4186#############################################################################
3879 4187
3880my $bug_warning = 0; 4188my $bug_warning = 0;
3881 4189
3882our @WAIT_FOR_TICK;
3883our @WAIT_FOR_TICK_BEGIN;
3884
3885sub wait_for_tick { 4190sub wait_for_tick() {
3886 return if tick_inhibit || $Coro::current == $Coro::main; 4191 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3887 4192
3888 my $signal = new Coro::Signal; 4193 $WAIT_FOR_TICK->wait;
3889 push @WAIT_FOR_TICK, $signal;
3890 $signal->wait;
3891} 4194}
3892 4195
3893sub wait_for_tick_begin { 4196sub wait_for_tick_begin() {
3894 return if tick_inhibit || $Coro::current == $Coro::main; 4197 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3895 4198
3896 my $signal = new Coro::Signal; 4199 my $signal = new Coro::Signal;
3897 push @WAIT_FOR_TICK_BEGIN, $signal; 4200 push @WAIT_FOR_TICK_BEGIN, $signal;
3898 $signal->wait; 4201 $signal->wait;
3899} 4202}
… …
3903 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4206 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3904 unless ++$bug_warning > 10; 4207 unless ++$bug_warning > 10;
3905 return; 4208 return;
3906 } 4209 }
3907 4210
3908 cf::server_tick; # one server iteration 4211 cf::one_tick; # one server iteration
4212
4213 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3909 4214
3910 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4215 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3911 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4216 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3912 Coro::async_pool { 4217 Coro::async_pool {
3913 $Coro::current->{desc} = "runtime saver"; 4218 $Coro::current->{desc} = "runtime saver";
3914 write_runtime_sync 4219 write_runtime_sync
3915 or warn "ERROR: unable to write runtime file: $!"; 4220 or error "ERROR: unable to write runtime file: $!";
3916 }; 4221 };
3917 } 4222 }
3918 4223
3919 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4224 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3920 $sig->send; 4225 $sig->send;
3921 } 4226 }
3922 while (my $sig = shift @WAIT_FOR_TICK) { 4227 $WAIT_FOR_TICK->broadcast;
3923 $sig->send;
3924 }
3925 4228
3926 $LOAD = ($NOW - $TICK_START) / $TICK; 4229 $LOAD = ($NOW - $TICK_START) / $TICK;
3927 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4230 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3928 4231
3929 if (0) { 4232 if (0) {
3930 if ($NEXT_TICK) { 4233 if ($NEXT_TICK) {
3931 my $jitter = $TICK_START - $NEXT_TICK; 4234 my $jitter = $TICK_START - $NEXT_TICK;
3932 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4235 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3933 warn "jitter $JITTER\n";#d# 4236 debug "jitter $JITTER\n";#d#
3934 } 4237 }
3935 } 4238 }
3936} 4239}
3937 4240
3938{ 4241{
3939 # configure BDB 4242 # configure BDB
3940 4243
3941 BDB::min_parallel 8; 4244 BDB::min_parallel 16;
3942 BDB::max_poll_reqs $TICK * 0.1; 4245 BDB::max_poll_reqs $TICK * 0.1;
3943 $AnyEvent::BDB::WATCHER->priority (1); 4246 #$AnyEvent::BDB::WATCHER->priority (1);
3944 4247
3945 unless ($DB_ENV) { 4248 unless ($DB_ENV) {
3946 $DB_ENV = BDB::db_env_create; 4249 $DB_ENV = BDB::db_env_create;
3947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4250 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3948 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4251 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
3983 IO::AIO::min_parallel 8; 4286 IO::AIO::min_parallel 8;
3984 IO::AIO::max_poll_time $TICK * 0.1; 4287 IO::AIO::max_poll_time $TICK * 0.1;
3985 undef $AnyEvent::AIO::WATCHER; 4288 undef $AnyEvent::AIO::WATCHER;
3986} 4289}
3987 4290
3988my $_log_backtrace; 4291our $_log_backtrace;
4292our $_log_backtrace_last;
3989 4293
3990sub _log_backtrace { 4294sub _log_backtrace {
3991 my ($msg, @addr) = @_; 4295 my ($msg, @addr) = @_;
3992 4296
3993 $msg =~ s/\n//; 4297 $msg =~ s/\n$//;
3994 4298
4299 if ($_log_backtrace_last eq $msg) {
4300 LOG llevInfo, "[ABT] $msg\n";
4301 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3995 # limit the # of concurrent backtraces 4302 # limit the # of concurrent backtraces
3996 if ($_log_backtrace < 2) { 4303 } elsif ($_log_backtrace < 2) {
4304 $_log_backtrace_last = $msg;
3997 ++$_log_backtrace; 4305 ++$_log_backtrace;
3998 my $perl_bt = Carp::longmess $msg; 4306 my $perl_bt = Carp::longmess $msg;
3999 async { 4307 async {
4000 $Coro::current->{desc} = "abt $msg"; 4308 $Coro::current->{desc} = "abt $msg";
4001 4309
… …
4021 LOG llevInfo, "[ABT] $_\n" for @bt; 4329 LOG llevInfo, "[ABT] $_\n" for @bt;
4022 --$_log_backtrace; 4330 --$_log_backtrace;
4023 }; 4331 };
4024 } else { 4332 } else {
4025 LOG llevInfo, "[ABT] $msg\n"; 4333 LOG llevInfo, "[ABT] $msg\n";
4026 LOG llevInfo, "[ABT] [suppressed]\n"; 4334 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4027 } 4335 }
4028} 4336}
4029 4337
4030# load additional modules 4338# load additional modules
4031require "cf/$_.pm" for @EXTRA_MODULES; 4339require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines