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.478 by root, Thu Sep 17 01:57:31 2009 UTC vs.
Revision 1.589 by root, Sun Nov 4 01:01:13 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 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
88our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
90 95
91our $RELOAD; # number of reloads so far, non-zero while in reload 96our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
93 100
94our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
95our $DATADIR = datadir; 103our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
99our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 116
108our %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;
109 124
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 127our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 133our $DB_ENV;
119 134
120our @EXTRA_MODULES = qw(pod mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 136
122our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
123 139
124our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
126our $NOW; 143our $NOW;
127 144
128our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
129our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
130our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
139 156
140our @POST_INIT; 157our @POST_INIT;
141 158
142our $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)
143our $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;
144 164
145binmode STDOUT; 165binmode STDOUT;
146binmode STDERR; 166binmode STDERR;
147 167
148# read virtual server time, if available 168# read virtual server time, if available
159 179
160our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
161 181
162sub cf::map::normalise; 182sub cf::map::normalise;
163 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
164############################################################################# 188#############################################################################
165 189
190%REFLECT = ();
191for (@REFLECT) {
192 my $reflect = JSON::XS::decode_json $_;
193 $REFLECT{$reflect->{class}} = $reflect;
194}
195
196# this is decidedly evil
197$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
198
199#############################################################################
200
166=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
167 202
168=over 4 203=over 4
169 204
170=item $cf::UPTIME 205=item $cf::UPTIME
171 206
172The 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.
173 223
174=item $cf::RUNTIME 224=item $cf::RUNTIME
175 225
176The 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
177every server tick. 227every server tick.
183Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
184directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
185unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
186database environment. 236database environment.
187 237
188=item $cf::NOW
189
190The time of the last (current) server tick.
191
192=item $cf::TICK
193
194The interval between server ticks, in seconds.
195
196=item $cf::LOADAVG 238=item $cf::LOADAVG
197 239
198The 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
199(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
200objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
209from wherever your confdir points to. 251from wherever your confdir points to.
210 252
211=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
212 254
213These 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
214returns 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
215per 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.
216 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
217=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
218 277
219This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
220C<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
221that call. 280that call.
222 281
282=item %cf::REFLECT
283
284Contains, for each (C++) class name, a hash reference with information
285about object members (methods, scalars, arrays and flags) and other
286metadata, which is useful for introspection.
287
223=back 288=back
224 289
225=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 "", @_ }
226 297
227$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
228 my $msg = join "", @_; 299 my $msg = join "", @_;
229 300
230 $msg .= "\n" 301 $msg .= "\n"
231 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
232 303
233 $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;
234 305
235 LOG llevError, $msg; 306 LOG llevWarn, $msg;
236}; 307};
237 308
238$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
239 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
240 311
241 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
242 313
243 if ($Coro::current == $Coro::main) {#d# 314 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 316 return;#d#
246 }#d# 317 }#d#
247 318
248 # kill coroutine otherwise 319 # kill coroutine otherwise
249 Coro::terminate 320 Coro::terminate
269)) { 340)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 342}
272 343
273$EV::DIED = sub { 344$EV::DIED = sub {
274 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
275}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
276 352
277############################################################################# 353#############################################################################
278 354
279=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
280 356
301 $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;
302 $d 378 $d
303 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
304} 380}
305 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
306=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
307 435
308Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
309 437
310=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
316our $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
317 445
318sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
319sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
320 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
321=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
322 481
323Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
324but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
325 484
326The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
327is a reload or not. 486is a reload or not.
328 487
329=cut 488=cut
330 489
331sub post_init(&) { 490sub post_init(&) {
332 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 }
333} 509}
334 510
335=item cf::lock_wait $string 511=item cf::lock_wait $string
336 512
337Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
376} 552}
377 553
378=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
379 555
380Like 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
381get spread over timer. 557get spread over time.
382 558
383=cut 559=cut
384 560
385sub periodic($$) { 561sub periodic($$) {
386 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
390 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
391} 567}
392 568
393=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
394 570
395Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
396This 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
397of 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.
398 578
399The 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
400used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
401 581
402Useful for short background jobs. 582Useful for short background jobs.
403 583
404=cut 584=cut
405 585
406our @SLOT_QUEUE; 586our @SLOT_QUEUE;
407our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
408 589
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
412 593
413 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
414 596
415 while () { 597 while () {
416 next_job: 598 next_job:
599
417 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 601
419 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 606 $job->[2]->send;
423 Coro::cede; 607 Coro::cede;
424 goto next_job; 608 goto next_job;
425 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 611 }
427 } 612 }
428 613
429 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
430 # 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
431 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
432 $signal->wait;
433 } else { 617 } else {
618 $busy = 0;
434 Coro::schedule; 619 Coro::schedule;
435 } 620 }
436 } 621 }
437}; 622};
438 623
439sub get_slot($;$$) { 624sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
441 626
442 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
443 628
444 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
445 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
446 632
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
475=cut 661=cut
476 662
477sub sync_job(&) { 663sub sync_job(&) {
478 my ($job) = @_; 664 my ($job) = @_;
479 665
480 if ($Coro::current == $Coro::main) { 666 if (in_main) {
481 my $time = EV::time; 667 my $time = AE::time;
482 668
483 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
484 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
485 671
486 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
487 673
488 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
489 675
490 my $busy = 1; 676 my $busy = 1;
491 my @res; 677 my @res;
492 678
493 (async { 679 (async {
494 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
495 @res = eval { $job->() }; 681 @res = eval { $job->() };
496 warn $@ if $@; 682 error $@ if $@;
497 undef $busy; 683 undef $busy;
498 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
499 685
500 while ($busy) { 686 while ($busy) {
501 if (Coro::nready) { 687 if (Coro::nready) {
503 } else { 689 } else {
504 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
505 } 691 }
506 } 692 }
507 693
508 my $time = EV::time - $time; 694 my $time = AE::time - $time;
509 695
510 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
511 697
512 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
513 } else { 699 } else {
535 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
536 722
537 $coro 723 $coro
538} 724}
539 725
540=item fork_call { }, $args 726=item fork_call { }, @args
541 727
542Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
543process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
544Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
545never block itself or use any form of event handling. 731never block itself or use any form of event handling.
546 732
547=cut 733=cut
548 734
735sub post_fork {
736 reset_signals;
737}
738
549sub fork_call(&@) { 739sub fork_call(&@) {
550 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
551 741
552 # 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,
553 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
554 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
555 745
556 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
557 reset_signals; 747 cf::post_fork;
558 &$cb 748 &$cb
559 }, @args; 749 } @args;
560 750
561 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 )
562} 763}
563 764
564=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
565 766
566=cut 767=cut
603within each server. 804within each server.
604 805
605=cut 806=cut
606 807
607sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
608 my ($name) = @_; 812 my ($name) = @_;
609 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
610 814
611 eval { 815 eval {
612 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
622} 826}
623 827
624our $DB; 828our $DB;
625 829
626sub db_init { 830sub db_init {
627 cf::sync_job {
628 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
629 };
630} 832}
631 833
632sub db_get($$) { 834sub db_get($$) {
633 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
634 836
635 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
636 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
637 841
638 $! ? () 842 $! ? ()
639 : $data 843 : $data
640 }
641} 844}
642 845
643sub db_put($$$) { 846sub db_put($$$) {
644 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
645 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
673 876
674 my @data; 877 my @data;
675 my $md5; 878 my $md5;
676 879
677 for (0 .. $#$src) { 880 for (0 .. $#$src) {
678 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
679 or Carp::croak "$src->[$_]: $!";
680 } 882 }
681 883
682 # if processing is expensive, check 884 # if processing is expensive, check
683 # checksum first 885 # checksum first
684 if (1) { 886 if (1) {
701 903
702 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
703 my $data = $process->(\@data); 905 my $data = $process->(\@data);
704 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
705 907
706 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707 909
708 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
709 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
710 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
711 913
721 923
722=cut 924=cut
723 925
724sub datalog($@) { 926sub datalog($@) {
725 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
726 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727} 929}
728 930
729=back 931=back
730 932
731=cut 933=cut
926 1128
927 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
928 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929 1131
930 } elsif (ref $type) { 1132 } elsif (ref $type) {
931 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
932 1134
933 } else { 1135 } else {
934 shift @arg; 1136 shift @arg;
935 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
936 } 1138 }
937 } 1139 }
938} 1140}
939 1141
940sub _object_attach { 1142sub _object_attach {
950 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
951 } 1153 }
952 1154
953 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
954 } else { 1156 } else {
955 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
956 } 1158 }
957 1159
958 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
959} 1161}
960 1162
1019 1221
1020 for (@$callbacks) { 1222 for (@$callbacks) {
1021 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1022 1224
1023 if ($@) { 1225 if ($@) {
1024 warn "$@";
1025 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026 override; 1227 override;
1027 } 1228 }
1028 1229
1029 return 1 if $override; 1230 return 1 if $override;
1030 } 1231 }
1109 for (@$attach) { 1310 for (@$attach) {
1110 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1111 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1112 } 1313 }
1113 } else { 1314 } else {
1114 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1115 } 1316 }
1116 } 1317 }
1117} 1318}
1118 1319
1119cf::attachable->attach ( 1320cf::attachable->attach (
1146 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1147 1348
1148 sync_job { 1349 sync_job {
1149 if (length $$rdata) { 1350 if (length $$rdata) {
1150 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1151 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1152 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1153 1355
1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
1179 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1180 1382
1181 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1183 } else { 1385 } else {
1184 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1185 } 1387 }
1186 } else { 1388 } else {
1187 aio_unlink $filename; 1389 aio_unlink $filename;
1188 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1189 } 1391 }
1213 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1214 $av = $st->{objs}; 1416 $av = $st->{objs};
1215 } 1417 }
1216 1418
1217 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1218 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1219 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1220 1423
1221 ($data, $av) 1424 ($data, $av)
1222} 1425}
1223 1426
1224=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1283} 1486}
1284 1487
1285use File::Glob (); 1488use File::Glob ();
1286 1489
1287cf::player->attach ( 1490cf::player->attach (
1288 on_command => sub { 1491 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1290 1493
1291 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1292 or return; 1495 or return;
1293 1496
1301 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1302 1505
1303 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1304 1507
1305 if (ref $msg) { 1508 if (ref $msg) {
1306 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1307 "ARRAY" eq ref $msg
1308 ? @$msg
1309 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1310 1510
1311 my @reply; 1511 my @reply;
1312 1512
1313 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1314 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1316 1516
1317 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1318 if $reply; 1518 if $reply;
1319 1519
1320 } else { 1520 } else {
1321 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322 } 1522 }
1323 1523
1324 cf::override; 1524 cf::override;
1325 }, 1525 },
1326); 1526);
1336 }; 1536 };
1337 1537
1338 $grp 1538 $grp
1339} 1539}
1340 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
1341sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1342 cf::sync_job { 1557 cf::sync_job {
1343 my %todo; 1558 my %todo;
1344 1559
1345 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1346 next unless -r $path; 1561 next unless -r $path;
1364 1579
1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1367 1582
1368 $ext{source} = 1583 $ext{source} =
1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1370 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1371 . $source 1586 . $source
1372 . "\n};\n1"; 1587 . "\n};\n1";
1373 1588
1374 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1375 } 1590 }
1376 1591
1592 my $pass = 0;
1377 my %done; 1593 my %done;
1378 while (%todo) { 1594 while (%todo) {
1379 my $progress; 1595 my $progress;
1380 1596
1597 ++$pass;
1598
1599 ext:
1381 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1602 next ext
1384 unless exists $done{$_}; 1603 unless exists $done{$_};
1385 } 1604 }
1386 1605
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1607
1389 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 $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n";
1392 1621
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1623 if exists $v->{meta}{mandatory};
1397 1624
1398 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;
1399 } 1634 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1635 }
1405 1636
1406 skip: 1637 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 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 }
1409 } 1647 }
1410 }; 1648 };
1411} 1649}
1412 1650
1413############################################################################# 1651#############################################################################
1497 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1498 } 1736 }
1499 } 1737 }
1500} 1738}
1501 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
1502sub save($) { 1753sub save($) {
1503 my ($pl) = @_; 1754 my ($pl) = @_;
1504 1755
1505 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1506 1757
1511 1762
1512 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1514 1765
1515 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];
1516 1770
1517 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1772 cf::cede_to_tick;
1519} 1773}
1520 1774
1554 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1555 1809
1556 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1557 $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
1558 1812
1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1560 $pl->deactivate; 1814 $pl->deactivate;
1815
1561 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;
1562 $pl->ob->check_score;
1563 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1564 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1565 1821
1566 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1567 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1568 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1622 \@logins 1878 \@logins
1623} 1879}
1624 1880
1625=item $player->maps 1881=item $player->maps
1626 1882
1883=item cf::player::maps $login
1884
1627Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1628player. May block. 1886player. May block.
1629 1887
1630=cut 1888=cut
1631 1889
1693=cut 1951=cut
1694 1952
1695sub find_by_path($) { 1953sub find_by_path($) {
1696 my ($path) = @_; 1954 my ($path) = @_;
1697 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1698 my ($match, $specificity); 1958 my ($match, $specificity);
1699 1959
1700 for my $region (list) { 1960 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1730sub generate_random_map { 1990sub generate_random_map {
1731 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1732 1992
1733 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
1734 1994
1735 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1744 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1745 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1746 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1747 (cf::region::find $rmp->{region}), $rmp->{custom}
1748 )
1749} 1996}
1750 1997
1751=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1752 1999
1753Register 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
1758 2005
1759sub register { 2006sub register {
1760 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 2008 my $pkg = caller;
1762 2009
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 2011
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 2013}
1768 2014
1769# also paths starting with '/' 2015# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 2017
1772sub thawer_merge { 2018sub thawer_merge {
1773 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1774 2020
1775 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1780} 2026}
1781 2027
1782sub normalise { 2028sub normalise {
1783 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1784 2030
1785 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1786 2032
1787 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1788 2034
1789 # map plan: 2035 # map plan:
1790 # 2036 #
1805 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1806 $path = "$base/$path"; 2052 $path = "$base/$path";
1807 } 2053 }
1808 2054
1809 for ($path) { 2055 for ($path) {
1810 redo if s{//}{/};
1811 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1812 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1813 } 2058 }
1814 2059
1815 $path 2060 $path
1829 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1830 return $self; 2075 return $self;
1831 } 2076 }
1832 } 2077 }
1833 2078
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 2080 ()
1836} 2081}
1837 2082
2083# may re-bless or do other evil things
1838sub init { 2084sub init {
1839 my ($self) = @_; 2085 my ($self) = @_;
1840 2086
1841 $self 2087 $self
1842} 2088}
1907 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1908 2154
1909 1 2155 1
1910} 2156}
1911 2157
2158# used to laod the header of an original map
1912sub load_header_orig { 2159sub load_header_orig {
1913 my ($self) = @_; 2160 my ($self) = @_;
1914 2161
1915 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1916} 2163}
1917 2164
2165# used to laod the header of an instantiated map
1918sub load_header_temp { 2166sub load_header_temp {
1919 my ($self) = @_; 2167 my ($self) = @_;
1920 2168
1921 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1922} 2170}
1923 2171
2172# called after loading the header from an instantiated map
1924sub prepare_temp { 2173sub prepare_temp {
1925 my ($self) = @_; 2174 my ($self) = @_;
1926 2175
1927 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1928 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1929 # safety 2178 # safety
1930 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1931 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1932} 2181}
1933 2182
2183# called after loading the header from an original map
1934sub prepare_orig { 2184sub prepare_orig {
1935 my ($self) = @_; 2185 my ($self) = @_;
1936 2186
1937 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1938 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1962 2212
1963sub find; 2213sub find;
1964sub find { 2214sub find {
1965 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1966 2216
2217 cf::cede_to_tick;
2218
1967 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1968 2220
1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1970 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1971 2223
1972 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
1989 2241
1990 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
1991 } 2243 }
1992} 2244}
1993 2245
1994sub pre_load { } 2246sub pre_load { }
1995sub post_load { } 2247#sub post_load { } # XS
1996 2248
1997sub load { 2249sub load {
1998 my ($self) = @_; 2250 my ($self) = @_;
1999 2251
2000 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
2003 2255
2004 { 2256 {
2005 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2006 2258
2007 return unless $self->valid; 2259 return unless $self->valid;
2008 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2009
2010 $self->in_memory (cf::MAP_LOADING);
2011 2261
2012 $self->alloc; 2262 $self->alloc;
2013 2263
2014 $self->pre_load; 2264 $self->pre_load;
2015 cf::cede_to_tick; 2265 cf::cede_to_tick;
2016 2266
2267 if (exists $self->{load_path}) {
2017 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2018 $f->skip_block; 2269 $f->skip_block;
2019 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2020 or return; 2271 or return;
2021 2272
2022 $self->post_load_original 2273 $self->post_load_original
2023 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2024 2275
2025 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2026 utf8::encode $uniq; 2277 utf8::encode $uniq;
2027 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2028 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2029 $self->clear_unique_items; 2280 $self->clear_unique_items;
2030 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2031 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2032 } 2284 }
2033 } 2285 }
2034 }
2035 2286
2036 $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);
2037 2294
2038 cf::cede_to_tick; 2295 cf::cede_to_tick;
2039 # now do the right thing for maps 2296 # now do the right thing for maps
2040 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2041 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2045 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2046 $self->decay_objects; 2303 $self->decay_objects;
2047 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2048 $self->update_buttons; 2305 $self->update_buttons;
2049 cf::cede_to_tick; 2306 cf::cede_to_tick;
2050 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2051 } 2308 }
2052 2309
2053 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2055
2056 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2312 }
2058 2313
2059 $self->post_load; 2314 $self->post_load;
2060}
2061 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
2062sub customise_for { 2322sub customise_for {
2063 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2064 2324
2065 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2326 if $self->per_player;
2069# if $self->per_party; 2329# if $self->per_party;
2070 2330
2071 $self 2331 $self
2072} 2332}
2073 2333
2074# find and load all maps in the 3x3 area around a map
2075sub load_neighbours {
2076 my ($map) = @_;
2077
2078 my @neigh; # diagonal neighbours
2079
2080 for (0 .. 3) {
2081 my $neigh = $map->tile_path ($_)
2082 or next;
2083 $neigh = find $neigh, $map
2084 or next;
2085 $neigh->load;
2086
2087 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 }
2091
2092 for (grep defined $_->[0], @neigh) {
2093 my ($path, $origin) = @$_;
2094 my $neigh = find $path, $origin
2095 or next;
2096 $neigh->load;
2097 }
2098}
2099
2100sub find_sync { 2334sub find_sync {
2101 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2102 2336
2103 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
2104} 2342}
2105 2343
2106sub do_load_sync { 2344sub do_load_sync {
2107 my ($map) = @_; 2345 my ($map) = @_;
2108 2346
2347 # it's a bug to call this from the main context
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2111 2350
2112 cf::sync_job { $map->load }; 2351 $map->load;
2113} 2352}
2114 2353
2115our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2117 2356
2118sub find_async { 2357sub find_async {
2119 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2120 2359
2121 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2122 2361
2123 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2125 } 2364 }
2126 2365
2127 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2128 2367
2129 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2143 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2144 2383
2145 () 2384 ()
2146} 2385}
2147 2386
2387# common code, used by both ->save and ->swapout
2148sub save { 2388sub _save {
2149 my ($self) = @_; 2389 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2390
2153 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2154 2392
2155 return unless $self->dirty; 2393 return unless $self->dirty;
2156 2394
2176 } else { 2414 } else {
2177 $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);
2178 } 2416 }
2179} 2417}
2180 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2181sub swap_out { 2427sub swap_out {
2182 my ($self) = @_; 2428 my ($self) = @_;
2183 2429
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2189 return if $self->players; 2434 return if $self->players;
2190 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
2191 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2192 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
2193 $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};
2194 2486
2195 $self->deactivate; 2487 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2489 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path, "\n";
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2490
2243 $self->unlink_save; 2491 $self->unlink_save;
2244 $self->destroy; 2492 $self->destroy;
2245} 2493}
2246 2494
2254 2502
2255 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2256 2504
2257 $self->unlink_save; 2505 $self->unlink_save;
2258 2506
2259 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2512
2321 : normalise $_ 2569 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2571 ]
2324} 2572}
2325 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
2326=back 2606=back
2327 2607
2328=head3 cf::object 2608=head3 cf::object
2329 2609
2330=cut 2610=cut
2462 2742
2463Freezes 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}>).
2464 2744
2465The 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.
2466for 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,
2467though, 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
2468map. 2748map.
2469 2749
2470Will never block. 2750Will never block.
2471 2751
2472=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2494 my ($self) = @_; 2774 my ($self) = @_;
2495 2775
2496 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2497 2777
2778 ++$self->{_link_recursion};
2779
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2781
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2502 2784
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2786}
2505 2787
2506sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2508 2790
2525 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2527 2809
2528 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2531 2813
2532 $map->load; 2814 $map->load;
2533 $map->load_neighbours;
2534 2815
2535 return unless $self->contr->active; 2816 return unless $self->contr->active;
2536 2817
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2539 2820 # entering was successful
2821 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2823 $self->activate_recursive;
2542} 2824 }
2543 2825
2826}
2827
2544=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)]])
2545 2829
2546Moves 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
2547her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2548that 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
2549the 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
2556 2840
2557our $GOTOGEN; 2841our $GOTOGEN;
2558 2842
2559sub cf::object::player::goto { 2843sub cf::object::player::goto {
2560 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 }
2561 2851
2562 # 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
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2854
2565 $self->enter_link; 2855 $self->enter_link;
2585 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2586 } 2876 }
2587 } 2877 }
2588 2878
2589 my $map = eval { 2879 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2591 2881
2592 if ($map) { 2882 if ($map) {
2593 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2885 } else {
2596 $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);
2597 } 2887 }
2598 2888
2599 $map 2889 $map
2607 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2610 } 2900 }
2611 2901
2612 $done->() if $done; 2902 $done->($self) if $done;
2613 })->prio (1); 2903 })->prio (1);
2614} 2904}
2615 2905
2616=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2617 2907
2685 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2686 2976
2687 unless (eval { 2977 unless (eval {
2688 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2689 2979
2690 # random map handling
2691 {
2692 my $guard = cf::lock_acquire "exit_prepare:$exit";
2693
2694 prepare_random_map $exit
2695 if $exit->slaying eq "/!";
2696 }
2697
2698 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2699 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2700 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 }
2701 3006
2702 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2703 3008
2704 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2705 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2710 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2711 . "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. "
2712 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2713 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2714 3019
2715 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2716 $self->leave_link; 3021 $self->leave_link;
2717 } 3022 }
2718 })->prio (1); 3023 })->prio (1);
2719} 3024}
2720 3025
2732sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2733 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2734 3039
2735 utf8::encode $text; 3040 utf8::encode $text;
2736 $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);
2737} 3067}
2738 3068
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 3070
2741Send 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
2745 3075
2746=cut 3076=cut
2747 3077
2748# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2750 "c/identify" => { 3086 "c/identify" => {
2751 id => "infobox", 3087 id => "infobox",
2752 title => "Identify", 3088 title => "Identify",
2753 reply => undef, 3089 reply => undef,
2754 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2756 "c/examine" => { 3092 "c/examine" => {
2757 id => "infobox", 3093 id => "infobox",
2758 title => "Examine", 3094 title => "Examine",
2759 reply => undef, 3095 reply => undef,
2760 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",
2761 }, 3103 },
2762 "c/book" => { 3104 "c/book" => {
2763 id => "infobox", 3105 id => "infobox",
2764 title => "Book", 3106 title => "Book",
2765 reply => undef, 3107 reply => undef,
2881 my $pkt = "msg " 3223 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3226 );
2885 3227
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2897} 3229}
2898 3230
2899=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2900 3232
2901Sends an ext event to the client. 3233Sends an ext event to the client.
2904 3236
2905sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2907 3239
2908 if ($self->extcmd == 2) { 3240 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3242 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3243 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3244 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3245 }
2914} 3246}
2915 3247
2916=item $client->ext_reply ($msgid, @msg) 3248=item $client->ext_reply ($msgid, @msg)
2917 3249
2920=cut 3252=cut
2921 3253
2922sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
2924 3256
2925 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 }
2932} 3260}
2933 3261
2934=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
2935 3263
2936Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
2991 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
2992 3320
2993 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2994 3322
2995 if (ref $msg) { 3323 if (ref $msg) {
2996 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2997 "ARRAY" eq ref $msg
2998 ? @$msg
2999 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3000 3325
3001 my @reply; 3326 my @reply;
3002 3327
3003 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3004 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
3006 3331
3007 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
3008 if $reply; 3333 if $reply;
3009 3334
3010 } else { 3335 } else {
3011 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";
3012 } 3337 }
3013 3338
3014 cf::override; 3339 cf::override;
3015 }, 3340 },
3016); 3341);
3036 3361
3037 $coro 3362 $coro
3038} 3363}
3039 3364
3040cf::client->attach ( 3365cf::client->attach (
3041 on_destroy => sub { 3366 on_client_destroy => sub {
3042 my ($ns) = @_; 3367 my ($ns) = @_;
3043 3368
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3369 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3370 },
3046); 3371);
3062our $safe_hole = new Safe::Hole; 3387our $safe_hole = new Safe::Hole;
3063 3388
3064$SIG{FPE} = 'IGNORE'; 3389$SIG{FPE} = 'IGNORE';
3065 3390
3066$safe->permit_only (Opcode::opset qw( 3391$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3392 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3393 grepstart grepwhile mapstart mapwhile
3069 sort time 3394 sort time
3070)); 3395));
3071 3396
3072# here we export the classes and methods available to script code 3397# here we export the classes and methods available to script code
3097 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3101) { 3426) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3429 for @funs;
3106} 3430}
3107 3431
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3448 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3449 $qcode =~ s/\n/\\n/g;
3126 3450
3127 %vars = (_dummy => 0) unless %vars; 3451 %vars = (_dummy => 0) unless %vars;
3128 3452
3453 my @res;
3129 local $_; 3454 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3455
3132 my $eval = 3456 my $eval =
3133 "do {\n" 3457 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3458 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3459 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3460 . $code
3137 . "\n}" 3461 . "\n}"
3138 ; 3462 ;
3139 3463
3464 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3465 sub_generation_inc;
3466 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3467 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 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 }
3143 3473
3144 if ($@) { 3474 if ($@) {
3145 warn "$@"; 3475 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3148 } 3478 }
3149 3479
3150 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3151} 3481}
3152 3482
3166=cut 3496=cut
3167 3497
3168sub register_script_function { 3498sub register_script_function {
3169 my ($fun, $cb) = @_; 3499 my ($fun, $cb) = @_;
3170 3500
3171 no strict 'refs'; 3501 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3502 *$fun = $safe_hole->wrap ($cb);
3173} 3503}
3174 3504
3175=back 3505=back
3176 3506
3177=cut 3507=cut
3178 3508
3179############################################################################# 3509#############################################################################
3180# the server's init and main functions 3510# the server's init and main functions
3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3514# internal api, not fianlised
3515sub add_face {
3516 my ($name, $type, $data) = @_;
3517
3518 my $idx = cf::face::find $name;
3519
3520 if ($idx) {
3521 delete $FACEHASH{cf::face::get_chksum $idx};
3522 } else {
3523 $idx = cf::face::alloc $name;
3524 }
3525
3526 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3527
3528 cf::face::set_type $idx, $type;
3529 cf::face::set_data $idx, 0, $data, $hash;
3530 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3531 $FACEHASH{$hash} = $idx;#d#
3532
3533 $idx
3534}
3181 3535
3182sub load_facedata($) { 3536sub load_facedata($) {
3183 my ($path) = @_; 3537 my ($path) = @_;
3184 3538
3185 # HACK to clear player env face cache, we need some signal framework 3539 # HACK to clear player env face cache, we need some signal framework
3186 # for this (global event?) 3540 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3541 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3542
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3543 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3544
3191 warn "loading facedata from $path\n"; 3545 trace "loading facedata from $path\n";
3192 3546
3193 my $facedata; 3547 my $facedata = decode_storable load_file $path;
3194 0 < aio_load $path, $facedata
3195 or die "$path: $!";
3196
3197 $facedata = Coro::Storable::thaw $facedata;
3198 3548
3199 $facedata->{version} == 2 3549 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3550 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3551
3202 # patch in the exptable
3203 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3206 };
3207 cf::cede_to_tick; 3552 cf::cede_to_tick;
3208 3553
3209 { 3554 {
3210 my $faces = $facedata->{faceinfo}; 3555 my $faces = $facedata->{faceinfo};
3211 3556
3212 while (my ($face, $info) = each %$faces) { 3557 for my $face (sort keys %$faces) {
3558 my $info = $faces->{$face};
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3559 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3560
3215 cf::face::set_visibility $idx, $info->{visibility}; 3561 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3562 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3563 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3564 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3565 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3566 $FACEHASH{$info->{hash64}} = $idx;#d#
3219 3567
3220 cf::cede_to_tick; 3568 cf::cede_to_tick;
3221 } 3569 }
3222 3570
3223 while (my ($face, $info) = each %$faces) { 3571 while (my ($face, $info) = each %$faces) {
3228 3576
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3577 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3578 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3579 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3580 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3581 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3582 }
3235 3583
3236 cf::cede_to_tick; 3584 cf::cede_to_tick;
3237 } 3585 }
3238 } 3586 }
3247 3595
3248 cf::anim::invalidate_all; # d'oh 3596 cf::anim::invalidate_all; # d'oh
3249 } 3597 }
3250 3598
3251 { 3599 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3600 my $res = $facedata->{resource};
3255 3601
3256 while (my ($name, $info) = each %$res) { 3602 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3603 if (defined (my $type = $info->{type})) {
3604 # TODO: different hash - must free and use new index, or cache ixface data queue
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3605 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3606
3261 if ($info->{type} & 1) {
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3607 cf::face::set_type $idx, $type;
3608 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3609 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3610 $FACEHASH{$info->{hash}} = $idx;#d#
3276 } else { 3611 } else {
3277 $RESOURCE{$name} = $info; 3612# $RESOURCE{$name} = $info; # unused
3278 } 3613 }
3279 3614
3280 cf::cede_to_tick; 3615 cf::cede_to_tick;
3281 } 3616 }
3282 } 3617 }
3283 3618
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3619 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3620
3286 1 3621 1
3287} 3622}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3623
3309register_exticmd fx_want => sub { 3624register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3625 my ($ns, $want) = @_;
3311 3626
3312 while (my ($k, $v) = each %$want) { 3627 while (my ($k, $v) = each %$want) {
3320 my $status = load_resource_file_ $_[0]; 3635 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100; 3636 get_slot 0.1, 100;
3322 cf::arch::commit_load; 3637 cf::arch::commit_load;
3323 3638
3324 $status 3639 $status
3640}
3641
3642sub reload_exp_table {
3643 _reload_exp_table;
3644
3645 add_face "res/exp_table" => FT_RSRC,
3646 JSON::XS->new->utf8->canonical->encode (
3647 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3648 );
3649}
3650
3651sub reload_materials {
3652 _reload_materials;
3325} 3653}
3326 3654
3327sub reload_regions { 3655sub reload_regions {
3328 # HACK to clear player env face cache, we need some signal framework 3656 # HACK to clear player env face cache, we need some signal framework
3329 # for this (global event?) 3657 # for this (global event?)
3344} 3672}
3345 3673
3346sub reload_archetypes { 3674sub reload_archetypes {
3347 load_resource_file "$DATADIR/archetypes" 3675 load_resource_file "$DATADIR/archetypes"
3348 or die "unable to load archetypes\n"; 3676 or die "unable to load archetypes\n";
3677
3678 add_face "res/skill_info" => FT_RSRC,
3679 JSON::XS->new->utf8->canonical->encode (
3680 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3681 );
3682 add_face "res/spell_paths" => FT_RSRC,
3683 JSON::XS->new->utf8->canonical->encode (
3684 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3685 );
3349} 3686}
3350 3687
3351sub reload_treasures { 3688sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3689 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3690 or die "unable to load treasurelists\n";
3354} 3691}
3355 3692
3693sub reload_sound {
3694 trace "loading sound config from $DATADIR/sound\n";
3695
3696 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3697
3698 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3699 my $sound = $soundconf->{compat}[$_]
3700 or next;
3701
3702 my $face = cf::face::find "sound/$sound->[1]";
3703 cf::sound::set $sound->[0] => $face;
3704 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3705 }
3706
3707 while (my ($k, $v) = each %{$soundconf->{event}}) {
3708 my $face = cf::face::find "sound/$v";
3709 cf::sound::set $k => $face;
3710 }
3711}
3712
3356sub reload_resources { 3713sub reload_resources {
3357 warn "reloading resource files...\n"; 3714 trace "reloading resource files...\n";
3358 3715
3716 reload_materials;
3359 reload_facedata; 3717 reload_facedata;
3718 reload_exp_table;
3719 reload_sound;
3360 reload_archetypes; 3720 reload_archetypes;
3361 reload_regions; 3721 reload_regions;
3362 reload_treasures; 3722 reload_treasures;
3363 3723
3364 warn "finished reloading resource files\n"; 3724 trace "finished reloading resource files\n";
3365} 3725}
3366 3726
3367sub reload_config { 3727sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3728 trace "reloading config file...\n";
3369 or return;
3370 3729
3371 local $/; 3730 my $config = load_file "$CONFDIR/config";
3372 *CFG = YAML::Load <$fh>; 3731 utf8::decode $config;
3732 *CFG = decode_yaml $config;
3373 3733
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3734 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3735
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3736 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3737 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3738
3379 if (exists $CFG{mlockall}) { 3739 if (exists $CFG{mlockall}) {
3403 seek $fh, 0, 0; 3763 seek $fh, 0, 0;
3404 print $fh $$; 3764 print $fh $$;
3405} 3765}
3406 3766
3407sub main_loop { 3767sub main_loop {
3408 warn "EV::loop starting\n"; 3768 trace "EV::loop starting\n";
3409 if (1) { 3769 if (1) {
3410 EV::loop; 3770 EV::loop;
3411 } 3771 }
3412 warn "EV::loop returned\n"; 3772 trace "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP; 3773 goto &main_loop unless $REALLY_UNLOOP;
3414} 3774}
3415 3775
3416sub main { 3776sub main {
3417 cf::init_globals; # initialise logging 3777 cf::init_globals; # initialise logging
3418 3778
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3779 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3780 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3781 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3782 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423 3783
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3784 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430 3785
3431 # we must not ever block the main coroutine 3786 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3787 $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3788 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3789 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3790 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3791 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3792 })->prio (Coro::PRIO_MAX);
3438 }; 3793 };
3439 3794
3440 evthread_start IO::AIO::poll_fileno; 3795 evthread_start IO::AIO::poll_fileno;
3441 3796
3442 cf::sync_job { 3797 cf::sync_job {
3798 cf::incloader::init ();
3799
3800 cf::init_anim;
3801 cf::init_attackmess;
3802 cf::init_dynamic;
3803
3804 cf::load_settings;
3805
3443 reload_resources; 3806 reload_resources;
3444 reload_config; 3807 reload_config;
3445 db_init; 3808 db_init;
3446 3809
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3810 cf::init_uuid;
3450 cf::init_signals; 3811 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3812 cf::init_skills;
3453 3813
3454 cf::init_beforeplay; 3814 cf::init_beforeplay;
3455 3815
3456 atomic; 3816 atomic;
3461 3821
3462 # no (long-running) fork's whatsoever before this point(!) 3822 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX (); 3823 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3824 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465 3825
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3826 cf::_post_init 0;
3467 }; 3827 };
3468 3828
3829 cf::object::thawer::errors_are_fatal 0;
3830 info "parse errors in files are no longer fatal from this point on.\n";
3831
3832 AE::postpone {
3833 undef &main; # free gobs of memory :)
3834 };
3835
3469 main_loop; 3836 goto &main_loop;
3470} 3837}
3471 3838
3472############################################################################# 3839#############################################################################
3473# initialisation and cleanup 3840# initialisation and cleanup
3474 3841
3475# install some emergency cleanup handlers 3842# install some emergency cleanup handlers
3476BEGIN { 3843BEGIN {
3477 our %SIGWATCHER = (); 3844 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3845 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3846 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3847 cf::cleanup "SIG$signal";
3481 }; 3848 };
3482 } 3849 }
3483} 3850}
3484 3851
3485sub write_runtime_sync { 3852sub write_runtime_sync {
3853 my $t0 = AE::time;
3854
3486 # first touch the runtime file to show we are still running: 3855 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3856 # the fsync below can take a very very long time.
3488 3857
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3858 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3859
3491 my $guard = cf::lock_acquire "write_runtime"; 3860 my $guard = cf::lock_acquire "write_runtime";
3492 3861
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3862 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3863 or return;
3495 3864
3496 my $value = $cf::RUNTIME + 90 + 10; 3865 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3866 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3867 # 60 allows for the watchdog to kill the server.
3511 or return; 3880 or return;
3512 3881
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3882 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3883 and return;
3515 3884
3516 warn "runtime file written.\n"; 3885 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3886
3518 1 3887 1
3519} 3888}
3520 3889
3521our $uuid_lock; 3890our $uuid_lock;
3533 or return; 3902 or return;
3534 3903
3535 my $value = uuid_seq uuid_cur; 3904 my $value = uuid_seq uuid_cur;
3536 3905
3537 unless ($value) { 3906 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n"; 3907 info "cowardly refusing to write zero uuid value!\n";
3539 return; 3908 return;
3540 } 3909 }
3541 3910
3542 my $value = uuid_str $value + $uuid_skip; 3911 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0; 3912 $uuid_skip = 0;
3553 or return; 3922 or return;
3554 3923
3555 aio_rename "$uuid~", $uuid 3924 aio_rename "$uuid~", $uuid
3556 and return; 3925 and return;
3557 3926
3558 warn "uuid file written ($value).\n"; 3927 trace "uuid file written ($value).\n";
3559 3928
3560 1 3929 1
3561 3930
3562} 3931}
3563 3932
3569} 3938}
3570 3939
3571sub emergency_save() { 3940sub emergency_save() {
3572 my $freeze_guard = cf::freeze_mainloop; 3941 my $freeze_guard = cf::freeze_mainloop;
3573 3942
3574 warn "emergency_perl_save: enter\n"; 3943 info "emergency_perl_save: enter\n";
3944
3945 # this is a trade-off: we want to be very quick here, so
3946 # save all maps without fsync, and later call a global sync
3947 # (which in turn might be very very slow)
3948 local $USE_FSYNC = 0;
3575 3949
3576 cf::sync_job { 3950 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so 3951 cf::write_runtime_sync; # external watchdog should not bark
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581 3952
3582 # use a peculiar iteration method to avoid tripping on perl 3953 # use a peculiar iteration method to avoid tripping on perl
3583 # refcount bugs in for. also avoids problems with players 3954 # refcount bugs in for. also avoids problems with players
3584 # and maps saved/destroyed asynchronously. 3955 # and maps saved/destroyed asynchronously.
3585 warn "emergency_perl_save: begin player save\n"; 3956 info "emergency_perl_save: begin player save\n";
3586 for my $login (keys %cf::PLAYER) { 3957 for my $login (keys %cf::PLAYER) {
3587 my $pl = $cf::PLAYER{$login} or next; 3958 my $pl = $cf::PLAYER{$login} or next;
3588 $pl->valid or next; 3959 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3960 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590 $pl->save; 3961 $pl->save;
3591 } 3962 }
3592 warn "emergency_perl_save: end player save\n"; 3963 info "emergency_perl_save: end player save\n";
3593 3964
3965 cf::write_runtime_sync; # external watchdog should not bark
3966
3594 warn "emergency_perl_save: begin map save\n"; 3967 info "emergency_perl_save: begin map save\n";
3595 for my $path (keys %cf::MAP) { 3968 for my $path (keys %cf::MAP) {
3596 my $map = $cf::MAP{$path} or next; 3969 my $map = $cf::MAP{$path} or next;
3597 $map->valid or next; 3970 $map->valid or next;
3598 $map->save; 3971 $map->save;
3599 } 3972 }
3600 warn "emergency_perl_save: end map save\n"; 3973 info "emergency_perl_save: end map save\n";
3601 3974
3975 cf::write_runtime_sync; # external watchdog should not bark
3976
3602 warn "emergency_perl_save: begin database checkpoint\n"; 3977 info "emergency_perl_save: begin database checkpoint\n";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3978 BDB::db_env_txn_checkpoint $DB_ENV;
3604 warn "emergency_perl_save: end database checkpoint\n"; 3979 info "emergency_perl_save: end database checkpoint\n";
3605 3980
3606 warn "emergency_perl_save: begin write uuid\n"; 3981 info "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1; 3982 write_uuid_sync 1;
3608 warn "emergency_perl_save: end write uuid\n"; 3983 info "emergency_perl_save: end write uuid\n";
3984
3985 cf::write_runtime_sync; # external watchdog should not bark
3986
3987 trace "emergency_perl_save: syncing database to disk";
3988 BDB::db_env_txn_checkpoint $DB_ENV;
3989
3990 info "emergency_perl_save: starting sync\n";
3991 IO::AIO::aio_sync sub {
3992 info "emergency_perl_save: finished sync\n";
3993 };
3994
3995 cf::write_runtime_sync; # external watchdog should not bark
3996
3997 trace "emergency_perl_save: flushing outstanding aio requests";
3998 while (IO::AIO::nreqs || BDB::nreqs) {
3999 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4000 }
4001
4002 cf::write_runtime_sync; # external watchdog should not bark
3609 }; 4003 };
3610 4004
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3616 warn "emergency_perl_save: leave\n"; 4005 info "emergency_perl_save: leave\n";
3617} 4006}
3618 4007
3619sub post_cleanup { 4008sub post_cleanup {
3620 my ($make_core) = @_; 4009 my ($make_core) = @_;
3621 4010
4011 IO::AIO::flush;
4012
3622 warn Carp::longmess "post_cleanup backtrace" 4013 error Carp::longmess "post_cleanup backtrace"
3623 if $make_core; 4014 if $make_core;
3624 4015
3625 my $fh = pidfile; 4016 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$; 4017 unlink $PIDFILE if <$fh> == $$;
3627} 4018}
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4038 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 4039 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 4040 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4041# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 4042 }
3652 warn "cleared package $pkg\n";#d#
3653} 4043}
3654 4044
3655sub do_reload_perl() { 4045sub do_reload_perl() {
3656 # can/must only be called in main 4046 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 4047 unless (in_main) {
3658 warn "can only reload from main coroutine"; 4048 error "can only reload from main coroutine";
3659 return; 4049 return;
3660 } 4050 }
3661 4051
3662 return if $RELOAD++; 4052 return if $RELOAD++;
3663 4053
3664 my $t1 = EV::time; 4054 my $t1 = AE::time;
3665 4055
3666 while ($RELOAD) { 4056 while ($RELOAD) {
3667 warn "reloading..."; 4057 cf::get_slot 0.1, -1, "reload_perl";
4058 info "perl_reload: reloading...";
3668 4059
3669 warn "entering sync_job"; 4060 trace "perl_reload: entering sync_job";
3670 4061
3671 cf::sync_job { 4062 cf::sync_job {
3672 cf::write_runtime_sync; # external watchdog should not bark
3673 cf::emergency_save; 4063 #cf::emergency_save;
3674 cf::write_runtime_sync; # external watchdog should not bark
3675 4064
3676 warn "syncing database to disk";
3677 BDB::db_env_txn_checkpoint $DB_ENV;
3678
3679 # if anything goes wrong in here, we should simply crash as we already saved
3680
3681 warn "flushing outstanding aio requests";
3682 while (IO::AIO::nreqs || BDB::nreqs) {
3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3684 }
3685
3686 warn "cancelling all extension coros"; 4065 trace "perl_reload: cancelling all extension coros";
3687 $_->cancel for values %EXT_CORO; 4066 $_->cancel for values %EXT_CORO;
3688 %EXT_CORO = (); 4067 %EXT_CORO = ();
3689 4068
3690 warn "removing commands"; 4069 trace "perl_reload: removing commands";
3691 %COMMAND = (); 4070 %COMMAND = ();
3692 4071
3693 warn "removing ext/exti commands"; 4072 trace "perl_reload: removing ext/exti commands";
3694 %EXTCMD = (); 4073 %EXTCMD = ();
3695 %EXTICMD = (); 4074 %EXTICMD = ();
3696 4075
3697 warn "unloading/nuking all extensions"; 4076 trace "perl_reload: unloading/nuking all extensions";
3698 for my $pkg (@EXTS) { 4077 for my $pkg (@EXTS) {
3699 warn "... unloading $pkg"; 4078 trace "... unloading $pkg";
3700 4079
3701 if (my $cb = $pkg->can ("unload")) { 4080 if (my $cb = $pkg->can ("unload")) {
3702 eval { 4081 eval {
3703 $cb->($pkg); 4082 $cb->($pkg);
3704 1 4083 1
3705 } or warn "$pkg unloaded, but with errors: $@"; 4084 } or error "$pkg unloaded, but with errors: $@";
3706 } 4085 }
3707 4086
3708 warn "... clearing $pkg"; 4087 trace "... clearing $pkg";
3709 clear_package $pkg; 4088 clear_package $pkg;
3710 } 4089 }
3711 4090
3712 warn "unloading all perl modules loaded from $LIBDIR"; 4091 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) { 4092 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4093 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715 4094
3716 warn "... unloading $k"; 4095 trace "... unloading $k";
3717 delete $INC{$k}; 4096 delete $INC{$k};
3718 4097
3719 $k =~ s/\.pm$//; 4098 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g; 4099 $k =~ s/\//::/g;
3721 4100
3724 } 4103 }
3725 4104
3726 clear_package $k; 4105 clear_package $k;
3727 } 4106 }
3728 4107
3729 warn "getting rid of safe::, as good as possible"; 4108 trace "perl_reload: getting rid of safe::, as good as possible";
3730 clear_package "safe::$_" 4109 clear_package "safe::$_"
3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4110 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3732 4111
3733 warn "unloading cf.pm \"a bit\""; 4112 trace "perl_reload: unloading cf.pm \"a bit\"";
3734 delete $INC{"cf.pm"}; 4113 delete $INC{"cf.pm"};
3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4114 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736 4115
3737 # don't, removes xs symbols, too, 4116 # don't, removes xs symbols, too,
3738 # and global variables created in xs 4117 # and global variables created in xs
3739 #clear_package __PACKAGE__; 4118 #clear_package __PACKAGE__;
3740 4119
3741 warn "unload completed, starting to reload now"; 4120 info "perl_reload: unload completed, starting to reload now";
3742 4121
3743 warn "reloading cf.pm"; 4122 trace "perl_reload: reloading cf.pm";
3744 require cf; 4123 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4124 cf::_connect_to_perl_1;
3746 4125
3747 warn "loading config and database again"; 4126 trace "perl_reload: loading config and database again";
3748 cf::reload_config; 4127 cf::reload_config;
3749 4128
3750 warn "loading extensions"; 4129 trace "perl_reload: loading extensions";
3751 cf::load_extensions; 4130 cf::load_extensions;
3752 4131
3753 if ($REATTACH_ON_RELOAD) { 4132 if ($REATTACH_ON_RELOAD) {
3754 warn "reattaching attachments to objects/players"; 4133 trace "perl_reload: reattaching attachments to objects/players";
3755 _global_reattach; # objects, sockets 4134 _global_reattach; # objects, sockets
3756 warn "reattaching attachments to maps"; 4135 trace "perl_reload: reattaching attachments to maps";
3757 reattach $_ for values %MAP; 4136 reattach $_ for values %MAP;
3758 warn "reattaching attachments to players"; 4137 trace "perl_reload: reattaching attachments to players";
3759 reattach $_ for values %PLAYER; 4138 reattach $_ for values %PLAYER;
3760 } 4139 }
3761 4140
3762 warn "running post_init jobs"; 4141 cf::_post_init 1;
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3764 4142
3765 warn "leaving sync_job"; 4143 trace "perl_reload: leaving sync_job";
3766 4144
3767 1 4145 1
3768 } or do { 4146 } or do {
3769 warn $@; 4147 error $@;
3770 cf::cleanup "error while reloading, exiting."; 4148 cf::cleanup "perl_reload: error, exiting.";
3771 }; 4149 };
3772 4150
3773 warn "reloaded";
3774 --$RELOAD; 4151 --$RELOAD;
3775 } 4152 }
3776 4153
3777 $t1 = EV::time - $t1; 4154 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 4155 info "perl_reload: completed in ${t1}s\n";
3779}; 4156};
3780 4157
3781our $RELOAD_WATCHER; # used only during reload 4158our $RELOAD_WATCHER; # used only during reload
3782 4159
3783sub reload_perl() { 4160sub reload_perl() {
3785 # coro crashes during coro_state_free->destroy here. 4162 # coro crashes during coro_state_free->destroy here.
3786 4163
3787 $RELOAD_WATCHER ||= cf::async { 4164 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 4165 Coro::AIO::aio_wait cache_extensions;
3789 4166
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4167 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 4168 do_reload_perl;
3792 undef $RELOAD_WATCHER; 4169 undef $RELOAD_WATCHER;
3793 }; 4170 };
3794 }; 4171 };
3795} 4172}
3804 reload_perl; 4181 reload_perl;
3805 }; 4182 };
3806 } 4183 }
3807}; 4184};
3808 4185
3809unshift @INC, $LIBDIR; 4186#############################################################################
3810 4187
3811my $bug_warning = 0; 4188my $bug_warning = 0;
3812 4189
3813our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN;
3815
3816sub wait_for_tick { 4190sub wait_for_tick() {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 4191 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3818 4192
3819 my $signal = new Coro::Signal; 4193 $WAIT_FOR_TICK->wait;
3820 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait;
3822} 4194}
3823 4195
3824sub wait_for_tick_begin { 4196sub wait_for_tick_begin() {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 4197 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3826 4198
3827 my $signal = new Coro::Signal; 4199 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 4200 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 4201 $signal->wait;
3830} 4202}
3834 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4206 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3835 unless ++$bug_warning > 10; 4207 unless ++$bug_warning > 10;
3836 return; 4208 return;
3837 } 4209 }
3838 4210
3839 cf::server_tick; # one server iteration 4211 cf::one_tick; # one server iteration
4212
4213 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3840 4214
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4215 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4216 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3843 Coro::async_pool { 4217 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4218 $Coro::current->{desc} = "runtime saver";
3845 write_runtime_sync 4219 write_runtime_sync
3846 or warn "ERROR: unable to write runtime file: $!"; 4220 or error "ERROR: unable to write runtime file: $!";
3847 }; 4221 };
3848 } 4222 }
3849 4223
3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4224 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851 $sig->send; 4225 $sig->send;
3852 } 4226 }
3853 while (my $sig = shift @WAIT_FOR_TICK) { 4227 $WAIT_FOR_TICK->broadcast;
3854 $sig->send;
3855 }
3856 4228
3857 $LOAD = ($NOW - $TICK_START) / $TICK; 4229 $LOAD = ($NOW - $TICK_START) / $TICK;
3858 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4230 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3859 4231
3860 if (0) { 4232 if (0) {
3861 if ($NEXT_TICK) { 4233 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK; 4234 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4235 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d# 4236 debug "jitter $JITTER\n";#d#
3865 } 4237 }
3866 } 4238 }
3867} 4239}
3868 4240
3869{ 4241{
3870 # configure BDB 4242 # configure BDB
3871 4243
3872 BDB::min_parallel 8; 4244 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4245 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4246 #$AnyEvent::BDB::WATCHER->priority (1);
3875 4247
3876 unless ($DB_ENV) { 4248 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4249 $DB_ENV = BDB::db_env_create;
3878 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4250 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3879 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4251 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3914 IO::AIO::min_parallel 8; 4286 IO::AIO::min_parallel 8;
3915 IO::AIO::max_poll_time $TICK * 0.1; 4287 IO::AIO::max_poll_time $TICK * 0.1;
3916 undef $AnyEvent::AIO::WATCHER; 4288 undef $AnyEvent::AIO::WATCHER;
3917} 4289}
3918 4290
3919my $_log_backtrace; 4291our $_log_backtrace;
4292our $_log_backtrace_last;
3920 4293
3921sub _log_backtrace { 4294sub _log_backtrace {
3922 my ($msg, @addr) = @_; 4295 my ($msg, @addr) = @_;
3923 4296
3924 $msg =~ s/\n//; 4297 $msg =~ s/\n$//;
3925 4298
4299 if ($_log_backtrace_last eq $msg) {
4300 LOG llevInfo, "[ABT] $msg\n";
4301 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3926 # limit the # of concurrent backtraces 4302 # limit the # of concurrent backtraces
3927 if ($_log_backtrace < 2) { 4303 } elsif ($_log_backtrace < 2) {
4304 $_log_backtrace_last = $msg;
3928 ++$_log_backtrace; 4305 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg; 4306 my $perl_bt = Carp::longmess $msg;
3930 async { 4307 async {
3931 $Coro::current->{desc} = "abt $msg"; 4308 $Coro::current->{desc} = "abt $msg";
3932 4309
3952 LOG llevInfo, "[ABT] $_\n" for @bt; 4329 LOG llevInfo, "[ABT] $_\n" for @bt;
3953 --$_log_backtrace; 4330 --$_log_backtrace;
3954 }; 4331 };
3955 } else { 4332 } else {
3956 LOG llevInfo, "[ABT] $msg\n"; 4333 LOG llevInfo, "[ABT] $msg\n";
3957 LOG llevInfo, "[ABT] [suppressed]\n"; 4334 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3958 } 4335 }
3959} 4336}
3960 4337
3961# load additional modules 4338# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4339require "cf/$_.pm" for @EXTRA_MODULES;
4340cf::_connect_to_perl_2;
3963 4341
3964END { cf::emergency_save } 4342END { cf::emergency_save }
3965 4343
39661 43441
3967 4345

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines