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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines