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.489 by root, Fri Oct 23 03:08:35 2009 UTC vs.
Revision 1.584 by root, Tue Oct 30 17:07:50 2012 UTC

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

Diff Legend

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