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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.586 by root, Wed Oct 31 15:02:02 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 ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
95our $DATADIR = datadir; 99our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
99our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 112
108our %RESOURCE; 113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
109 120
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 123our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 129our $DB_ENV;
119 130
120our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 132
122our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
123 135
124our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
126our $NOW; 139our $NOW;
127 140
128our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
129our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
130our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
139 152
140our @POST_INIT; 153our @POST_INIT;
141 154
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :) 156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
144 160
145binmode STDOUT; 161binmode STDOUT;
146binmode STDERR; 162binmode STDERR;
147 163
148# read virtual server time, if available 164# read virtual server time, if available
159 175
160our $EMERGENCY_POSITION; 176our $EMERGENCY_POSITION;
161 177
162sub cf::map::normalise; 178sub cf::map::normalise;
163 179
180sub in_main() {
181 $Coro::current == $Coro::main
182}
183
164############################################################################# 184#############################################################################
165 185
186%REFLECT = ();
187for (@REFLECT) {
188 my $reflect = JSON::XS::decode_json $_;
189 $REFLECT{$reflect->{class}} = $reflect;
190}
191
192# this is decidedly evil
193$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
194
195#############################################################################
196
166=head2 GLOBAL VARIABLES 197=head2 GLOBAL VARIABLES
167 198
168=over 4 199=over 4
169 200
170=item $cf::UPTIME 201=item $cf::UPTIME
171 202
172The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
173 219
174=item $cf::RUNTIME 220=item $cf::RUNTIME
175 221
176The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
177every server tick. 223every server tick.
183Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
184directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
185unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
186database environment. 232database environment.
187 233
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 234=item $cf::LOADAVG
197 235
198The current CPU load on the server (alpha-smoothed), as a value between 0 236The 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 237(none) and 1 (overloaded), indicating how much time is spent on processing
200objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
209from wherever your confdir points to. 247from wherever your confdir points to.
210 248
211=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
212 250
213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These 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 252returns 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. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
266
267=cut
268
269sub wait_for_tick();
270sub wait_for_tick_begin();
271
217=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
218 273
219This array contains the results of the last C<invoke ()> call. When 274This 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 275C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 276that call.
222 277
278=item %cf::REFLECT
279
280Contains, for each (C++) class name, a hash reference with information
281about object members (methods, scalars, arrays and flags) and other
282metadata, which is useful for introspection.
283
223=back 284=back
224 285
225=cut 286=cut
226 287
227BEGIN { 288sub error(@) { LOG llevError, join "", @_ }
228 *CORE::GLOBAL::warn = sub { 289sub warn (@) { LOG llevWarn , join "", @_ }
290sub info (@) { LOG llevInfo , join "", @_ }
291sub debug(@) { LOG llevDebug, join "", @_ }
292sub trace(@) { LOG llevTrace, join "", @_ }
293
294$Coro::State::WARNHOOK = sub {
229 my $msg = join "", @_; 295 my $msg = join "", @_;
230 296
231 $msg .= "\n" 297 $msg .= "\n"
232 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
233 299
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 300 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 301
236 LOG llevError, $msg; 302 LOG llevWarn, $msg;
237 }; 303};
238}
239 304
240$Coro::State::DIEHOOK = sub { 305$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 306 return unless $^S eq 0; # "eq", not "=="
242 307
243 if ($Coro::current == $Coro::main) {#d# 308 error Carp::longmess $_[0];
309
310 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 311 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 312 return;#d#
246 }#d# 313 }#d#
247 314
248 # kill coroutine otherwise 315 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 316 Coro::terminate
251}; 317};
252
253$SIG{__DIE__} = sub { }; #d#?
254 318
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 319@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 320@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 321@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 322@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 336)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 338}
275 339
276$EV::DIED = sub { 340$EV::DIED = sub {
277 warn "error in event callback: @_"; 341 warn "error in event callback: $@";
278}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
279 348
280############################################################################# 349#############################################################################
281 350
282=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
283 352
304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
305 $d 374 $d
306 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
307} 376}
308 377
378=item $scalar = cf::load_file $path
379
380Loads the given file from path and returns its contents. Croaks on error
381and can block.
382
383=cut
384
385sub load_file($) {
386 0 <= aio_load $_[0], my $data
387 or Carp::croak "$_[0]: $!";
388
389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
428}
429
309=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
310 431
311Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
312 433
313=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 440our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
320 441
321sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
323 444
445=item $ref = cf::decode_storable $scalar
446
447Same as Coro::Storable::thaw, so blocks.
448
449=cut
450
451BEGIN { *decode_storable = \&Coro::Storable::thaw }
452
453=item $ref = cf::decode_yaml $scalar
454
455Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
456
457=cut
458
459sub decode_yaml($) {
460 fork_call { YAML::XS::Load $_[0] } @_
461}
462
463=item $scalar = cf::unlzf $scalar
464
465Same as Compress::LZF::compress, but takes server ticks into account, so
466blocks.
467
468=cut
469
470sub unlzf($) {
471 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
472 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
473 Compress::LZF::decompress $_[0]
474}
475
324=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
325 477
326Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again. 479but I<before> the server starts ticking again.
328 480
329The cdoeblock will have a single boolean argument to indicate whether this 481The codeblock will have a single boolean argument to indicate whether this
330is a reload or not. 482is a reload or not.
331 483
332=cut 484=cut
333 485
334sub post_init(&) { 486sub post_init(&) {
335 push @POST_INIT, shift; 487 push @POST_INIT, shift;
488}
489
490sub _post_init {
491 trace "running post_init jobs";
492
493 # run them in parallel...
494
495 my @join;
496
497 while () {
498 push @join, map &Coro::async ($_, 0), @POST_INIT;
499 @POST_INIT = ();
500
501 @join or last;
502
503 (pop @join)->join;
504 }
336} 505}
337 506
338=item cf::lock_wait $string 507=item cf::lock_wait $string
339 508
340Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
379} 548}
380 549
381=item cf::periodic $interval, $cb 550=item cf::periodic $interval, $cb
382 551
383Like EV::periodic, but randomly selects a starting point so that the actions 552Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer. 553get spread over time.
385 554
386=cut 555=cut
387 556
388sub periodic($$) { 557sub periodic($$) {
389 my ($interval, $cb) = @_; 558 my ($interval, $cb) = @_;
393 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
394} 563}
395 564
396=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
397 566
398Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
399This call blocks and returns only when you have at least C<$time> seconds 568(default: 0): This call blocks and returns only when you have at least
400of cpu time till the next tick. The slot is only valid till the next cede. 569C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede.
571
572Background jobs should use a priority les than zero, interactive jobs
573should use 100 or more.
401 574
402The optional C<$name> can be used to identify the job to run. It might be 575The optional C<$name> can be used to identify the job to run. It might be
403used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
404 577
405Useful for short background jobs. 578Useful for short background jobs.
406 579
407=cut 580=cut
408 581
409our @SLOT_QUEUE; 582our @SLOT_QUEUE;
410our $SLOT_QUEUE; 583our $SLOT_QUEUE;
584our $SLOT_DECAY = 0.9;
411 585
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 586$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 587$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 588 $Coro::current->desc ("timeslot manager");
415 589
416 my $signal = new Coro::Signal; 590 my $signal = new Coro::Signal;
591 my $busy;
417 592
418 while () { 593 while () {
419 next_job: 594 next_job:
595
420 my $avail = cf::till_tick; 596 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 597
422 for (0 .. $#SLOT_QUEUE) { 598 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 599 if ($SLOT_QUEUE[$_][0] <= $avail) {
600 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 601 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 602 $job->[2]->send;
426 Coro::cede; 603 Coro::cede;
427 goto next_job; 604 goto next_job;
428 } 605 } else {
606 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 607 }
430 } 608 }
431 609
432 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
435 $signal->wait;
436 } else { 613 } else {
614 $busy = 0;
437 Coro::schedule; 615 Coro::schedule;
438 } 616 }
439 } 617 }
440}; 618};
441 619
442sub get_slot($;$$) { 620sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 621 return if tick_inhibit || $Coro::current == $Coro::main;
444 622
445 my ($time, $pri, $name) = @_; 623 my ($time, $pri, $name) = @_;
446 624
447 $time = $TICK * .6 if $time > $TICK * .6; 625 $time = clamp $time, 0.01, $TICK * .6;
626
448 my $sig = new Coro::Signal; 627 my $sig = new Coro::Signal;
449 628
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 629 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 630 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 631 $SLOT_QUEUE->ready;
478=cut 657=cut
479 658
480sub sync_job(&) { 659sub sync_job(&) {
481 my ($job) = @_; 660 my ($job) = @_;
482 661
483 if ($Coro::current == $Coro::main) { 662 if (in_main) {
484 my $time = EV::time; 663 my $time = AE::time;
485 664
486 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
488 667
489 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
490 669
491 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
492 671
493 my $busy = 1; 672 my $busy = 1;
494 my @res; 673 my @res;
495 674
496 (async { 675 (async {
497 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
498 @res = eval { $job->() }; 677 @res = eval { $job->() };
499 warn $@ if $@; 678 error $@ if $@;
500 undef $busy; 679 undef $busy;
501 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
502 681
503 while ($busy) { 682 while ($busy) {
504 if (Coro::nready) { 683 if (Coro::nready) {
506 } else { 685 } else {
507 EV::loop EV::LOOP_ONESHOT; 686 EV::loop EV::LOOP_ONESHOT;
508 } 687 }
509 } 688 }
510 689
511 my $time = EV::time - $time; 690 my $time = AE::time - $time;
512 691
513 $TICK_START += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
514 693
515 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
516 } else { 695 } else {
538 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
539 718
540 $coro 719 $coro
541} 720}
542 721
543=item fork_call { }, $args 722=item fork_call { }, @args
544 723
545Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
546process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
547Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
548never block itself or use any form of event handling. 727never block itself or use any form of event handling.
549 728
550=cut 729=cut
551 730
731sub post_fork {
732 reset_signals;
733}
734
552sub fork_call(&@) { 735sub fork_call(&@) {
553 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
554 737
555 # we seemingly have to make a local copy of the whole thing, 738 # we seemingly have to make a local copy of the whole thing,
556 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
557 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
558 741
559 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
560 reset_signals; 743 cf::post_fork;
561 &$cb 744 &$cb
562 }, @args; 745 } @args;
563 746
564 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
748}
749
750sub objinfo {
751 (
752 "counter value" => cf::object::object_count,
753 "objects created" => cf::object::create_count,
754 "objects destroyed" => cf::object::destroy_count,
755 "freelist size" => cf::object::free_count,
756 "allocated objects" => cf::object::objects_size,
757 "active objects" => cf::object::actives_size,
758 )
565} 759}
566 760
567=item $coin = coin_from_name $name 761=item $coin = coin_from_name $name
568 762
569=cut 763=cut
606within each server. 800within each server.
607 801
608=cut 802=cut
609 803
610sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
611 my ($name) = @_; 808 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
613 810
614 eval { 811 eval {
615 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
625} 822}
626 823
627our $DB; 824our $DB;
628 825
629sub db_init { 826sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
632 };
633} 828}
634 829
635sub db_get($$) { 830sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
637 832
638 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
639 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
640 837
641 $! ? () 838 $! ? ()
642 : $data 839 : $data
643 }
644} 840}
645 841
646sub db_put($$$) { 842sub db_put($$$) {
647 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
676 872
677 my @data; 873 my @data;
678 my $md5; 874 my $md5;
679 875
680 for (0 .. $#$src) { 876 for (0 .. $#$src) {
681 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
682 or Carp::croak "$src->[$_]: $!";
683 } 878 }
684 879
685 # if processing is expensive, check 880 # if processing is expensive, check
686 # checksum first 881 # checksum first
687 if (1) { 882 if (1) {
704 899
705 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
706 my $data = $process->(\@data); 901 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
708 903
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 905
711 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
714 909
724 919
725=cut 920=cut
726 921
727sub datalog($@) { 922sub datalog($@) {
728 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 925}
731 926
732=back 927=back
733 928
734=cut 929=cut
929 1124
930 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 1127
933 } elsif (ref $type) { 1128 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
935 1130
936 } else { 1131 } else {
937 shift @arg; 1132 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
939 } 1134 }
940 } 1135 }
941} 1136}
942 1137
943sub _object_attach { 1138sub _object_attach {
953 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
954 } 1149 }
955 1150
956 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
957 } else { 1152 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1154 }
960 1155
961 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
962} 1157}
963 1158
1022 1217
1023 for (@$callbacks) { 1218 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1025 1220
1026 if ($@) { 1221 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1223 override;
1030 } 1224 }
1031 1225
1032 return 1 if $override; 1226 return 1 if $override;
1033 } 1227 }
1112 for (@$attach) { 1306 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1115 } 1309 }
1116 } else { 1310 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1312 }
1119 } 1313 }
1120} 1314}
1121 1315
1122cf::attachable->attach ( 1316cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1150 1344
1151 sync_job { 1345 sync_job {
1152 if (length $$rdata) { 1346 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1156 1351
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1353 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1355 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1183 1378
1184 $filename =~ s%/[^/]+$%%; 1379 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1380 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1381 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1188 } 1383 }
1189 } else { 1384 } else {
1190 aio_unlink $filename; 1385 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1192 } 1387 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1412 $av = $st->{objs};
1218 } 1413 }
1219 1414
1220 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1223 1419
1224 ($data, $av) 1420 ($data, $av)
1225} 1421}
1226 1422
1227=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1286} 1482}
1287 1483
1288use File::Glob (); 1484use File::Glob ();
1289 1485
1290cf::player->attach ( 1486cf::player->attach (
1291 on_command => sub { 1487 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1293 1489
1294 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1295 or return; 1491 or return;
1296 1492
1304 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1305 1501
1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1307 1503
1308 if (ref $msg) { 1504 if (ref $msg) {
1309 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1310 "ARRAY" eq ref $msg
1311 ? @$msg
1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1313 1506
1314 my @reply; 1507 my @reply;
1315 1508
1316 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1317 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1319 1512
1320 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1514 if $reply;
1322 1515
1323 } else { 1516 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1518 }
1326 1519
1327 cf::override; 1520 cf::override;
1328 }, 1521 },
1329); 1522);
1339 }; 1532 };
1340 1533
1341 $grp 1534 $grp
1342} 1535}
1343 1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1344sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1345 cf::sync_job { 1553 cf::sync_job {
1346 my %todo; 1554 my %todo;
1347 1555
1348 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1557 next unless -r $path;
1367 1575
1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370 1578
1371 $ext{source} = 1579 $ext{source} =
1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1373 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1374 . $source 1582 . $source
1375 . "\n};\n1"; 1583 . "\n};\n1";
1376 1584
1377 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1378 } 1586 }
1379 1587
1588 my $pass = 0;
1380 my %done; 1589 my %done;
1381 while (%todo) { 1590 while (%todo) {
1382 my $progress; 1591 my $progress;
1383 1592
1593 ++$pass;
1594
1595 ext:
1384 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1598 next ext
1387 unless exists $done{$_}; 1599 unless exists $done{$_};
1388 } 1600 }
1389 1601
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1603
1392 unless (eval $v->{source}) { 1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1613 my $active = eval $source;
1614
1615 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1617
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1619 if exists $v->{meta}{mandatory};
1400 1620
1401 warn $msg; 1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1622 delete $todo{$k};
1623 } else {
1624 $done{$k} = delete $todo{$k};
1625 push @EXTS, $v->{pkg};
1626 $progress = 1;
1627
1628 info "$v->{base}: extension inactive.\n"
1629 unless $active;
1402 } 1630 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1631 }
1408 1632
1409 skip: 1633 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 unless $progress; 1635
1636 while (my ($k, $v) = each %todo) {
1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1638 if exists $v->{meta}{mandatory};
1639 }
1640
1641 last;
1642 }
1412 } 1643 }
1413 }; 1644 };
1414} 1645}
1415 1646
1416############################################################################# 1647#############################################################################
1500 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1501 } 1732 }
1502 } 1733 }
1503} 1734}
1504 1735
1736cf::player->attach (
1737 on_load => sub {
1738 my ($pl, $path) = @_;
1739
1740 # restore slots saved in save, below
1741 my $slots = delete $pl->{_slots};
1742
1743 $pl->ob->current_weapon ($slots->[0]);
1744 $pl->combat_ob ($slots->[1]);
1745 $pl->ranged_ob ($slots->[2]);
1746 },
1747);
1748
1505sub save($) { 1749sub save($) {
1506 my ($pl) = @_; 1750 my ($pl) = @_;
1507 1751
1508 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1509 1753
1514 1758
1515 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1760 $pl->{last_save} = $cf::RUNTIME;
1517 1761
1518 cf::get_slot 0.01; 1762 cf::get_slot 0.01;
1763
1764 # save slots, to be restored later
1765 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519 1766
1520 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1768 cf::cede_to_tick;
1522} 1769}
1523 1770
1557 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1558 1805
1559 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1807 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1561 1808
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563 $pl->deactivate; 1810 $pl->deactivate;
1811
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1567 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1568 1817
1569 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1571 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1625 \@logins 1874 \@logins
1626} 1875}
1627 1876
1628=item $player->maps 1877=item $player->maps
1629 1878
1879=item cf::player::maps $login
1880
1630Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1631player. May block. 1882player. May block.
1632 1883
1633=cut 1884=cut
1634 1885
1696=cut 1947=cut
1697 1948
1698sub find_by_path($) { 1949sub find_by_path($) {
1699 my ($path) = @_; 1950 my ($path) = @_;
1700 1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1953
1701 my ($match, $specificity); 1954 my ($match, $specificity);
1702 1955
1703 for my $region (list) { 1956 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1958 ($match, $specificity) = ($region, $region->specificity)
1733sub generate_random_map { 1986sub generate_random_map {
1734 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1735 1988
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 1990
1738 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750 (cf::region::find $rmp->{region}), $rmp->{custom}
1751 )
1752} 1992}
1753 1993
1754=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1755 1995
1756Register a handler for the map path matching the given regex at the 1996Register a handler for the map path matching the given regex at the
1761 2001
1762sub register { 2002sub register {
1763 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 2004 my $pkg = caller;
1765 2005
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 2007
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 2009}
1771 2010
1772# also paths starting with '/' 2011# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 2013
1775sub thawer_merge { 2014sub thawer_merge {
1776 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1777 2016
1778 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1783} 2022}
1784 2023
1785sub normalise { 2024sub normalise {
1786 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1787 2026
1788 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1789 2028
1790 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1791 2030
1792 # map plan: 2031 # map plan:
1793 # 2032 #
1808 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1809 $path = "$base/$path"; 2048 $path = "$base/$path";
1810 } 2049 }
1811 2050
1812 for ($path) { 2051 for ($path) {
1813 redo if s{//}{/};
1814 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1815 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1816 } 2054 }
1817 2055
1818 $path 2056 $path
1832 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1833 return $self; 2071 return $self;
1834 } 2072 }
1835 } 2073 }
1836 2074
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 2076 ()
1839} 2077}
1840 2078
2079# may re-bless or do other evil things
1841sub init { 2080sub init {
1842 my ($self) = @_; 2081 my ($self) = @_;
1843 2082
1844 $self 2083 $self
1845} 2084}
1910 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1911 2150
1912 1 2151 1
1913} 2152}
1914 2153
2154# used to laod the header of an original map
1915sub load_header_orig { 2155sub load_header_orig {
1916 my ($self) = @_; 2156 my ($self) = @_;
1917 2157
1918 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1919} 2159}
1920 2160
2161# used to laod the header of an instantiated map
1921sub load_header_temp { 2162sub load_header_temp {
1922 my ($self) = @_; 2163 my ($self) = @_;
1923 2164
1924 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1925} 2166}
1926 2167
2168# called after loading the header from an instantiated map
1927sub prepare_temp { 2169sub prepare_temp {
1928 my ($self) = @_; 2170 my ($self) = @_;
1929 2171
1930 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1932 # safety 2174 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2177}
1936 2178
2179# called after loading the header from an original map
1937sub prepare_orig { 2180sub prepare_orig {
1938 my ($self) = @_; 2181 my ($self) = @_;
1939 2182
1940 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
1965 2208
1966sub find; 2209sub find;
1967sub find { 2210sub find {
1968 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
1969 2212
2213 cf::cede_to_tick;
2214
1970 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
1971 2216
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2219
1975 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
1992 2237
1993 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
1994 } 2239 }
1995} 2240}
1996 2241
1997sub pre_load { } 2242sub pre_load { }
1998sub post_load { } 2243#sub post_load { } # XS
1999 2244
2000sub load { 2245sub load {
2001 my ($self) = @_; 2246 my ($self) = @_;
2002 2247
2003 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
2006 2251
2007 { 2252 {
2008 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2009 2254
2010 return unless $self->valid; 2255 return unless $self->valid;
2011 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2012
2013 $self->in_memory (cf::MAP_LOADING);
2014 2257
2015 $self->alloc; 2258 $self->alloc;
2016 2259
2017 $self->pre_load; 2260 $self->pre_load;
2018 cf::cede_to_tick; 2261 cf::cede_to_tick;
2019 2262
2263 if (exists $self->{load_path}) {
2020 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block; 2265 $f->skip_block;
2022 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2023 or return; 2267 or return;
2024 2268
2025 $self->post_load_original 2269 $self->post_load_original
2026 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2027 2271
2028 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2029 utf8::encode $uniq; 2273 utf8::encode $uniq;
2030 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2032 $self->clear_unique_items; 2276 $self->clear_unique_items;
2033 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2035 } 2280 }
2036 } 2281 }
2037 }
2038 2282
2039 $f->resolve_delayed_derefs; 2283 $f->resolve_delayed_derefs;
2284 } else {
2285 $self->post_load_original
2286 if delete $self->{load_original};
2287 }
2288
2289 $self->state (cf::MAP_INACTIVE);
2040 2290
2041 cf::cede_to_tick; 2291 cf::cede_to_tick;
2042 # now do the right thing for maps 2292 # now do the right thing for maps
2043 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2044 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2048 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2049 $self->decay_objects; 2299 $self->decay_objects;
2050 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2051 $self->update_buttons; 2301 $self->update_buttons;
2052 cf::cede_to_tick; 2302 cf::cede_to_tick;
2053 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2054 } 2304 }
2055 2305
2056 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2057 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2058
2059 $self->in_memory (cf::MAP_ACTIVE);
2060 } 2308 }
2061 2309
2062 $self->post_load; 2310 $self->post_load;
2063}
2064 2311
2312 1
2313}
2314
2315# customize the map for a given player, i.e.
2316# return the _real_ map. used by e.g. per-player
2317# maps to change the path to ~playername/mappath
2065sub customise_for { 2318sub customise_for {
2066 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2067 2320
2068 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2322 if $self->per_player;
2072# if $self->per_party; 2325# if $self->per_party;
2073 2326
2074 $self 2327 $self
2075} 2328}
2076 2329
2077# find and load all maps in the 3x3 area around a map
2078sub load_neighbours {
2079 my ($map) = @_;
2080
2081 my @neigh; # diagonal neighbours
2082
2083 for (0 .. 3) {
2084 my $neigh = $map->tile_path ($_)
2085 or next;
2086 $neigh = find $neigh, $map
2087 or next;
2088 $neigh->load;
2089
2090 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 }
2094
2095 for (grep defined $_->[0], @neigh) {
2096 my ($path, $origin) = @$_;
2097 my $neigh = find $path, $origin
2098 or next;
2099 $neigh->load;
2100 }
2101}
2102
2103sub find_sync { 2330sub find_sync {
2104 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2105 2332
2106 cf::sync_job { find $path, $origin } 2333 # it's a bug to call this from the main context
2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2335 if $Coro::current == $Coro::main;
2336
2337 find $path, $origin
2107} 2338}
2108 2339
2109sub do_load_sync { 2340sub do_load_sync {
2110 my ($map) = @_; 2341 my ($map) = @_;
2111 2342
2343 # it's a bug to call this from the main context
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2114 2346
2115 cf::sync_job { $map->load }; 2347 $map->load;
2116} 2348}
2117 2349
2118our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2120 2352
2121sub find_async { 2353sub find_async {
2122 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2123 2355
2124 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2125 2357
2126 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2128 } 2360 }
2129 2361
2130 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2131 2363
2132 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2146 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2147 2379
2148 () 2380 ()
2149} 2381}
2150 2382
2383# common code, used by both ->save and ->swapout
2151sub save { 2384sub _save {
2152 my ($self) = @_; 2385 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2386
2156 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2157 2388
2158 return unless $self->dirty; 2389 return unless $self->dirty;
2159 2390
2179 } else { 2410 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2411 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2412 }
2182} 2413}
2183 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2184sub swap_out { 2423sub swap_out {
2185 my ($self) = @_; 2424 my ($self) = @_;
2186 2425
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2192 return if $self->players; 2430 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2431
2432 # first deactivate the map and "unlink" it from the core
2433 $self->deactivate;
2434 $_->clear_links_to ($self) for values %cf::MAP;
2435 $self->state (cf::MAP_SWAPPED);
2436
2437 # then atomically save
2438 $self->_save;
2439
2440 # then free the map
2441 $self->clear;
2442}
2443
2444sub reset_at {
2445 my ($self) = @_;
2446
2447 # TODO: safety, remove and allow resettable per-player maps
2194 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2195 2449
2450 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2451 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2452
2453 $time + $to
2454}
2455
2456sub should_reset {
2457 my ($self) = @_;
2458
2459 $self->reset_at <= $cf::RUNTIME
2460}
2461
2462sub reset {
2463 my ($self) = @_;
2464
2465 my $lock = cf::lock_acquire "map_data:$self->{path}";
2466
2467 return if $self->players;
2468
2469 cf::trace "resetting map ", $self->path, "\n";
2470
2196 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2472
2473 # need to save uniques path
2474 unless ($self->{deny_save}) {
2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2476
2477 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2478 if $uniq;
2479 }
2480
2481 delete $cf::MAP{$self->path};
2197 2482
2198 $self->deactivate; 2483 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2485 $self->clear;
2201}
2202
2203sub reset_at {
2204 my ($self) = @_;
2205
2206 # TODO: safety, remove and allow resettable per-player maps
2207 return 1e99 if $self->{deny_reset};
2208
2209 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212 $time + $to
2213}
2214
2215sub should_reset {
2216 my ($self) = @_;
2217
2218 $self->reset_at <= $cf::RUNTIME
2219}
2220
2221sub reset {
2222 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226 return if $self->players;
2227
2228 warn "resetting map ", $self->path;
2229
2230 $self->in_memory (cf::MAP_SWAPPED);
2231
2232 # need to save uniques path
2233 unless ($self->{deny_save}) {
2234 my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2237 if $uniq;
2238 }
2239
2240 delete $cf::MAP{$self->path};
2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2244 $self->clear;
2245 2486
2246 $self->unlink_save; 2487 $self->unlink_save;
2247 $self->destroy; 2488 $self->destroy;
2248} 2489}
2249 2490
2257 2498
2258 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2259 2500
2260 $self->unlink_save; 2501 $self->unlink_save;
2261 2502
2262 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2508
2324 : normalise $_ 2565 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2567 ]
2327} 2568}
2328 2569
2570=item cf::map::static_maps
2571
2572Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2573file in the shared directory excluding F</styles> and F</editor>). May
2574block.
2575
2576=cut
2577
2578sub static_maps() {
2579 my @dirs = "";
2580 my @maps;
2581
2582 while (@dirs) {
2583 my $dir = shift @dirs;
2584
2585 next if $dir eq "/styles" || $dir eq "/editor";
2586
2587 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2588 or return;
2589
2590 for (@$files) {
2591 s/\.map$// or next;
2592 utf8::decode $_;
2593 push @maps, "$dir/$_";
2594 }
2595
2596 push @dirs, map "$dir/$_", @$dirs;
2597 }
2598
2599 \@maps
2600}
2601
2329=back 2602=back
2330 2603
2331=head3 cf::object 2604=head3 cf::object
2332 2605
2333=cut 2606=cut
2465 2738
2466Freezes the player and moves him/her to a special map (C<{link}>). 2739Freezes the player and moves him/her to a special map (C<{link}>).
2467 2740
2468The player should be reasonably safe there for short amounts of time (e.g. 2741The player should be reasonably safe there for short amounts of time (e.g.
2469for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2742for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link 2743though, as the player cannot control the character while it is on the link
2471map. 2744map.
2472 2745
2473Will never block. 2746Will never block.
2474 2747
2475=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2497 my ($self) = @_; 2770 my ($self) = @_;
2498 2771
2499 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2500 2773
2774 ++$self->{_link_recursion};
2775
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2777
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2505 2780
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2782}
2508 2783
2509sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2511 2786
2528 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2530 2805
2531 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2534 2809
2535 $map->load; 2810 $map->load;
2536 $map->load_neighbours;
2537 2811
2538 return unless $self->contr->active; 2812 return unless $self->contr->active;
2539 2813
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2542 2816 # entering was successful
2817 delete $self->{_link_recursion};
2543 # only activate afterwards, to support waiting in hooks 2818 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive; 2819 $self->activate_recursive;
2545} 2820 }
2546 2821
2822}
2823
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2824=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548 2825
2549Moves the player to the given map-path and coordinates by first freezing 2826Moves the player to the given map-path and coordinates by first freezing
2550her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2551that has to return the map if sucecssful, and then unfreezes the player on 2828that has to return the map if sucecssful, and then unfreezes the player on
2552the new (success) or old (failed) map position. In either case, $done will 2829the new (success) or old (failed) map position. In either case, $done will
2559 2836
2560our $GOTOGEN; 2837our $GOTOGEN;
2561 2838
2562sub cf::object::player::goto { 2839sub cf::object::player::goto {
2563 my ($self, $path, $x, $y, $check, $done) = @_; 2840 my ($self, $path, $x, $y, $check, $done) = @_;
2841
2842 if ($self->{_link_recursion} >= $MAX_LINKS) {
2843 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2844 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2845 ($path, $x, $y) = @$EMERGENCY_POSITION;
2846 }
2564 2847
2565 # do generation counting so two concurrent goto's will be executed in-order 2848 # do generation counting so two concurrent goto's will be executed in-order
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2850
2568 $self->enter_link; 2851 $self->enter_link;
2588 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2589 } 2872 }
2590 } 2873 }
2591 2874
2592 my $map = eval { 2875 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2594 2877
2595 if ($map) { 2878 if ($map) {
2596 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2881 } else {
2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2882 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 } 2883 }
2601 2884
2602 $map 2885 $map
2610 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2613 } 2896 }
2614 2897
2615 $done->() if $done; 2898 $done->($self) if $done;
2616 })->prio (1); 2899 })->prio (1);
2617} 2900}
2618 2901
2619=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2620 2903
2688 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2689 2972
2690 unless (eval { 2973 unless (eval {
2691 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2692 2975
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2702 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp; 2978 my $y = $exit->stats->sp;
2979
2980 # special map handling
2981 my $slaying = $exit->slaying;
2982
2983 # special map handling
2984 if ($slaying eq "/!") {
2985 my $guard = cf::lock_acquire "exit_prepare:$exit";
2986
2987 prepare_random_map $exit
2988 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2989
2990 $map = $exit->slaying;
2991
2992 } elsif ($slaying eq '!up') {
2993 $map = $exit->map->tile_path (cf::TILE_UP);
2994 $x = $exit->x;
2995 $y = $exit->y;
2996
2997 } elsif ($slaying eq '!down') {
2998 $map = $exit->map->tile_path (cf::TILE_DOWN);
2999 $x = $exit->x;
3000 $y = $exit->y;
3001 }
2704 3002
2705 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2706 3004
2707 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
2713 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 3012 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2717 3015
2718 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 3017 $self->leave_link;
2720 } 3018 }
2721 })->prio (1); 3019 })->prio (1);
2722} 3020}
2723 3021
2735sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2737 3035
2738 utf8::encode $text; 3036 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3037 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3038}
3039
3040=item $client->send_big_packet ($pkt)
3041
3042Like C<send_packet>, but tries to compress large packets, and fragments
3043them as required.
3044
3045=cut
3046
3047our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3048
3049sub cf::client::send_big_packet {
3050 my ($self, $pkt) = @_;
3051
3052 # try lzf for large packets
3053 $pkt = "lzf " . Compress::LZF::compress $pkt
3054 if 1024 <= length $pkt and $self->{can_lzf};
3055
3056 # split very large packets
3057 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3058 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3059 $pkt = "frag";
3060 }
3061
3062 $self->send_packet ($pkt);
2740} 3063}
2741 3064
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3066
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3067Send a drawinfo or msg packet to the client, formatting the msg for the
2748 3071
2749=cut 3072=cut
2750 3073
2751# non-persistent channels (usually the info channel) 3074# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2753 "c/identify" => { 3082 "c/identify" => {
2754 id => "infobox", 3083 id => "infobox",
2755 title => "Identify", 3084 title => "Identify",
2756 reply => undef, 3085 reply => undef,
2757 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2759 "c/examine" => { 3088 "c/examine" => {
2760 id => "infobox", 3089 id => "infobox",
2761 title => "Examine", 3090 title => "Examine",
2762 reply => undef, 3091 reply => undef,
2763 tooltip => "Signs and other items you examined", 3092 tooltip => "Signs and other items you examined",
3093 },
3094 "c/shopinfo" => {
3095 id => "infobox",
3096 title => "Shop Info",
3097 reply => undef,
3098 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3099 },
2765 "c/book" => { 3100 "c/book" => {
2766 id => "infobox", 3101 id => "infobox",
2767 title => "Book", 3102 title => "Book",
2768 reply => undef, 3103 reply => undef,
2884 my $pkt = "msg " 3219 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 3220 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 3222 );
2888 3223
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if (8192 < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt); 3224 $self->send_big_packet ($pkt);
2900} 3225}
2901 3226
2902=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2903 3228
2904Sends an ext event to the client. 3229Sends an ext event to the client.
2907 3232
2908sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2910 3235
2911 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3241 }
2917} 3242}
2918 3243
2919=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2920 3245
2923=cut 3248=cut
2924 3249
2925sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2927 3252
2928 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2935} 3256}
2936 3257
2937=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2938 3259
2939Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
2994 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
2995 3316
2996 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2997 3318
2998 if (ref $msg) { 3319 if (ref $msg) {
2999 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003 3321
3004 my @reply; 3322 my @reply;
3005 3323
3006 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3007 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
3009 3327
3010 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3329 if $reply;
3012 3330
3013 } else { 3331 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3332 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3333 }
3016 3334
3017 cf::override; 3335 cf::override;
3018 }, 3336 },
3019); 3337);
3039 3357
3040 $coro 3358 $coro
3041} 3359}
3042 3360
3043cf::client->attach ( 3361cf::client->attach (
3044 on_destroy => sub { 3362 on_client_destroy => sub {
3045 my ($ns) = @_; 3363 my ($ns) = @_;
3046 3364
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3366 },
3049); 3367);
3065our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
3066 3384
3067$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
3068 3386
3069$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
3072 sort time 3390 sort time
3073)); 3391));
3074 3392
3075# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
3100 decrease split destroy change_exp value msg lore send_msg)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3101 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3102 ["cf::player" => qw(peaceful send_msg)], 3420 ["cf::player" => qw(peaceful send_msg)],
3103 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3104) { 3422) {
3105 no strict 'refs';
3106 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3107 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3108 for @funs; 3425 for @funs;
3109} 3426}
3110 3427
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
3129 3446
3130 %vars = (_dummy => 0) unless %vars; 3447 %vars = (_dummy => 0) unless %vars;
3131 3448
3449 my @res;
3132 local $_; 3450 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3451
3135 my $eval = 3452 my $eval =
3136 "do {\n" 3453 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3456 . $code
3140 . "\n}" 3457 . "\n}"
3141 ; 3458 ;
3142 3459
3460 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 sub_generation_inc; 3464 sub_generation_inc;
3465 } else {
3466 local @cf::_safe_eval_args = values %vars;
3467 @res = wantarray ? eval eval : scalar eval $eval;
3468 }
3146 3469
3147 if ($@) { 3470 if ($@) {
3148 warn "$@"; 3471 warn "$@",
3149 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3151 } 3474 }
3152 3475
3153 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3154} 3477}
3155 3478
3169=cut 3492=cut
3170 3493
3171sub register_script_function { 3494sub register_script_function {
3172 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
3173 3496
3174 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
3176} 3499}
3177 3500
3178=back 3501=back
3179 3502
3180=cut 3503=cut
3181 3504
3182############################################################################# 3505#############################################################################
3183# the server's init and main functions 3506# the server's init and main functions
3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3184 3509
3185sub load_facedata($) { 3510sub load_facedata($) {
3186 my ($path) = @_; 3511 my ($path) = @_;
3187 3512
3188 # HACK to clear player env face cache, we need some signal framework 3513 # HACK to clear player env face cache, we need some signal framework
3189 # for this (global event?) 3514 # for this (global event?)
3190 %ext::player_env::MUSIC_FACE_CACHE = (); 3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3191 3516
3192 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3193 3518
3194 warn "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3195 3520
3196 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3197 0 < aio_load $path, $facedata
3198 or die "$path: $!";
3199
3200 $facedata = Coro::Storable::thaw $facedata;
3201 3522
3202 $facedata->{version} == 2 3523 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3525
3205 # patch in the exptable 3526 # patch in the exptable
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3206 $facedata->{resource}{"res/exp_table"} = { 3528 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC, 3529 type => FT_RSRC,
3208 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3530 data => $exp_table,
3531 hash => (Digest::MD5::md5 $exp_table),
3209 }; 3532 };
3210 cf::cede_to_tick; 3533 cf::cede_to_tick;
3211 3534
3212 { 3535 {
3213 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3214 3537
3215 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3541
3218 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3545 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3546 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3547 $FACEHASH{$info->{hash64}} = $idx;#d#
3222 3548
3223 cf::cede_to_tick; 3549 cf::cede_to_tick;
3224 } 3550 }
3225 3551
3226 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
3231 3557
3232 if (my $smooth = cf::face::find $info->{smooth}) { 3558 if (my $smooth = cf::face::find $info->{smooth}) {
3233 cf::face::set_smooth $idx, $smooth; 3559 cf::face::set_smooth $idx, $smooth;
3234 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3560 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3235 } else { 3561 } else {
3236 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3562 error "smooth face '$info->{smooth}' not found for face '$face'";
3237 } 3563 }
3238 3564
3239 cf::cede_to_tick; 3565 cf::cede_to_tick;
3240 } 3566 }
3241 } 3567 }
3250 3576
3251 cf::anim::invalidate_all; # d'oh 3577 cf::anim::invalidate_all; # d'oh
3252 } 3578 }
3253 3579
3254 { 3580 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3258 3582
3259 while (my ($name, $info) = each %$res) { 3583 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3584 if (defined (my $type = $info->{type})) {
3585 # TODO: different hash - must free and use new index, or cache ixface data queue
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3587
3264 if ($info->{type} & 1) { 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3265 # prepend meta info
3266
3267 my $meta = $enc->encode ({
3268 name => $name,
3269 %{ $info->{meta} || {} },
3270 });
3271
3272 $data = pack "(w/a*)*", $meta, $info->{data};
3273 } else {
3274 $data = $info->{data};
3275 }
3276
3277 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278 cf::face::set_type $idx, $info->{type}; 3589 cf::face::set_type $idx, $type;
3590 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3591 $FACEHASH{$info->{hash}} = $idx;#d#
3279 } else { 3592 } else {
3280 $RESOURCE{$name} = $info; 3593# $RESOURCE{$name} = $info; # unused
3281 } 3594 }
3282 3595
3283 cf::cede_to_tick; 3596 cf::cede_to_tick;
3284 } 3597 }
3285 } 3598 }
3286 3599
3287 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3600 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3288 3601
3289 1 3602 1
3290} 3603}
3291
3292cf::global->attach (on_resource_update => sub {
3293 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3294 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3295
3296 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3297 my $sound = $soundconf->{compat}[$_]
3298 or next;
3299
3300 my $face = cf::face::find "sound/$sound->[1]";
3301 cf::sound::set $sound->[0] => $face;
3302 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3303 }
3304
3305 while (my ($k, $v) = each %{$soundconf->{event}}) {
3306 my $face = cf::face::find "sound/$v";
3307 cf::sound::set $k => $face;
3308 }
3309 }
3310});
3311 3604
3312register_exticmd fx_want => sub { 3605register_exticmd fx_want => sub {
3313 my ($ns, $want) = @_; 3606 my ($ns, $want) = @_;
3314 3607
3315 while (my ($k, $v) = each %$want) { 3608 while (my ($k, $v) = each %$want) {
3354sub reload_treasures { 3647sub reload_treasures {
3355 load_resource_file "$DATADIR/treasures" 3648 load_resource_file "$DATADIR/treasures"
3356 or die "unable to load treasurelists\n"; 3649 or die "unable to load treasurelists\n";
3357} 3650}
3358 3651
3652sub reload_sound {
3653 trace "loading sound config from $DATADIR/sound\n";
3654
3655 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3656
3657 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3658 my $sound = $soundconf->{compat}[$_]
3659 or next;
3660
3661 my $face = cf::face::find "sound/$sound->[1]";
3662 cf::sound::set $sound->[0] => $face;
3663 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3664 }
3665
3666 while (my ($k, $v) = each %{$soundconf->{event}}) {
3667 my $face = cf::face::find "sound/$v";
3668 cf::sound::set $k => $face;
3669 }
3670}
3671
3359sub reload_resources { 3672sub reload_resources {
3360 warn "reloading resource files...\n"; 3673 trace "reloading resource files...\n";
3361 3674
3675 reload_exp_table;
3676 reload_materials;
3362 reload_facedata; 3677 reload_facedata;
3678 reload_sound;
3363 reload_archetypes; 3679 reload_archetypes;
3364 reload_regions; 3680 reload_regions;
3365 reload_treasures; 3681 reload_treasures;
3366 3682
3367 warn "finished reloading resource files\n"; 3683 trace "finished reloading resource files\n";
3368} 3684}
3369 3685
3370sub reload_config { 3686sub reload_config {
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3687 trace "reloading config file...\n";
3372 or return;
3373 3688
3374 local $/; 3689 my $config = load_file "$CONFDIR/config";
3375 *CFG = YAML::Load <$fh>; 3690 utf8::decode $config;
3691 *CFG = decode_yaml $config;
3376 3692
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3693 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3378 3694
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3695 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3696 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3381 3697
3382 if (exists $CFG{mlockall}) { 3698 if (exists $CFG{mlockall}) {
3406 seek $fh, 0, 0; 3722 seek $fh, 0, 0;
3407 print $fh $$; 3723 print $fh $$;
3408} 3724}
3409 3725
3410sub main_loop { 3726sub main_loop {
3411 warn "EV::loop starting\n"; 3727 trace "EV::loop starting\n";
3412 if (1) { 3728 if (1) {
3413 EV::loop; 3729 EV::loop;
3414 } 3730 }
3415 warn "EV::loop returned\n"; 3731 trace "EV::loop returned\n";
3416 goto &main_loop unless $REALLY_UNLOOP; 3732 goto &main_loop unless $REALLY_UNLOOP;
3417} 3733}
3418 3734
3419sub main { 3735sub main {
3420 cf::init_globals; # initialise logging 3736 cf::init_globals; # initialise logging
3421 3737
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3738 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3739 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3740 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431 3742
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3743 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 3744
3434 # we must not ever block the main coroutine 3745 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3746 local $Coro::idle = sub {
3441 }; 3752 };
3442 3753
3443 evthread_start IO::AIO::poll_fileno; 3754 evthread_start IO::AIO::poll_fileno;
3444 3755
3445 cf::sync_job { 3756 cf::sync_job {
3757 cf::incloader::init ();
3758
3759 cf::init_anim;
3760 cf::init_attackmess;
3761 cf::init_dynamic;
3762
3763 cf::load_settings;
3764
3446 reload_resources; 3765 reload_resources;
3447 reload_config; 3766 reload_config;
3448 db_init; 3767 db_init;
3449 3768
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3769 cf::init_uuid;
3453 cf::init_signals; 3770 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills; 3771 cf::init_skills;
3456 3772
3457 cf::init_beforeplay; 3773 cf::init_beforeplay;
3458 3774
3459 atomic; 3775 atomic;
3464 3780
3465 # no (long-running) fork's whatsoever before this point(!) 3781 # no (long-running) fork's whatsoever before this point(!)
3466 use POSIX (); 3782 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3783 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468 3784
3469 (pop @POST_INIT)->(0) while @POST_INIT; 3785 cf::_post_init 0;
3470 }; 3786 };
3471 3787
3788 cf::object::thawer::errors_are_fatal 0;
3789 info "parse errors in files are no longer fatal from this point on.\n";
3790
3791 AE::postpone {
3792 undef &main; # free gobs of memory :)
3793 };
3794
3472 main_loop; 3795 goto &main_loop;
3473} 3796}
3474 3797
3475############################################################################# 3798#############################################################################
3476# initialisation and cleanup 3799# initialisation and cleanup
3477 3800
3478# install some emergency cleanup handlers 3801# install some emergency cleanup handlers
3479BEGIN { 3802BEGIN {
3480 our %SIGWATCHER = (); 3803 our %SIGWATCHER = ();
3481 for my $signal (qw(INT HUP TERM)) { 3804 for my $signal (qw(INT HUP TERM)) {
3482 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3805 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3483 cf::cleanup "SIG$signal"; 3806 cf::cleanup "SIG$signal";
3484 }; 3807 };
3485 } 3808 }
3486} 3809}
3487 3810
3488sub write_runtime_sync { 3811sub write_runtime_sync {
3812 my $t0 = AE::time;
3813
3489 # first touch the runtime file to show we are still running: 3814 # first touch the runtime file to show we are still running:
3490 # the fsync below can take a very very long time. 3815 # the fsync below can take a very very long time.
3491 3816
3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3817 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493 3818
3494 my $guard = cf::lock_acquire "write_runtime"; 3819 my $guard = cf::lock_acquire "write_runtime";
3495 3820
3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3821 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497 or return; 3822 or return;
3498 3823
3499 my $value = $cf::RUNTIME + 90 + 10; 3824 my $value = $cf::RUNTIME + 90 + 10;
3500 # 10 is the runtime save interval, for a monotonic clock 3825 # 10 is the runtime save interval, for a monotonic clock
3501 # 60 allows for the watchdog to kill the server. 3826 # 60 allows for the watchdog to kill the server.
3514 or return; 3839 or return;
3515 3840
3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3841 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517 and return; 3842 and return;
3518 3843
3519 warn "runtime file written.\n"; 3844 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3520 3845
3521 1 3846 1
3522} 3847}
3523 3848
3524our $uuid_lock; 3849our $uuid_lock;
3536 or return; 3861 or return;
3537 3862
3538 my $value = uuid_seq uuid_cur; 3863 my $value = uuid_seq uuid_cur;
3539 3864
3540 unless ($value) { 3865 unless ($value) {
3541 warn "cowardly refusing to write zero uuid value!\n"; 3866 info "cowardly refusing to write zero uuid value!\n";
3542 return; 3867 return;
3543 } 3868 }
3544 3869
3545 my $value = uuid_str $value + $uuid_skip; 3870 my $value = uuid_str $value + $uuid_skip;
3546 $uuid_skip = 0; 3871 $uuid_skip = 0;
3556 or return; 3881 or return;
3557 3882
3558 aio_rename "$uuid~", $uuid 3883 aio_rename "$uuid~", $uuid
3559 and return; 3884 and return;
3560 3885
3561 warn "uuid file written ($value).\n"; 3886 trace "uuid file written ($value).\n";
3562 3887
3563 1 3888 1
3564 3889
3565} 3890}
3566 3891
3572} 3897}
3573 3898
3574sub emergency_save() { 3899sub emergency_save() {
3575 my $freeze_guard = cf::freeze_mainloop; 3900 my $freeze_guard = cf::freeze_mainloop;
3576 3901
3577 warn "emergency_perl_save: enter\n"; 3902 info "emergency_perl_save: enter\n";
3903
3904 # this is a trade-off: we want to be very quick here, so
3905 # save all maps without fsync, and later call a global sync
3906 # (which in turn might be very very slow)
3907 local $USE_FSYNC = 0;
3578 3908
3579 cf::sync_job { 3909 cf::sync_job {
3580 # this is a trade-off: we want to be very quick here, so 3910 cf::write_runtime_sync; # external watchdog should not bark
3581 # save all maps without fsync, and later call a global sync
3582 # (which in turn might be very very slow)
3583 local $USE_FSYNC = 0;
3584 3911
3585 # use a peculiar iteration method to avoid tripping on perl 3912 # use a peculiar iteration method to avoid tripping on perl
3586 # refcount bugs in for. also avoids problems with players 3913 # refcount bugs in for. also avoids problems with players
3587 # and maps saved/destroyed asynchronously. 3914 # and maps saved/destroyed asynchronously.
3588 warn "emergency_perl_save: begin player save\n"; 3915 info "emergency_perl_save: begin player save\n";
3589 for my $login (keys %cf::PLAYER) { 3916 for my $login (keys %cf::PLAYER) {
3590 my $pl = $cf::PLAYER{$login} or next; 3917 my $pl = $cf::PLAYER{$login} or next;
3591 $pl->valid or next; 3918 $pl->valid or next;
3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3919 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3593 $pl->save; 3920 $pl->save;
3594 } 3921 }
3595 warn "emergency_perl_save: end player save\n"; 3922 info "emergency_perl_save: end player save\n";
3596 3923
3924 cf::write_runtime_sync; # external watchdog should not bark
3925
3597 warn "emergency_perl_save: begin map save\n"; 3926 info "emergency_perl_save: begin map save\n";
3598 for my $path (keys %cf::MAP) { 3927 for my $path (keys %cf::MAP) {
3599 my $map = $cf::MAP{$path} or next; 3928 my $map = $cf::MAP{$path} or next;
3600 $map->valid or next; 3929 $map->valid or next;
3601 $map->save; 3930 $map->save;
3602 } 3931 }
3603 warn "emergency_perl_save: end map save\n"; 3932 info "emergency_perl_save: end map save\n";
3604 3933
3934 cf::write_runtime_sync; # external watchdog should not bark
3935
3605 warn "emergency_perl_save: begin database checkpoint\n"; 3936 info "emergency_perl_save: begin database checkpoint\n";
3606 BDB::db_env_txn_checkpoint $DB_ENV; 3937 BDB::db_env_txn_checkpoint $DB_ENV;
3607 warn "emergency_perl_save: end database checkpoint\n"; 3938 info "emergency_perl_save: end database checkpoint\n";
3608 3939
3609 warn "emergency_perl_save: begin write uuid\n"; 3940 info "emergency_perl_save: begin write uuid\n";
3610 write_uuid_sync 1; 3941 write_uuid_sync 1;
3611 warn "emergency_perl_save: end write uuid\n"; 3942 info "emergency_perl_save: end write uuid\n";
3943
3944 cf::write_runtime_sync; # external watchdog should not bark
3945
3946 trace "emergency_perl_save: syncing database to disk";
3947 BDB::db_env_txn_checkpoint $DB_ENV;
3948
3949 info "emergency_perl_save: starting sync\n";
3950 IO::AIO::aio_sync sub {
3951 info "emergency_perl_save: finished sync\n";
3952 };
3953
3954 cf::write_runtime_sync; # external watchdog should not bark
3955
3956 trace "emergency_perl_save: flushing outstanding aio requests";
3957 while (IO::AIO::nreqs || BDB::nreqs) {
3958 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3959 }
3960
3961 cf::write_runtime_sync; # external watchdog should not bark
3612 }; 3962 };
3613 3963
3614 warn "emergency_perl_save: starting sync()\n";
3615 IO::AIO::aio_sync sub {
3616 warn "emergency_perl_save: finished sync()\n";
3617 };
3618
3619 warn "emergency_perl_save: leave\n"; 3964 info "emergency_perl_save: leave\n";
3620} 3965}
3621 3966
3622sub post_cleanup { 3967sub post_cleanup {
3623 my ($make_core) = @_; 3968 my ($make_core) = @_;
3624 3969
3970 IO::AIO::flush;
3971
3625 warn Carp::longmess "post_cleanup backtrace" 3972 error Carp::longmess "post_cleanup backtrace"
3626 if $make_core; 3973 if $make_core;
3627 3974
3628 my $fh = pidfile; 3975 my $fh = pidfile;
3629 unlink $PIDFILE if <$fh> == $$; 3976 unlink $PIDFILE if <$fh> == $$;
3630} 3977}
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3997 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) { 3998 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"}; 3999 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4000# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 } 4001 }
3655 warn "cleared package $pkg\n";#d#
3656} 4002}
3657 4003
3658sub do_reload_perl() { 4004sub do_reload_perl() {
3659 # can/must only be called in main 4005 # can/must only be called in main
3660 if ($Coro::current != $Coro::main) { 4006 unless (in_main) {
3661 warn "can only reload from main coroutine"; 4007 error "can only reload from main coroutine";
3662 return; 4008 return;
3663 } 4009 }
3664 4010
3665 return if $RELOAD++; 4011 return if $RELOAD++;
3666 4012
3667 my $t1 = EV::time; 4013 my $t1 = AE::time;
3668 4014
3669 while ($RELOAD) { 4015 while ($RELOAD) {
3670 warn "reloading..."; 4016 cf::get_slot 0.1, -1, "reload_perl";
4017 info "perl_reload: reloading...";
3671 4018
3672 warn "entering sync_job"; 4019 trace "perl_reload: entering sync_job";
3673 4020
3674 cf::sync_job { 4021 cf::sync_job {
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 cf::emergency_save; 4022 #cf::emergency_save;
3677 cf::write_runtime_sync; # external watchdog should not bark
3678 4023
3679 warn "syncing database to disk";
3680 BDB::db_env_txn_checkpoint $DB_ENV;
3681
3682 # if anything goes wrong in here, we should simply crash as we already saved
3683
3684 warn "flushing outstanding aio requests";
3685 while (IO::AIO::nreqs || BDB::nreqs) {
3686 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3687 }
3688
3689 warn "cancelling all extension coros"; 4024 trace "perl_reload: cancelling all extension coros";
3690 $_->cancel for values %EXT_CORO; 4025 $_->cancel for values %EXT_CORO;
3691 %EXT_CORO = (); 4026 %EXT_CORO = ();
3692 4027
3693 warn "removing commands"; 4028 trace "perl_reload: removing commands";
3694 %COMMAND = (); 4029 %COMMAND = ();
3695 4030
3696 warn "removing ext/exti commands"; 4031 trace "perl_reload: removing ext/exti commands";
3697 %EXTCMD = (); 4032 %EXTCMD = ();
3698 %EXTICMD = (); 4033 %EXTICMD = ();
3699 4034
3700 warn "unloading/nuking all extensions"; 4035 trace "perl_reload: unloading/nuking all extensions";
3701 for my $pkg (@EXTS) { 4036 for my $pkg (@EXTS) {
3702 warn "... unloading $pkg"; 4037 trace "... unloading $pkg";
3703 4038
3704 if (my $cb = $pkg->can ("unload")) { 4039 if (my $cb = $pkg->can ("unload")) {
3705 eval { 4040 eval {
3706 $cb->($pkg); 4041 $cb->($pkg);
3707 1 4042 1
3708 } or warn "$pkg unloaded, but with errors: $@"; 4043 } or error "$pkg unloaded, but with errors: $@";
3709 } 4044 }
3710 4045
3711 warn "... clearing $pkg"; 4046 trace "... clearing $pkg";
3712 clear_package $pkg; 4047 clear_package $pkg;
3713 } 4048 }
3714 4049
3715 warn "unloading all perl modules loaded from $LIBDIR"; 4050 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3716 while (my ($k, $v) = each %INC) { 4051 while (my ($k, $v) = each %INC) {
3717 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4052 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3718 4053
3719 warn "... unloading $k"; 4054 trace "... unloading $k";
3720 delete $INC{$k}; 4055 delete $INC{$k};
3721 4056
3722 $k =~ s/\.pm$//; 4057 $k =~ s/\.pm$//;
3723 $k =~ s/\//::/g; 4058 $k =~ s/\//::/g;
3724 4059
3727 } 4062 }
3728 4063
3729 clear_package $k; 4064 clear_package $k;
3730 } 4065 }
3731 4066
3732 warn "getting rid of safe::, as good as possible"; 4067 trace "perl_reload: getting rid of safe::, as good as possible";
3733 clear_package "safe::$_" 4068 clear_package "safe::$_"
3734 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4069 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3735 4070
3736 warn "unloading cf.pm \"a bit\""; 4071 trace "perl_reload: unloading cf.pm \"a bit\"";
3737 delete $INC{"cf.pm"}; 4072 delete $INC{"cf.pm"};
3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4073 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3739 4074
3740 # don't, removes xs symbols, too, 4075 # don't, removes xs symbols, too,
3741 # and global variables created in xs 4076 # and global variables created in xs
3742 #clear_package __PACKAGE__; 4077 #clear_package __PACKAGE__;
3743 4078
3744 warn "unload completed, starting to reload now"; 4079 info "perl_reload: unload completed, starting to reload now";
3745 4080
3746 warn "reloading cf.pm"; 4081 trace "perl_reload: reloading cf.pm";
3747 require cf; 4082 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4083 cf::_connect_to_perl_1;
3749 4084
3750 warn "loading config and database again"; 4085 trace "perl_reload: loading config and database again";
3751 cf::reload_config; 4086 cf::reload_config;
3752 4087
3753 warn "loading extensions"; 4088 trace "perl_reload: loading extensions";
3754 cf::load_extensions; 4089 cf::load_extensions;
3755 4090
3756 if ($REATTACH_ON_RELOAD) { 4091 if ($REATTACH_ON_RELOAD) {
3757 warn "reattaching attachments to objects/players"; 4092 trace "perl_reload: reattaching attachments to objects/players";
3758 _global_reattach; # objects, sockets 4093 _global_reattach; # objects, sockets
3759 warn "reattaching attachments to maps"; 4094 trace "perl_reload: reattaching attachments to maps";
3760 reattach $_ for values %MAP; 4095 reattach $_ for values %MAP;
3761 warn "reattaching attachments to players"; 4096 trace "perl_reload: reattaching attachments to players";
3762 reattach $_ for values %PLAYER; 4097 reattach $_ for values %PLAYER;
3763 } 4098 }
3764 4099
3765 warn "running post_init jobs"; 4100 cf::_post_init 1;
3766 (pop @POST_INIT)->(1) while @POST_INIT;
3767 4101
3768 warn "leaving sync_job"; 4102 trace "perl_reload: leaving sync_job";
3769 4103
3770 1 4104 1
3771 } or do { 4105 } or do {
3772 warn $@; 4106 error $@;
3773 cf::cleanup "error while reloading, exiting."; 4107 cf::cleanup "perl_reload: error, exiting.";
3774 }; 4108 };
3775 4109
3776 warn "reloaded";
3777 --$RELOAD; 4110 --$RELOAD;
3778 } 4111 }
3779 4112
3780 $t1 = EV::time - $t1; 4113 $t1 = AE::time - $t1;
3781 warn "reload completed in ${t1}s\n"; 4114 info "perl_reload: completed in ${t1}s\n";
3782}; 4115};
3783 4116
3784our $RELOAD_WATCHER; # used only during reload 4117our $RELOAD_WATCHER; # used only during reload
3785 4118
3786sub reload_perl() { 4119sub reload_perl() {
3788 # coro crashes during coro_state_free->destroy here. 4121 # coro crashes during coro_state_free->destroy here.
3789 4122
3790 $RELOAD_WATCHER ||= cf::async { 4123 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions; 4124 Coro::AIO::aio_wait cache_extensions;
3792 4125
3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4126 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3794 do_reload_perl; 4127 do_reload_perl;
3795 undef $RELOAD_WATCHER; 4128 undef $RELOAD_WATCHER;
3796 }; 4129 };
3797 }; 4130 };
3798} 4131}
3807 reload_perl; 4140 reload_perl;
3808 }; 4141 };
3809 } 4142 }
3810}; 4143};
3811 4144
3812unshift @INC, $LIBDIR; 4145#############################################################################
3813 4146
3814my $bug_warning = 0; 4147my $bug_warning = 0;
3815 4148
3816our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN;
3818
3819sub wait_for_tick { 4149sub wait_for_tick() {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3821 4151
3822 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
3823 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait;
3825} 4153}
3826 4154
3827sub wait_for_tick_begin { 4155sub wait_for_tick_begin() {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3829 4157
3830 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 4160 $signal->wait;
3833} 4161}
3837 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4165 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3838 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
3839 return; 4167 return;
3840 } 4168 }
3841 4169
3842 cf::server_tick; # one server iteration 4170 cf::one_tick; # one server iteration
4171
4172 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3843 4173
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4175 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 4176 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 4177 $Coro::current->{desc} = "runtime saver";
3848 write_runtime_sync 4178 write_runtime_sync
3849 or warn "ERROR: unable to write runtime file: $!"; 4179 or error "ERROR: unable to write runtime file: $!";
3850 }; 4180 };
3851 } 4181 }
3852 4182
3853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3854 $sig->send; 4184 $sig->send;
3855 } 4185 }
3856 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
3857 $sig->send;
3858 }
3859 4187
3860 $LOAD = ($NOW - $TICK_START) / $TICK; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
3861 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3862 4190
3863 if (0) { 4191 if (0) {
3864 if ($NEXT_TICK) { 4192 if ($NEXT_TICK) {
3865 my $jitter = $TICK_START - $NEXT_TICK; 4193 my $jitter = $TICK_START - $NEXT_TICK;
3866 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4194 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3867 warn "jitter $JITTER\n";#d# 4195 debug "jitter $JITTER\n";#d#
3868 } 4196 }
3869 } 4197 }
3870} 4198}
3871 4199
3872{ 4200{
3873 # configure BDB 4201 # configure BDB
3874 4202
3875 BDB::min_parallel 8; 4203 BDB::min_parallel 16;
3876 BDB::max_poll_reqs $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
3877 $AnyEvent::BDB::WATCHER->priority (1); 4205 #$AnyEvent::BDB::WATCHER->priority (1);
3878 4206
3879 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
3880 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
3881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3882 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4210 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3917 IO::AIO::min_parallel 8; 4245 IO::AIO::min_parallel 8;
3918 IO::AIO::max_poll_time $TICK * 0.1; 4246 IO::AIO::max_poll_time $TICK * 0.1;
3919 undef $AnyEvent::AIO::WATCHER; 4247 undef $AnyEvent::AIO::WATCHER;
3920} 4248}
3921 4249
3922my $_log_backtrace; 4250our $_log_backtrace;
4251our $_log_backtrace_last;
3923 4252
3924sub _log_backtrace { 4253sub _log_backtrace {
3925 my ($msg, @addr) = @_; 4254 my ($msg, @addr) = @_;
3926 4255
3927 $msg =~ s/\n//; 4256 $msg =~ s/\n$//;
3928 4257
4258 if ($_log_backtrace_last eq $msg) {
4259 LOG llevInfo, "[ABT] $msg\n";
4260 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3929 # limit the # of concurrent backtraces 4261 # limit the # of concurrent backtraces
3930 if ($_log_backtrace < 2) { 4262 } elsif ($_log_backtrace < 2) {
4263 $_log_backtrace_last = $msg;
3931 ++$_log_backtrace; 4264 ++$_log_backtrace;
3932 my $perl_bt = Carp::longmess $msg; 4265 my $perl_bt = Carp::longmess $msg;
3933 async { 4266 async {
3934 $Coro::current->{desc} = "abt $msg"; 4267 $Coro::current->{desc} = "abt $msg";
3935 4268
3955 LOG llevInfo, "[ABT] $_\n" for @bt; 4288 LOG llevInfo, "[ABT] $_\n" for @bt;
3956 --$_log_backtrace; 4289 --$_log_backtrace;
3957 }; 4290 };
3958 } else { 4291 } else {
3959 LOG llevInfo, "[ABT] $msg\n"; 4292 LOG llevInfo, "[ABT] $msg\n";
3960 LOG llevInfo, "[ABT] [suppressed]\n"; 4293 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3961 } 4294 }
3962} 4295}
3963 4296
3964# load additional modules 4297# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4298require "cf/$_.pm" for @EXTRA_MODULES;
4299cf::_connect_to_perl_2;
3966 4300
3967END { cf::emergency_save } 4301END { cf::emergency_save }
3968 4302
39691 43031
3970 4304

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines