ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.588 by root, Thu Nov 1 13:02:52 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
36
37use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes; 63use Time::HiRes;
61use Compress::LZF; 64use Compress::LZF;
62use Digest::MD5 (); 65use Digest::MD5 ();
63 66
76 79
77# strictly for debugging 80# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 82
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
81 86
82our %COMMAND = (); 87our %COMMAND = ();
83our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
84 89
85our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
92our @EVENT; 97our @EVENT;
93our @REFLECT; # set by XS 98our @REFLECT; # set by XS
94our %REFLECT; # set by us 99our %REFLECT; # set by us
95 100
96our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
97our $DATADIR = datadir; 103our $DATADIR = datadir;
98our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
99our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
100our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
101our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
102our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 116
110our %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;
111 124
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 127our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
117our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 133our $DB_ENV;
121 134
122our @EXTRA_MODULES = qw(pod mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 136
124our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
125 139
126our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
128our $NOW; 143our $NOW;
129 144
130our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
131our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
132our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
141 156
142our @POST_INIT; 157our @POST_INIT;
143 158
144our $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)
145our $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;
146 164
147binmode STDOUT; 165binmode STDOUT;
148binmode STDERR; 166binmode STDERR;
149 167
150# read virtual server time, if available 168# read virtual server time, if available
161 179
162our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
163 181
164sub cf::map::normalise; 182sub cf::map::normalise;
165 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
166############################################################################# 188#############################################################################
167 189
168%REFLECT = (); 190%REFLECT = ();
169for (@REFLECT) { 191for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 192 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 193 $REFLECT{$reflect->{class}} = $reflect;
172} 194}
173 195
174# this is decidedly evil 196# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 197$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 198
177############################################################################# 199#############################################################################
178 200
179=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
180 202
181=over 4 203=over 4
182 204
183=item $cf::UPTIME 205=item $cf::UPTIME
184 206
185The 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.
186 223
187=item $cf::RUNTIME 224=item $cf::RUNTIME
188 225
189The 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
190every server tick. 227every server tick.
196Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
197directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
198unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
199database environment. 236database environment.
200 237
201=item $cf::NOW
202
203The time of the last (current) server tick.
204
205=item $cf::TICK
206
207The interval between server ticks, in seconds.
208
209=item $cf::LOADAVG 238=item $cf::LOADAVG
210 239
211The 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
212(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
213objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
222from wherever your confdir points to. 251from wherever your confdir points to.
223 252
224=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
225 254
226These 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
227returns 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
228per 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.
229 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();
275
230=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
231 277
232This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call. 280that call.
235 281
236=item %cf::REFLECT 282=item %cf::REFLECT
237 283
241 287
242=back 288=back
243 289
244=cut 290=cut
245 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
246$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 299 my $msg = join "", @_;
248 300
249 $msg .= "\n" 301 $msg .= "\n"
250 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
251 303
252 $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;
253 305
254 LOG llevError, $msg; 306 LOG llevWarn, $msg;
255}; 307};
256 308
257$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
259 311
260 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
261 313
262 if ($Coro::current == $Coro::main) {#d# 314 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 316 return;#d#
265 }#d# 317 }#d#
266 318
267 # kill coroutine otherwise 319 # kill coroutine otherwise
268 Coro::terminate 320 Coro::terminate
288)) { 340)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 342}
291 343
292$EV::DIED = sub { 344$EV::DIED = sub {
293 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
294}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
295 352
296############################################################################# 353#############################################################################
297 354
298=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
299 356
320 $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;
321 $d 378 $d
322 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
323} 380}
324 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
325=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
326 435
327Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
328 437
329=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
335our $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
336 445
337sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
338sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
339 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
340=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
341 481
342Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
344 484
345The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
346is a reload or not. 486is a reload or not.
347 487
348=cut 488=cut
349 489
350sub post_init(&) { 490sub post_init(&) {
351 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 }
352} 509}
353 510
354=item cf::lock_wait $string 511=item cf::lock_wait $string
355 512
356Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
395} 552}
396 553
397=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
398 555
399Like 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
400get spread over timer. 557get spread over time.
401 558
402=cut 559=cut
403 560
404sub periodic($$) { 561sub periodic($$) {
405 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
409 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
410} 567}
411 568
412=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
413 570
414Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
415This 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
416of 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.
417 578
418The 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
419used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
420 581
421Useful for short background jobs. 582Useful for short background jobs.
422 583
423=cut 584=cut
424 585
425our @SLOT_QUEUE; 586our @SLOT_QUEUE;
426our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
427 589
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
431 593
432 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
433 596
434 while () { 597 while () {
435 next_job: 598 next_job:
599
436 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 601
438 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 606 $job->[2]->send;
442 Coro::cede; 607 Coro::cede;
443 goto next_job; 608 goto next_job;
444 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 611 }
446 } 612 }
447 613
448 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
449 # 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
450 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
451 $signal->wait;
452 } else { 617 } else {
618 $busy = 0;
453 Coro::schedule; 619 Coro::schedule;
454 } 620 }
455 } 621 }
456}; 622};
457 623
458sub get_slot($;$$) { 624sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
460 626
461 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
462 628
463 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
464 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
465 632
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
494=cut 661=cut
495 662
496sub sync_job(&) { 663sub sync_job(&) {
497 my ($job) = @_; 664 my ($job) = @_;
498 665
499 if ($Coro::current == $Coro::main) { 666 if (in_main) {
500 my $time = EV::time; 667 my $time = AE::time;
501 668
502 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
504 671
505 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
506 673
507 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
508 675
509 my $busy = 1; 676 my $busy = 1;
510 my @res; 677 my @res;
511 678
512 (async { 679 (async {
513 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 681 @res = eval { $job->() };
515 warn $@ if $@; 682 error $@ if $@;
516 undef $busy; 683 undef $busy;
517 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
518 685
519 while ($busy) { 686 while ($busy) {
520 if (Coro::nready) { 687 if (Coro::nready) {
522 } else { 689 } else {
523 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
524 } 691 }
525 } 692 }
526 693
527 my $time = EV::time - $time; 694 my $time = AE::time - $time;
528 695
529 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
530 697
531 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
532 } else { 699 } else {
554 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
555 722
556 $coro 723 $coro
557} 724}
558 725
559=item fork_call { }, $args 726=item fork_call { }, @args
560 727
561Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
562process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
563Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling. 731never block itself or use any form of event handling.
565 732
566=cut 733=cut
567 734
735sub post_fork {
736 reset_signals;
737}
738
568sub fork_call(&@) { 739sub fork_call(&@) {
569 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
570 741
571 # 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,
572 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
574 745
575 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
576 reset_signals; 747 cf::post_fork;
577 &$cb 748 &$cb
578 }, @args; 749 } @args;
579 750
580 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 )
581} 763}
582 764
583=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
584 766
585=cut 767=cut
622within each server. 804within each server.
623 805
624=cut 806=cut
625 807
626sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
627 my ($name) = @_; 812 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
629 814
630 eval { 815 eval {
631 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
641} 826}
642 827
643our $DB; 828our $DB;
644 829
645sub db_init { 830sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
648 };
649} 832}
650 833
651sub db_get($$) { 834sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
653 836
654 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
655 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
656 841
657 $! ? () 842 $! ? ()
658 : $data 843 : $data
659 }
660} 844}
661 845
662sub db_put($$$) { 846sub db_put($$$) {
663 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
692 876
693 my @data; 877 my @data;
694 my $md5; 878 my $md5;
695 879
696 for (0 .. $#$src) { 880 for (0 .. $#$src) {
697 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
698 or Carp::croak "$src->[$_]: $!";
699 } 882 }
700 883
701 # if processing is expensive, check 884 # if processing is expensive, check
702 # checksum first 885 # checksum first
703 if (1) { 886 if (1) {
720 903
721 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
722 my $data = $process->(\@data); 905 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
724 907
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 909
727 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
730 913
740 923
741=cut 924=cut
742 925
743sub datalog($@) { 926sub datalog($@) {
744 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 929}
747 930
748=back 931=back
749 932
750=cut 933=cut
945 1128
946 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 1131
949 } elsif (ref $type) { 1132 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
951 1134
952 } else { 1135 } else {
953 shift @arg; 1136 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
955 } 1138 }
956 } 1139 }
957} 1140}
958 1141
959sub _object_attach { 1142sub _object_attach {
969 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
970 } 1153 }
971 1154
972 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
973 } else { 1156 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1158 }
976 1159
977 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
978} 1161}
979 1162
1038 1221
1039 for (@$callbacks) { 1222 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1041 1224
1042 if ($@) { 1225 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1227 override;
1046 } 1228 }
1047 1229
1048 return 1 if $override; 1230 return 1 if $override;
1049 } 1231 }
1128 for (@$attach) { 1310 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1131 } 1313 }
1132 } else { 1314 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1316 }
1135 } 1317 }
1136} 1318}
1137 1319
1138cf::attachable->attach ( 1320cf::attachable->attach (
1165 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1166 1348
1167 sync_job { 1349 sync_job {
1168 if (length $$rdata) { 1350 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1172 1355
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
1198 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1199 1382
1200 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1385 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1204 } 1387 }
1205 } else { 1388 } else {
1206 aio_unlink $filename; 1389 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1208 } 1391 }
1232 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1416 $av = $st->{objs};
1234 } 1417 }
1235 1418
1236 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1239 1423
1240 ($data, $av) 1424 ($data, $av)
1241} 1425}
1242 1426
1243=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1302} 1486}
1303 1487
1304use File::Glob (); 1488use File::Glob ();
1305 1489
1306cf::player->attach ( 1490cf::player->attach (
1307 on_command => sub { 1491 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1309 1493
1310 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1311 or return; 1495 or return;
1312 1496
1320 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1321 1505
1322 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1323 1507
1324 if (ref $msg) { 1508 if (ref $msg) {
1325 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1326 "ARRAY" eq ref $msg
1327 ? @$msg
1328 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1329 1510
1330 my @reply; 1511 my @reply;
1331 1512
1332 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1333 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1335 1516
1336 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1337 if $reply; 1518 if $reply;
1338 1519
1339 } else { 1520 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1522 }
1342 1523
1343 cf::override; 1524 cf::override;
1344 }, 1525 },
1345); 1526);
1355 }; 1536 };
1356 1537
1357 $grp 1538 $grp
1358} 1539}
1359 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
1360sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1361 cf::sync_job { 1557 cf::sync_job {
1362 my %todo; 1558 my %todo;
1363 1559
1364 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1561 next unless -r $path;
1383 1579
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1582
1387 $ext{source} = 1583 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1390 . $source 1586 . $source
1391 . "\n};\n1"; 1587 . "\n};\n1";
1392 1588
1393 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1394 } 1590 }
1395 1591
1592 my $pass = 0;
1396 my %done; 1593 my %done;
1397 while (%todo) { 1594 while (%todo) {
1398 my $progress; 1595 my $progress;
1399 1596
1597 ++$pass;
1598
1599 ext:
1400 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1602 next ext
1403 unless exists $done{$_}; 1603 unless exists $done{$_};
1404 } 1604 }
1405 1605
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1607
1408 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 $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1621
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1623 if exists $v->{meta}{mandatory};
1416 1624
1417 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;
1418 } 1634 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1635 }
1424 1636
1425 skip: 1637 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 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 }
1428 } 1647 }
1429 }; 1648 };
1430} 1649}
1431 1650
1432############################################################################# 1651#############################################################################
1516 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1517 } 1736 }
1518 } 1737 }
1519} 1738}
1520 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
1521sub save($) { 1753sub save($) {
1522 my ($pl) = @_; 1754 my ($pl) = @_;
1523 1755
1524 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1525 1757
1530 1762
1531 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1533 1765
1534 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];
1535 1770
1536 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1772 cf::cede_to_tick;
1538} 1773}
1539 1774
1573 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1574 1809
1575 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1576 $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
1577 1812
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579 $pl->deactivate; 1814 $pl->deactivate;
1815
1580 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;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1583 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1584 1821
1585 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1641 \@logins 1878 \@logins
1642} 1879}
1643 1880
1644=item $player->maps 1881=item $player->maps
1645 1882
1883=item cf::player::maps $login
1884
1646Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1647player. May block. 1886player. May block.
1648 1887
1649=cut 1888=cut
1650 1889
1712=cut 1951=cut
1713 1952
1714sub find_by_path($) { 1953sub find_by_path($) {
1715 my ($path) = @_; 1954 my ($path) = @_;
1716 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1717 my ($match, $specificity); 1958 my ($match, $specificity);
1718 1959
1719 for my $region (list) { 1960 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1749sub generate_random_map { 1990sub generate_random_map {
1750 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1751 1992
1752 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
1753 1994
1754 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766 (cf::region::find $rmp->{region}), $rmp->{custom}
1767 )
1768} 1996}
1769 1997
1770=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1771 1999
1772Register 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
1777 2005
1778sub register { 2006sub register {
1779 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 2008 my $pkg = caller;
1781 2009
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 2011
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 2013}
1787 2014
1788# also paths starting with '/' 2015# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 2017
1791sub thawer_merge { 2018sub thawer_merge {
1792 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1793 2020
1794 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1799} 2026}
1800 2027
1801sub normalise { 2028sub normalise {
1802 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1803 2030
1804 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1805 2032
1806 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1807 2034
1808 # map plan: 2035 # map plan:
1809 # 2036 #
1824 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1825 $path = "$base/$path"; 2052 $path = "$base/$path";
1826 } 2053 }
1827 2054
1828 for ($path) { 2055 for ($path) {
1829 redo if s{//}{/};
1830 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1831 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1832 } 2058 }
1833 2059
1834 $path 2060 $path
1848 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1849 return $self; 2075 return $self;
1850 } 2076 }
1851 } 2077 }
1852 2078
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 2080 ()
1855} 2081}
1856 2082
2083# may re-bless or do other evil things
1857sub init { 2084sub init {
1858 my ($self) = @_; 2085 my ($self) = @_;
1859 2086
1860 $self 2087 $self
1861} 2088}
1926 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1927 2154
1928 1 2155 1
1929} 2156}
1930 2157
2158# used to laod the header of an original map
1931sub load_header_orig { 2159sub load_header_orig {
1932 my ($self) = @_; 2160 my ($self) = @_;
1933 2161
1934 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1935} 2163}
1936 2164
2165# used to laod the header of an instantiated map
1937sub load_header_temp { 2166sub load_header_temp {
1938 my ($self) = @_; 2167 my ($self) = @_;
1939 2168
1940 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1941} 2170}
1942 2171
2172# called after loading the header from an instantiated map
1943sub prepare_temp { 2173sub prepare_temp {
1944 my ($self) = @_; 2174 my ($self) = @_;
1945 2175
1946 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1947 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1948 # safety 2178 # safety
1949 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1950 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1951} 2181}
1952 2182
2183# called after loading the header from an original map
1953sub prepare_orig { 2184sub prepare_orig {
1954 my ($self) = @_; 2185 my ($self) = @_;
1955 2186
1956 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1957 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1981 2212
1982sub find; 2213sub find;
1983sub find { 2214sub find {
1984 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1985 2216
2217 cf::cede_to_tick;
2218
1986 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1987 2220
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1990 2223
1991 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
2008 2241
2009 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
2010 } 2243 }
2011} 2244}
2012 2245
2013sub pre_load { } 2246sub pre_load { }
2014sub post_load { } 2247#sub post_load { } # XS
2015 2248
2016sub load { 2249sub load {
2017 my ($self) = @_; 2250 my ($self) = @_;
2018 2251
2019 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
2022 2255
2023 { 2256 {
2024 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2025 2258
2026 return unless $self->valid; 2259 return unless $self->valid;
2027 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2028
2029 $self->in_memory (cf::MAP_LOADING);
2030 2261
2031 $self->alloc; 2262 $self->alloc;
2032 2263
2033 $self->pre_load; 2264 $self->pre_load;
2034 cf::cede_to_tick; 2265 cf::cede_to_tick;
2035 2266
2267 if (exists $self->{load_path}) {
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2269 $f->skip_block;
2038 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2039 or return; 2271 or return;
2040 2272
2041 $self->post_load_original 2273 $self->post_load_original
2042 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2043 2275
2044 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2277 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2048 $self->clear_unique_items; 2280 $self->clear_unique_items;
2049 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2051 } 2284 }
2052 } 2285 }
2053 }
2054 2286
2055 $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);
2056 2294
2057 cf::cede_to_tick; 2295 cf::cede_to_tick;
2058 # now do the right thing for maps 2296 # now do the right thing for maps
2059 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2060 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2064 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2303 $self->decay_objects;
2066 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2067 $self->update_buttons; 2305 $self->update_buttons;
2068 cf::cede_to_tick; 2306 cf::cede_to_tick;
2069 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2070 } 2308 }
2071 2309
2072 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2073 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2074
2075 $self->in_memory (cf::MAP_ACTIVE);
2076 } 2312 }
2077 2313
2078 $self->post_load; 2314 $self->post_load;
2079}
2080 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
2081sub customise_for { 2322sub customise_for {
2082 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2083 2324
2084 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2326 if $self->per_player;
2088# if $self->per_party; 2329# if $self->per_party;
2089 2330
2090 $self 2331 $self
2091} 2332}
2092 2333
2093# find and load all maps in the 3x3 area around a map
2094sub load_neighbours {
2095 my ($map) = @_;
2096
2097 my @neigh; # diagonal neighbours
2098
2099 for (0 .. 3) {
2100 my $neigh = $map->tile_path ($_)
2101 or next;
2102 $neigh = find $neigh, $map
2103 or next;
2104 $neigh->load;
2105
2106 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 }
2110
2111 for (grep defined $_->[0], @neigh) {
2112 my ($path, $origin) = @$_;
2113 my $neigh = find $path, $origin
2114 or next;
2115 $neigh->load;
2116 }
2117}
2118
2119sub find_sync { 2334sub find_sync {
2120 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2121 2336
2122 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
2123} 2342}
2124 2343
2125sub do_load_sync { 2344sub do_load_sync {
2126 my ($map) = @_; 2345 my ($map) = @_;
2127 2346
2347 # it's a bug to call this from the main context
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2130 2350
2131 cf::sync_job { $map->load }; 2351 $map->load;
2132} 2352}
2133 2353
2134our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2136 2356
2137sub find_async { 2357sub find_async {
2138 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2139 2359
2140 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2141 2361
2142 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2144 } 2364 }
2145 2365
2146 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2147 2367
2148 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2162 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2163 2383
2164 () 2384 ()
2165} 2385}
2166 2386
2387# common code, used by both ->save and ->swapout
2167sub save { 2388sub _save {
2168 my ($self) = @_; 2389 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2390
2172 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2173 2392
2174 return unless $self->dirty; 2393 return unless $self->dirty;
2175 2394
2195 } else { 2414 } else {
2196 $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);
2197 } 2416 }
2198} 2417}
2199 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2200sub swap_out { 2427sub swap_out {
2201 my ($self) = @_; 2428 my ($self) = @_;
2202 2429
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2208 return if $self->players; 2434 return if $self->players;
2209 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
2210 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2211 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
2212 $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};
2213 2486
2214 $self->deactivate; 2487 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2489 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2490
2262 $self->unlink_save; 2491 $self->unlink_save;
2263 $self->destroy; 2492 $self->destroy;
2264} 2493}
2265 2494
2273 2502
2274 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2275 2504
2276 $self->unlink_save; 2505 $self->unlink_save;
2277 2506
2278 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2512
2340 : normalise $_ 2569 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2571 ]
2343} 2572}
2344 2573
2574=item cf::map::static_maps
2575
2576Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2577file in the shared directory excluding F</styles> and F</editor>). May
2578block.
2579
2580=cut
2581
2582sub static_maps() {
2583 my @dirs = "";
2584 my @maps;
2585
2586 while (@dirs) {
2587 my $dir = shift @dirs;
2588
2589 next if $dir eq "/styles" || $dir eq "/editor";
2590
2591 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2592 or return;
2593
2594 for (@$files) {
2595 s/\.map$// or next;
2596 utf8::decode $_;
2597 push @maps, "$dir/$_";
2598 }
2599
2600 push @dirs, map "$dir/$_", @$dirs;
2601 }
2602
2603 \@maps
2604}
2605
2345=back 2606=back
2346 2607
2347=head3 cf::object 2608=head3 cf::object
2348 2609
2349=cut 2610=cut
2481 2742
2482Freezes 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}>).
2483 2744
2484The 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.
2485for 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,
2486though, 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
2487map. 2748map.
2488 2749
2489Will never block. 2750Will never block.
2490 2751
2491=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2512sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2513 my ($self) = @_; 2774 my ($self) = @_;
2514 2775
2515 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2516 2777
2778 ++$self->{_link_recursion};
2779
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2781
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2521 2784
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2786}
2524 2787
2525sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2527 2790
2544 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2546 2809
2547 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2550 2813
2551 $map->load; 2814 $map->load;
2552 $map->load_neighbours;
2553 2815
2554 return unless $self->contr->active; 2816 return unless $self->contr->active;
2555 2817
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2558 2820 # entering was successful
2821 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2823 $self->activate_recursive;
2561} 2824 }
2562 2825
2826}
2827
2563=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)]])
2564 2829
2565Moves 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
2566her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2567that 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
2568the 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
2575 2840
2576our $GOTOGEN; 2841our $GOTOGEN;
2577 2842
2578sub cf::object::player::goto { 2843sub cf::object::player::goto {
2579 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 }
2580 2851
2581 # 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
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2854
2584 $self->enter_link; 2855 $self->enter_link;
2604 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2605 } 2876 }
2606 } 2877 }
2607 2878
2608 my $map = eval { 2879 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2610 2881
2611 if ($map) { 2882 if ($map) {
2612 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2885 } else {
2615 $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);
2616 } 2887 }
2617 2888
2618 $map 2889 $map
2626 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2629 } 2900 }
2630 2901
2631 $done->() if $done; 2902 $done->($self) if $done;
2632 })->prio (1); 2903 })->prio (1);
2633} 2904}
2634 2905
2635=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2636 2907
2704 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2705 2976
2706 unless (eval { 2977 unless (eval {
2707 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2708 2979
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2718 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2719 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 }
2720 3006
2721 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2722 3008
2723 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2729 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "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. "
2731 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2733 3019
2734 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 3021 $self->leave_link;
2736 } 3022 }
2737 })->prio (1); 3023 })->prio (1);
2738} 3024}
2739 3025
2751sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2753 3039
2754 utf8::encode $text; 3040 utf8::encode $text;
2755 $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);
2756} 3067}
2757 3068
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 3070
2760Send 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
2764 3075
2765=cut 3076=cut
2766 3077
2767# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2769 "c/identify" => { 3086 "c/identify" => {
2770 id => "infobox", 3087 id => "infobox",
2771 title => "Identify", 3088 title => "Identify",
2772 reply => undef, 3089 reply => undef,
2773 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2775 "c/examine" => { 3092 "c/examine" => {
2776 id => "infobox", 3093 id => "infobox",
2777 title => "Examine", 3094 title => "Examine",
2778 reply => undef, 3095 reply => undef,
2779 tooltip => "Signs and other items you examined", 3096 tooltip => "Signs and other items you examined",
3097 },
3098 "c/shopinfo" => {
3099 id => "infobox",
3100 title => "Shop Info",
3101 reply => undef,
3102 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 3103 },
2781 "c/book" => { 3104 "c/book" => {
2782 id => "infobox", 3105 id => "infobox",
2783 title => "Book", 3106 title => "Book",
2784 reply => undef, 3107 reply => undef,
2900 my $pkt = "msg " 3223 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3226 );
2904 3227
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2916} 3229}
2917 3230
2918=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2919 3232
2920Sends an ext event to the client. 3233Sends an ext event to the client.
2923 3236
2924sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2926 3239
2927 if ($self->extcmd == 2) { 3240 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3242 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3243 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3244 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3245 }
2933} 3246}
2934 3247
2935=item $client->ext_reply ($msgid, @msg) 3248=item $client->ext_reply ($msgid, @msg)
2936 3249
2939=cut 3252=cut
2940 3253
2941sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
2943 3256
2944 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2951} 3260}
2952 3261
2953=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
2954 3263
2955Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
3010 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3011 3320
3012 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3013 3322
3014 if (ref $msg) { 3323 if (ref $msg) {
3015 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3016 "ARRAY" eq ref $msg
3017 ? @$msg
3018 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3019 3325
3020 my @reply; 3326 my @reply;
3021 3327
3022 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3023 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
3025 3331
3026 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3333 if $reply;
3028 3334
3029 } else { 3335 } else {
3030 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";
3031 } 3337 }
3032 3338
3033 cf::override; 3339 cf::override;
3034 }, 3340 },
3035); 3341);
3055 3361
3056 $coro 3362 $coro
3057} 3363}
3058 3364
3059cf::client->attach ( 3365cf::client->attach (
3060 on_destroy => sub { 3366 on_client_destroy => sub {
3061 my ($ns) = @_; 3367 my ($ns) = @_;
3062 3368
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3369 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3370 },
3065); 3371);
3081our $safe_hole = new Safe::Hole; 3387our $safe_hole = new Safe::Hole;
3082 3388
3083$SIG{FPE} = 'IGNORE'; 3389$SIG{FPE} = 'IGNORE';
3084 3390
3085$safe->permit_only (Opcode::opset qw( 3391$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3392 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3393 grepstart grepwhile mapstart mapwhile
3088 sort time 3394 sort time
3089)); 3395));
3090 3396
3091# here we export the classes and methods available to script code 3397# here we export the classes and methods available to script code
3116 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3120) { 3426) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3429 for @funs;
3125} 3430}
3126 3431
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3448 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3449 $qcode =~ s/\n/\\n/g;
3145 3450
3146 %vars = (_dummy => 0) unless %vars; 3451 %vars = (_dummy => 0) unless %vars;
3147 3452
3453 my @res;
3148 local $_; 3454 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3455
3151 my $eval = 3456 my $eval =
3152 "do {\n" 3457 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3458 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3459 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3460 . $code
3156 . "\n}" 3461 . "\n}"
3157 ; 3462 ;
3158 3463
3464 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3465 sub_generation_inc;
3466 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3467 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 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 }
3162 3473
3163 if ($@) { 3474 if ($@) {
3164 warn "$@"; 3475 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3167 } 3478 }
3168 3479
3169 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3170} 3481}
3171 3482
3185=cut 3496=cut
3186 3497
3187sub register_script_function { 3498sub register_script_function {
3188 my ($fun, $cb) = @_; 3499 my ($fun, $cb) = @_;
3189 3500
3190 no strict 'refs'; 3501 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3502 *$fun = $safe_hole->wrap ($cb);
3192} 3503}
3193 3504
3194=back 3505=back
3195 3506
3196=cut 3507=cut
3197 3508
3198############################################################################# 3509#############################################################################
3199# 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
3200 3513
3201sub load_facedata($) { 3514sub load_facedata($) {
3202 my ($path) = @_; 3515 my ($path) = @_;
3203 3516
3204 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3205 # for this (global event?) 3518 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3520
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3521 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3522
3210 warn "loading facedata from $path\n"; 3523 trace "loading facedata from $path\n";
3211 3524
3212 my $facedata; 3525 my $facedata = decode_storable load_file $path;
3213 0 < aio_load $path, $facedata
3214 or die "$path: $!";
3215
3216 $facedata = Coro::Storable::thaw $facedata;
3217 3526
3218 $facedata->{version} == 2 3527 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3528 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3529
3221 # patch in the exptable 3530 # patch in the exptable
3531 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3532 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3533 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3534 data => $exp_table,
3535 hash => (cf::face::mangle_chksum Digest::MD5::md5 $exp_table),
3225 }; 3536 };
3226 cf::cede_to_tick; 3537 cf::cede_to_tick;
3227 3538
3228 { 3539 {
3229 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3230 3541
3231 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3545
3234 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3551 $FACEHASH{$info->{hash64}} = $idx;#d#
3238 3552
3239 cf::cede_to_tick; 3553 cf::cede_to_tick;
3240 } 3554 }
3241 3555
3242 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
3247 3561
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3562 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3563 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3564 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3565 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3566 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3567 }
3254 3568
3255 cf::cede_to_tick; 3569 cf::cede_to_tick;
3256 } 3570 }
3257 } 3571 }
3266 3580
3267 cf::anim::invalidate_all; # d'oh 3581 cf::anim::invalidate_all; # d'oh
3268 } 3582 }
3269 3583
3270 { 3584 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3274 3586
3275 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3588 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3591
3280 if ($info->{type} & 1) { 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d#
3295 } else { 3596 } else {
3296 $RESOURCE{$name} = $info; 3597# $RESOURCE{$name} = $info; # unused
3297 } 3598 }
3298 3599
3299 cf::cede_to_tick; 3600 cf::cede_to_tick;
3300 } 3601 }
3301 } 3602 }
3302 3603
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3604 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3605
3305 1 3606 1
3306} 3607}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3608
3328register_exticmd fx_want => sub { 3609register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3610 my ($ns, $want) = @_;
3330 3611
3331 while (my ($k, $v) = each %$want) { 3612 while (my ($k, $v) = each %$want) {
3370sub reload_treasures { 3651sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3652 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3653 or die "unable to load treasurelists\n";
3373} 3654}
3374 3655
3656sub reload_sound {
3657 trace "loading sound config from $DATADIR/sound\n";
3658
3659 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3660
3661 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3662 my $sound = $soundconf->{compat}[$_]
3663 or next;
3664
3665 my $face = cf::face::find "sound/$sound->[1]";
3666 cf::sound::set $sound->[0] => $face;
3667 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3668 }
3669
3670 while (my ($k, $v) = each %{$soundconf->{event}}) {
3671 my $face = cf::face::find "sound/$v";
3672 cf::sound::set $k => $face;
3673 }
3674}
3675
3375sub reload_resources { 3676sub reload_resources {
3376 warn "reloading resource files...\n"; 3677 trace "reloading resource files...\n";
3377 3678
3679 reload_exp_table;
3680 reload_materials;
3378 reload_facedata; 3681 reload_facedata;
3682 reload_sound;
3379 reload_archetypes; 3683 reload_archetypes;
3380 reload_regions; 3684 reload_regions;
3381 reload_treasures; 3685 reload_treasures;
3382 3686
3383 warn "finished reloading resource files\n"; 3687 trace "finished reloading resource files\n";
3384} 3688}
3385 3689
3386sub reload_config { 3690sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3691 trace "reloading config file...\n";
3388 or return;
3389 3692
3390 local $/; 3693 my $config = load_file "$CONFDIR/config";
3391 *CFG = YAML::Load <$fh>; 3694 utf8::decode $config;
3695 *CFG = decode_yaml $config;
3392 3696
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3698
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3701
3398 if (exists $CFG{mlockall}) { 3702 if (exists $CFG{mlockall}) {
3422 seek $fh, 0, 0; 3726 seek $fh, 0, 0;
3423 print $fh $$; 3727 print $fh $$;
3424} 3728}
3425 3729
3426sub main_loop { 3730sub main_loop {
3427 warn "EV::loop starting\n"; 3731 trace "EV::loop starting\n";
3428 if (1) { 3732 if (1) {
3429 EV::loop; 3733 EV::loop;
3430 } 3734 }
3431 warn "EV::loop returned\n"; 3735 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3736 goto &main_loop unless $REALLY_UNLOOP;
3433} 3737}
3434 3738
3435sub main { 3739sub main {
3436 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3437 3741
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442 3746
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3747 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3748
3450 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3751 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3453 (async { 3752 (async {
3454 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3456 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
3457 }; 3756 };
3458 3757
3459 evthread_start IO::AIO::poll_fileno; 3758 evthread_start IO::AIO::poll_fileno;
3460 3759
3461 cf::sync_job { 3760 cf::sync_job {
3761 cf::incloader::init ();
3762
3763 cf::init_anim;
3764 cf::init_attackmess;
3765 cf::init_dynamic;
3766
3767 cf::load_settings;
3768
3462 reload_resources; 3769 reload_resources;
3463 reload_config; 3770 reload_config;
3464 db_init; 3771 db_init;
3465 3772
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3773 cf::init_uuid;
3469 cf::init_signals; 3774 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3775 cf::init_skills;
3472 3776
3473 cf::init_beforeplay; 3777 cf::init_beforeplay;
3474 3778
3475 atomic; 3779 atomic;
3480 3784
3481 # no (long-running) fork's whatsoever before this point(!) 3785 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX (); 3786 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3787 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3788
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3789 cf::_post_init 0;
3486 }; 3790 };
3487 3791
3792 cf::object::thawer::errors_are_fatal 0;
3793 info "parse errors in files are no longer fatal from this point on.\n";
3794
3795 AE::postpone {
3796 undef &main; # free gobs of memory :)
3797 };
3798
3488 main_loop; 3799 goto &main_loop;
3489} 3800}
3490 3801
3491############################################################################# 3802#############################################################################
3492# initialisation and cleanup 3803# initialisation and cleanup
3493 3804
3494# install some emergency cleanup handlers 3805# install some emergency cleanup handlers
3495BEGIN { 3806BEGIN {
3496 our %SIGWATCHER = (); 3807 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3808 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3809 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3810 cf::cleanup "SIG$signal";
3500 }; 3811 };
3501 } 3812 }
3502} 3813}
3503 3814
3504sub write_runtime_sync { 3815sub write_runtime_sync {
3816 my $t0 = AE::time;
3817
3505 # first touch the runtime file to show we are still running: 3818 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3819 # the fsync below can take a very very long time.
3507 3820
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3821 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3822
3510 my $guard = cf::lock_acquire "write_runtime"; 3823 my $guard = cf::lock_acquire "write_runtime";
3511 3824
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3825 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3826 or return;
3514 3827
3515 my $value = $cf::RUNTIME + 90 + 10; 3828 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3829 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3830 # 60 allows for the watchdog to kill the server.
3530 or return; 3843 or return;
3531 3844
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3845 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3846 and return;
3534 3847
3535 warn "runtime file written.\n"; 3848 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3849
3537 1 3850 1
3538} 3851}
3539 3852
3540our $uuid_lock; 3853our $uuid_lock;
3552 or return; 3865 or return;
3553 3866
3554 my $value = uuid_seq uuid_cur; 3867 my $value = uuid_seq uuid_cur;
3555 3868
3556 unless ($value) { 3869 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3870 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3871 return;
3559 } 3872 }
3560 3873
3561 my $value = uuid_str $value + $uuid_skip; 3874 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3875 $uuid_skip = 0;
3572 or return; 3885 or return;
3573 3886
3574 aio_rename "$uuid~", $uuid 3887 aio_rename "$uuid~", $uuid
3575 and return; 3888 and return;
3576 3889
3577 warn "uuid file written ($value).\n"; 3890 trace "uuid file written ($value).\n";
3578 3891
3579 1 3892 1
3580 3893
3581} 3894}
3582 3895
3588} 3901}
3589 3902
3590sub emergency_save() { 3903sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3904 my $freeze_guard = cf::freeze_mainloop;
3592 3905
3593 warn "emergency_perl_save: enter\n"; 3906 info "emergency_perl_save: enter\n";
3907
3908 # this is a trade-off: we want to be very quick here, so
3909 # save all maps without fsync, and later call a global sync
3910 # (which in turn might be very very slow)
3911 local $USE_FSYNC = 0;
3594 3912
3595 cf::sync_job { 3913 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3914 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 3915
3601 # use a peculiar iteration method to avoid tripping on perl 3916 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3917 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3918 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3919 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3920 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3921 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3922 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3923 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3924 $pl->save;
3610 } 3925 }
3611 warn "emergency_perl_save: end player save\n"; 3926 info "emergency_perl_save: end player save\n";
3612 3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3613 warn "emergency_perl_save: begin map save\n"; 3930 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3931 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3932 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3933 $map->valid or next;
3617 $map->save; 3934 $map->save;
3618 } 3935 }
3619 warn "emergency_perl_save: end map save\n"; 3936 info "emergency_perl_save: end map save\n";
3620 3937
3938 cf::write_runtime_sync; # external watchdog should not bark
3939
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3940 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3941 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3942 info "emergency_perl_save: end database checkpoint\n";
3624 3943
3625 warn "emergency_perl_save: begin write uuid\n"; 3944 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3945 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 3946 info "emergency_perl_save: end write uuid\n";
3947
3948 cf::write_runtime_sync; # external watchdog should not bark
3949
3950 trace "emergency_perl_save: syncing database to disk";
3951 BDB::db_env_txn_checkpoint $DB_ENV;
3952
3953 info "emergency_perl_save: starting sync\n";
3954 IO::AIO::aio_sync sub {
3955 info "emergency_perl_save: finished sync\n";
3956 };
3957
3958 cf::write_runtime_sync; # external watchdog should not bark
3959
3960 trace "emergency_perl_save: flushing outstanding aio requests";
3961 while (IO::AIO::nreqs || BDB::nreqs) {
3962 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3963 }
3964
3965 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 3966 };
3629 3967
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 3968 info "emergency_perl_save: leave\n";
3636} 3969}
3637 3970
3638sub post_cleanup { 3971sub post_cleanup {
3639 my ($make_core) = @_; 3972 my ($make_core) = @_;
3640 3973
3974 IO::AIO::flush;
3975
3641 warn Carp::longmess "post_cleanup backtrace" 3976 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 3977 if $make_core;
3643 3978
3644 my $fh = pidfile; 3979 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 3980 unlink $PIDFILE if <$fh> == $$;
3646} 3981}
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4001 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 4002 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 4003 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4004# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 4005 }
3671 warn "cleared package $pkg\n";#d#
3672} 4006}
3673 4007
3674sub do_reload_perl() { 4008sub do_reload_perl() {
3675 # can/must only be called in main 4009 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 4010 unless (in_main) {
3677 warn "can only reload from main coroutine"; 4011 error "can only reload from main coroutine";
3678 return; 4012 return;
3679 } 4013 }
3680 4014
3681 return if $RELOAD++; 4015 return if $RELOAD++;
3682 4016
3683 my $t1 = EV::time; 4017 my $t1 = AE::time;
3684 4018
3685 while ($RELOAD) { 4019 while ($RELOAD) {
3686 warn "reloading..."; 4020 cf::get_slot 0.1, -1, "reload_perl";
4021 info "perl_reload: reloading...";
3687 4022
3688 warn "entering sync_job"; 4023 trace "perl_reload: entering sync_job";
3689 4024
3690 cf::sync_job { 4025 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 4026 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 4027
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 4028 trace "perl_reload: cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 4029 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 4030 %EXT_CORO = ();
3708 4031
3709 warn "removing commands"; 4032 trace "perl_reload: removing commands";
3710 %COMMAND = (); 4033 %COMMAND = ();
3711 4034
3712 warn "removing ext/exti commands"; 4035 trace "perl_reload: removing ext/exti commands";
3713 %EXTCMD = (); 4036 %EXTCMD = ();
3714 %EXTICMD = (); 4037 %EXTICMD = ();
3715 4038
3716 warn "unloading/nuking all extensions"; 4039 trace "perl_reload: unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 4040 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 4041 trace "... unloading $pkg";
3719 4042
3720 if (my $cb = $pkg->can ("unload")) { 4043 if (my $cb = $pkg->can ("unload")) {
3721 eval { 4044 eval {
3722 $cb->($pkg); 4045 $cb->($pkg);
3723 1 4046 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 4047 } or error "$pkg unloaded, but with errors: $@";
3725 } 4048 }
3726 4049
3727 warn "... clearing $pkg"; 4050 trace "... clearing $pkg";
3728 clear_package $pkg; 4051 clear_package $pkg;
3729 } 4052 }
3730 4053
3731 warn "unloading all perl modules loaded from $LIBDIR"; 4054 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 4055 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4056 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 4057
3735 warn "... unloading $k"; 4058 trace "... unloading $k";
3736 delete $INC{$k}; 4059 delete $INC{$k};
3737 4060
3738 $k =~ s/\.pm$//; 4061 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 4062 $k =~ s/\//::/g;
3740 4063
3743 } 4066 }
3744 4067
3745 clear_package $k; 4068 clear_package $k;
3746 } 4069 }
3747 4070
3748 warn "getting rid of safe::, as good as possible"; 4071 trace "perl_reload: getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 4072 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4073 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 4074
3752 warn "unloading cf.pm \"a bit\""; 4075 trace "perl_reload: unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 4076 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4077 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 4078
3756 # don't, removes xs symbols, too, 4079 # don't, removes xs symbols, too,
3757 # and global variables created in xs 4080 # and global variables created in xs
3758 #clear_package __PACKAGE__; 4081 #clear_package __PACKAGE__;
3759 4082
3760 warn "unload completed, starting to reload now"; 4083 info "perl_reload: unload completed, starting to reload now";
3761 4084
3762 warn "reloading cf.pm"; 4085 trace "perl_reload: reloading cf.pm";
3763 require cf; 4086 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4087 cf::_connect_to_perl_1;
3765 4088
3766 warn "loading config and database again"; 4089 trace "perl_reload: loading config and database again";
3767 cf::reload_config; 4090 cf::reload_config;
3768 4091
3769 warn "loading extensions"; 4092 trace "perl_reload: loading extensions";
3770 cf::load_extensions; 4093 cf::load_extensions;
3771 4094
3772 if ($REATTACH_ON_RELOAD) { 4095 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 4096 trace "perl_reload: reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 4097 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 4098 trace "perl_reload: reattaching attachments to maps";
3776 reattach $_ for values %MAP; 4099 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 4100 trace "perl_reload: reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 4101 reattach $_ for values %PLAYER;
3779 } 4102 }
3780 4103
3781 warn "running post_init jobs"; 4104 cf::_post_init 1;
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783 4105
3784 warn "leaving sync_job"; 4106 trace "perl_reload: leaving sync_job";
3785 4107
3786 1 4108 1
3787 } or do { 4109 } or do {
3788 warn $@; 4110 error $@;
3789 cf::cleanup "error while reloading, exiting."; 4111 cf::cleanup "perl_reload: error, exiting.";
3790 }; 4112 };
3791 4113
3792 warn "reloaded";
3793 --$RELOAD; 4114 --$RELOAD;
3794 } 4115 }
3795 4116
3796 $t1 = EV::time - $t1; 4117 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4118 info "perl_reload: completed in ${t1}s\n";
3798}; 4119};
3799 4120
3800our $RELOAD_WATCHER; # used only during reload 4121our $RELOAD_WATCHER; # used only during reload
3801 4122
3802sub reload_perl() { 4123sub reload_perl() {
3804 # coro crashes during coro_state_free->destroy here. 4125 # coro crashes during coro_state_free->destroy here.
3805 4126
3806 $RELOAD_WATCHER ||= cf::async { 4127 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4128 Coro::AIO::aio_wait cache_extensions;
3808 4129
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4130 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4131 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4132 undef $RELOAD_WATCHER;
3812 }; 4133 };
3813 }; 4134 };
3814} 4135}
3823 reload_perl; 4144 reload_perl;
3824 }; 4145 };
3825 } 4146 }
3826}; 4147};
3827 4148
3828unshift @INC, $LIBDIR; 4149#############################################################################
3829 4150
3830my $bug_warning = 0; 4151my $bug_warning = 0;
3831 4152
3832our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN;
3834
3835sub wait_for_tick { 4153sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3837 4155
3838 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
3839 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait;
3841} 4157}
3842 4158
3843sub wait_for_tick_begin { 4159sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3845 4161
3846 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4164 $signal->wait;
3849} 4165}
3853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4169 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3854 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
3855 return; 4171 return;
3856 } 4172 }
3857 4173
3858 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
4175
4176 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3859 4177
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4179 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4180 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4181 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4182 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4183 or error "ERROR: unable to write runtime file: $!";
3866 }; 4184 };
3867 } 4185 }
3868 4186
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4188 $sig->send;
3871 } 4189 }
3872 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
3873 $sig->send;
3874 }
3875 4191
3876 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3878 4194
3879 if (0) { 4195 if (0) {
3880 if ($NEXT_TICK) { 4196 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4197 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4198 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4199 debug "jitter $JITTER\n";#d#
3884 } 4200 }
3885 } 4201 }
3886} 4202}
3887 4203
3888{ 4204{
3889 # configure BDB 4205 # configure BDB
3890 4206
3891 BDB::min_parallel 8; 4207 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
3894 4210
3895 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4214 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3933 IO::AIO::min_parallel 8; 4249 IO::AIO::min_parallel 8;
3934 IO::AIO::max_poll_time $TICK * 0.1; 4250 IO::AIO::max_poll_time $TICK * 0.1;
3935 undef $AnyEvent::AIO::WATCHER; 4251 undef $AnyEvent::AIO::WATCHER;
3936} 4252}
3937 4253
3938my $_log_backtrace; 4254our $_log_backtrace;
4255our $_log_backtrace_last;
3939 4256
3940sub _log_backtrace { 4257sub _log_backtrace {
3941 my ($msg, @addr) = @_; 4258 my ($msg, @addr) = @_;
3942 4259
3943 $msg =~ s/\n//; 4260 $msg =~ s/\n$//;
3944 4261
4262 if ($_log_backtrace_last eq $msg) {
4263 LOG llevInfo, "[ABT] $msg\n";
4264 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945 # limit the # of concurrent backtraces 4265 # limit the # of concurrent backtraces
3946 if ($_log_backtrace < 2) { 4266 } elsif ($_log_backtrace < 2) {
4267 $_log_backtrace_last = $msg;
3947 ++$_log_backtrace; 4268 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg; 4269 my $perl_bt = Carp::longmess $msg;
3949 async { 4270 async {
3950 $Coro::current->{desc} = "abt $msg"; 4271 $Coro::current->{desc} = "abt $msg";
3951 4272
3971 LOG llevInfo, "[ABT] $_\n" for @bt; 4292 LOG llevInfo, "[ABT] $_\n" for @bt;
3972 --$_log_backtrace; 4293 --$_log_backtrace;
3973 }; 4294 };
3974 } else { 4295 } else {
3975 LOG llevInfo, "[ABT] $msg\n"; 4296 LOG llevInfo, "[ABT] $msg\n";
3976 LOG llevInfo, "[ABT] [suppressed]\n"; 4297 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977 } 4298 }
3978} 4299}
3979 4300
3980# load additional modules 4301# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4302require "cf/$_.pm" for @EXTRA_MODULES;
4303cf::_connect_to_perl_2;
3982 4304
3983END { cf::emergency_save } 4305END { cf::emergency_save }
3984 4306
39851 43071
3986 4308

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines