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.521 by root, Fri Apr 16 23:28:42 2010 UTC vs.
Revision 1.587 by root, Wed Oct 31 19:09:47 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 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;
… …
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
… …
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
… …
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; 117#our %RESOURCE; # unused
112 118
113our $OUTPUT_RATE_MIN = 4000; 119our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
115 124
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 127our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 133our $DB_ENV;
125 134
126our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 136
128our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 139
130our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
132our $NOW; 143our $NOW;
133 144
134our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
145 156
146our @POST_INIT; 157our @POST_INIT;
147 158
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
150 164
151binmode STDOUT; 165binmode STDOUT;
152binmode STDERR; 166binmode STDERR;
153 167
154# read virtual server time, if available 168# read virtual server time, if available
… …
165 179
166our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
167 181
168sub cf::map::normalise; 182sub cf::map::normalise;
169 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
170############################################################################# 188#############################################################################
171 189
172%REFLECT = (); 190%REFLECT = ();
173for (@REFLECT) { 191for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 192 my $reflect = JSON::XS::decode_json $_;
… …
184 202
185=over 4 203=over 4
186 204
187=item $cf::UPTIME 205=item $cf::UPTIME
188 206
189The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
190 223
191=item $cf::RUNTIME 224=item $cf::RUNTIME
192 225
193The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
194every server tick. 227every server tick.
… …
200Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
201directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
203database environment. 236database environment.
204 237
205=item $cf::NOW
206
207The time of the last (current) server tick.
208
209=item $cf::TICK
210
211The interval between server ticks, in seconds.
212
213=item $cf::LOADAVG 238=item $cf::LOADAVG
214 239
215The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
216(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
217objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
226from wherever your confdir points to. 251from wherever your confdir points to.
227 252
228=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
229 254
230These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
231returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
232per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
233 275
234=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
235 277
236This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
245 287
246=back 288=back
247 289
248=cut 290=cut
249 291
292sub error(@) { LOG llevError, join "", @_ }
293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
250$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 299 my $msg = join "", @_;
252 300
253 $msg .= "\n" 301 $msg .= "\n"
254 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
255 303
256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257 305
258 LOG llevError, $msg; 306 LOG llevWarn, $msg;
259}; 307};
260 308
261$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
263 311
264 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
265 313
266 if ($Coro::current == $Coro::main) {#d# 314 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 316 return;#d#
269 }#d# 317 }#d#
270 318
271 # kill coroutine otherwise 319 # kill coroutine otherwise
272 Coro::terminate 320 Coro::terminate
… …
292)) { 340)) {
293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
294} 342}
295 343
296$EV::DIED = sub { 344$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
298}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
299 352
300############################################################################# 353#############################################################################
301 354
302=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
303 356
… …
324 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
325 $d 378 $d
326 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
327} 380}
328 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
329=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
330 435
331Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
332 437
333=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340 445
341sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
343 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
344=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
345 481
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
348 484
349The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 486is a reload or not.
351 487
352=cut 488=cut
353 489
354sub post_init(&) { 490sub post_init(&) {
355 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
356} 509}
357 510
358=item cf::lock_wait $string 511=item cf::lock_wait $string
359 512
360Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
413 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
414} 567}
415 568
416=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
417 570
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
419This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
420of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
421 578
422The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
423used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
424 581
425Useful for short background jobs. 582Useful for short background jobs.
… …
454 } 611 }
455 } 612 }
456 613
457 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
458 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
459 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
460 $signal->wait;
461 } else { 617 } else {
462 $busy = 0; 618 $busy = 0;
463 Coro::schedule; 619 Coro::schedule;
464 } 620 }
465 } 621 }
… …
505=cut 661=cut
506 662
507sub sync_job(&) { 663sub sync_job(&) {
508 my ($job) = @_; 664 my ($job) = @_;
509 665
510 if ($Coro::current == $Coro::main) { 666 if (in_main) {
511 my $time = AE::time; 667 my $time = AE::time;
512 668
513 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
515 671
516 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
517 673
518 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
519 675
520 my $busy = 1; 676 my $busy = 1;
521 my @res; 677 my @res;
522 678
523 (async { 679 (async {
524 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 681 @res = eval { $job->() };
526 warn $@ if $@; 682 error $@ if $@;
527 undef $busy; 683 undef $busy;
528 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
529 685
530 while ($busy) { 686 while ($busy) {
531 if (Coro::nready) { 687 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
566 722
567 $coro 723 $coro
568} 724}
569 725
570=item fork_call { }, $args 726=item fork_call { }, @args
571 727
572Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 731never block itself or use any form of event handling.
576 732
577=cut 733=cut
578 734
735sub post_fork {
736 reset_signals;
737}
738
579sub fork_call(&@) { 739sub fork_call(&@) {
580 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
581 741
582 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
583 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
585 745
586 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
587 reset_signals; 747 cf::post_fork;
588 &$cb 748 &$cb
589 }, @args; 749 } @args;
590 750
591 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
592} 752}
593 753
594sub objinfo { 754sub objinfo {
… …
644within each server. 804within each server.
645 805
646=cut 806=cut
647 807
648sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
649 my ($name) = @_; 812 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
651 814
652 eval { 815 eval {
653 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
… …
663} 826}
664 827
665our $DB; 828our $DB;
666 829
667sub db_init { 830sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
670 };
671} 832}
672 833
673sub db_get($$) { 834sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
675 836
676 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
677 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
678 841
679 $! ? () 842 $! ? ()
680 : $data 843 : $data
681 }
682} 844}
683 845
684sub db_put($$$) { 846sub db_put($$$) {
685 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
714 876
715 my @data; 877 my @data;
716 my $md5; 878 my $md5;
717 879
718 for (0 .. $#$src) { 880 for (0 .. $#$src) {
719 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
720 or Carp::croak "$src->[$_]: $!";
721 } 882 }
722 883
723 # if processing is expensive, check 884 # if processing is expensive, check
724 # checksum first 885 # checksum first
725 if (1) { 886 if (1) {
… …
742 903
743 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 905 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
746 907
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 909
749 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
752 913
… …
762 923
763=cut 924=cut
764 925
765sub datalog($@) { 926sub datalog($@) {
766 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 929}
769 930
770=back 931=back
771 932
772=cut 933=cut
… …
967 1128
968 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1131
971 } elsif (ref $type) { 1132 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
973 1134
974 } else { 1135 } else {
975 shift @arg; 1136 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
977 } 1138 }
978 } 1139 }
979} 1140}
980 1141
981sub _object_attach { 1142sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
992 } 1153 }
993 1154
994 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
995 } else { 1156 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1158 }
998 1159
999 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
1000} 1161}
1001 1162
… …
1060 1221
1061 for (@$callbacks) { 1222 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1063 1224
1064 if ($@) { 1225 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1227 override;
1068 } 1228 }
1069 1229
1070 return 1 if $override; 1230 return 1 if $override;
1071 } 1231 }
… …
1150 for (@$attach) { 1310 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1153 } 1313 }
1154 } else { 1314 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1316 }
1157 } 1317 }
1158} 1318}
1159 1319
1160cf::attachable->attach ( 1320cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1188 1348
1189 sync_job { 1349 sync_job {
1190 if (length $$rdata) { 1350 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1194 1355
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1221 1382
1222 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1385 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1226 } 1387 }
1227 } else { 1388 } else {
1228 aio_unlink $filename; 1389 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1230 } 1391 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1416 $av = $st->{objs};
1256 } 1417 }
1257 1418
1258 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1261 1423
1262 ($data, $av) 1424 ($data, $av)
1263} 1425}
1264 1426
1265=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
… …
1342 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1343 1505
1344 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1345 1507
1346 if (ref $msg) { 1508 if (ref $msg) {
1347 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1348 "ARRAY" eq ref $msg
1349 ? @$msg
1350 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1351 1510
1352 my @reply; 1511 my @reply;
1353 1512
1354 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1355 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1357 1516
1358 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1518 if $reply;
1360 1519
1361 } else { 1520 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1522 }
1364 1523
1365 cf::override; 1524 cf::override;
1366 }, 1525 },
1367); 1526);
… …
1377 }; 1536 };
1378 1537
1379 $grp 1538 $grp
1380} 1539}
1381 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1382sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1383 cf::sync_job { 1557 cf::sync_job {
1384 my %todo; 1558 my %todo;
1385 1559
1386 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1561 next unless -r $path;
… …
1405 1579
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1582
1409 $ext{source} = 1583 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1412 . $source 1586 . $source
1413 . "\n};\n1"; 1587 . "\n};\n1";
1414 1588
1415 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1602 next ext
1429 unless exists $done{$_}; 1603 unless exists $done{$_};
1430 } 1604 }
1431 1605
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1434 my $active = eval $v->{source}; 1617 my $active = eval $source;
1435 1618
1436 if (length $@) { 1619 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1438 1621
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1623 if exists $v->{meta}{mandatory};
1441 1624
1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1444 } else { 1627 } else {
1445 $done{$k} = delete $todo{$k}; 1628 $done{$k} = delete $todo{$k};
1446 push @EXTS, $v->{pkg}; 1629 push @EXTS, $v->{pkg};
1447 $progress = 1; 1630 $progress = 1;
1448 1631
1449 warn "$v->{base}: extension inactive.\n" 1632 info "$v->{base}: extension inactive.\n"
1450 unless $active; 1633 unless $active;
1451 } 1634 }
1452 } 1635 }
1453 1636
1454 unless ($progress) { 1637 unless ($progress) {
… …
1456 1639
1457 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1458 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1460 } 1643 }
1644
1645 last;
1461 } 1646 }
1462 } 1647 }
1463 }; 1648 };
1464} 1649}
1465 1650
… …
1623 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1624 1809
1625 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1626 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1627 1812
1628 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1629 $pl->deactivate; 1814 $pl->deactivate;
1815
1630 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1631 $pl->ob->check_score;
1632 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1633 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1634 1821
1635 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1636 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1637 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1691 \@logins 1878 \@logins
1692} 1879}
1693 1880
1694=item $player->maps 1881=item $player->maps
1695 1882
1883=item cf::player::maps $login
1884
1696Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1697player. May block. 1886player. May block.
1698 1887
1699=cut 1888=cut
1700 1889
… …
1762=cut 1951=cut
1763 1952
1764sub find_by_path($) { 1953sub find_by_path($) {
1765 my ($path) = @_; 1954 my ($path) = @_;
1766 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1767 my ($match, $specificity); 1958 my ($match, $specificity);
1768 1959
1769 for my $region (list) { 1960 for my $region (list) {
1770 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1771 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
… …
1799sub generate_random_map { 1990sub generate_random_map {
1800 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1801 1992
1802 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1803 1994
1804 # mit "rum" bekleckern, nicht
1805 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1809 $rmp->{exit_on_final_map},
1810 $rmp->{xsize}, $rmp->{ysize},
1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1813 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1814 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1815 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1816 (cf::region::find $rmp->{region}), $rmp->{custom}
1817 )
1818} 1996}
1819 1997
1820=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1821 1999
1822Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
… …
1827 2005
1828sub register { 2006sub register {
1829 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1830 my $pkg = caller; 2008 my $pkg = caller;
1831 2009
1832 no strict;
1833 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1834 2011
1835 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1836} 2013}
1837 2014
1838# also paths starting with '/' 2015# also paths starting with '/'
1839$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1840 2017
1841sub thawer_merge { 2018sub thawer_merge {
1842 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1843 2020
1844 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
… …
1849} 2026}
1850 2027
1851sub normalise { 2028sub normalise {
1852 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1853 2030
1854 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1855 2032
1856 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1857 2034
1858 # map plan: 2035 # map plan:
1859 # 2036 #
… …
1874 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1875 $path = "$base/$path"; 2052 $path = "$base/$path";
1876 } 2053 }
1877 2054
1878 for ($path) { 2055 for ($path) {
1879 redo if s{//}{/};
1880 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1881 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1882 } 2058 }
1883 2059
1884 $path 2060 $path
… …
1898 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1899 return $self; 2075 return $self;
1900 } 2076 }
1901 } 2077 }
1902 2078
1903 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1904 () 2080 ()
1905} 2081}
1906 2082
2083# may re-bless or do other evil things
1907sub init { 2084sub init {
1908 my ($self) = @_; 2085 my ($self) = @_;
1909 2086
1910 $self 2087 $self
1911} 2088}
… …
1976 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1977 2154
1978 1 2155 1
1979} 2156}
1980 2157
2158# used to laod the header of an original map
1981sub load_header_orig { 2159sub load_header_orig {
1982 my ($self) = @_; 2160 my ($self) = @_;
1983 2161
1984 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1985} 2163}
1986 2164
2165# used to laod the header of an instantiated map
1987sub load_header_temp { 2166sub load_header_temp {
1988 my ($self) = @_; 2167 my ($self) = @_;
1989 2168
1990 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1991} 2170}
1992 2171
2172# called after loading the header from an instantiated map
1993sub prepare_temp { 2173sub prepare_temp {
1994 my ($self) = @_; 2174 my ($self) = @_;
1995 2175
1996 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1997 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1998 # safety 2178 # safety
1999 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2000 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2001} 2181}
2002 2182
2183# called after loading the header from an original map
2003sub prepare_orig { 2184sub prepare_orig {
2004 my ($self) = @_; 2185 my ($self) = @_;
2005 2186
2006 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2007 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2031 2212
2032sub find; 2213sub find;
2033sub find { 2214sub find {
2034 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2035 2216
2217 cf::cede_to_tick;
2218
2036 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2037 2220
2038 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2040 2223
2041 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2072 2255
2073 { 2256 {
2074 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2075 2258
2076 return unless $self->valid; 2259 return unless $self->valid;
2077 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2078
2079 $self->in_memory (cf::MAP_LOADING);
2080 2261
2081 $self->alloc; 2262 $self->alloc;
2082 2263
2083 $self->pre_load; 2264 $self->pre_load;
2084 cf::cede_to_tick; 2265 cf::cede_to_tick;
2085 2266
2267 if (exists $self->{load_path}) {
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2269 $f->skip_block;
2088 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2089 or return; 2271 or return;
2090 2272
2091 $self->post_load_original 2273 $self->post_load_original
2092 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2093 2275
2094 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2277 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2098 $self->clear_unique_items; 2280 $self->clear_unique_items;
2099 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2101 } 2284 }
2102 } 2285 }
2103 }
2104 2286
2105 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2106 2294
2107 cf::cede_to_tick; 2295 cf::cede_to_tick;
2108 # now do the right thing for maps 2296 # now do the right thing for maps
2109 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2110 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2114 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2303 $self->decay_objects;
2116 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2117 $self->update_buttons; 2305 $self->update_buttons;
2118 cf::cede_to_tick; 2306 cf::cede_to_tick;
2119 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2120 } 2308 }
2121 2309
2122 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2123 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2124
2125 $self->in_memory (cf::MAP_ACTIVE);
2126 } 2312 }
2127 2313
2128 $self->post_load; 2314 $self->post_load;
2315
2316 1
2129} 2317}
2130 2318
2131# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2141# if $self->per_party; 2329# if $self->per_party;
2142 2330
2143 $self 2331 $self
2144} 2332}
2145 2333
2146# find and load all maps in the 3x3 area around a map
2147sub load_neighbours {
2148 my ($map) = @_;
2149
2150 my @neigh; # diagonal neighbours
2151
2152 for (0 .. 3) {
2153 my $neigh = $map->tile_path ($_)
2154 or next;
2155 $neigh = find $neigh, $map
2156 or next;
2157 $neigh->load;
2158
2159 push @neigh,
2160 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2161 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2162 }
2163
2164 for (grep defined $_->[0], @neigh) {
2165 my ($path, $origin) = @$_;
2166 my $neigh = find $path, $origin
2167 or next;
2168 $neigh->load;
2169 }
2170}
2171
2172sub find_sync { 2334sub find_sync {
2173 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2174 2336
2175 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2176} 2342}
2177 2343
2178sub do_load_sync { 2344sub do_load_sync {
2179 my ($map) = @_; 2345 my ($map) = @_;
2180 2346
2347 # it's a bug to call this from the main context
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2183 2350
2184 cf::sync_job { $map->load }; 2351 $map->load;
2185} 2352}
2186 2353
2187our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2188our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2189 2356
2190sub find_async { 2357sub find_async {
2191 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2192 2359
2193 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2194 2361
2195 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2197 } 2364 }
2198 2365
2199 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2200 2367
2201 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2260sub swap_out { 2427sub swap_out {
2261 my ($self) = @_; 2428 my ($self) = @_;
2262 2429
2263 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264 2431
2265 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2266 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2267 return if $self->players; 2434 return if $self->players;
2268 2435
2269 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2270 $self->deactivate; 2437 $self->deactivate;
2271 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2272 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2273 2440
2274 # then atomically save 2441 # then atomically save
2275 $self->_save; 2442 $self->_save;
2276 2443
2277 # then free the map 2444 # then free the map
… …
2301 2468
2302 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2303 2470
2304 return if $self->players; 2471 return if $self->players;
2305 2472
2306 warn "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2307 2474
2308 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2309 2476
2310 # need to save uniques path 2477 # need to save uniques path
2311 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2312 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2313 2480
… …
2335 2502
2336 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2337 2504
2338 $self->unlink_save; 2505 $self->unlink_save;
2339 2506
2340 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2341 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2342 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2343 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2344 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2345 2512
… …
2575 2742
2576Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2577 2744
2578The player should be reasonably safe there for short amounts of time (e.g. 2745The player should be reasonably safe there for short amounts of time (e.g.
2579for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2746for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2580though, as the palyer cannot control the character while it is on the link 2747though, as the player cannot control the character while it is on the link
2581map. 2748map.
2582 2749
2583Will never block. 2750Will never block.
2584 2751
2585=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
… …
2606sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2607 my ($self) = @_; 2774 my ($self) = @_;
2608 2775
2609 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2610 2777
2778 ++$self->{_link_recursion};
2779
2611 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2612 2781
2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2614 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2615 2784
… …
2641 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2642 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2643 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2644 2813
2645 $map->load; 2814 $map->load;
2646 $map->load_neighbours;
2647 2815
2648 return unless $self->contr->active; 2816 return unless $self->contr->active;
2649 2817
2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2651 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2652 2820 # entering was successful
2821 delete $self->{_link_recursion};
2653 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive; 2823 $self->activate_recursive;
2655} 2824 }
2656 2825
2826}
2827
2657=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2658 2829
2659Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2660her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2661that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2662the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
… …
2669 2840
2670our $GOTOGEN; 2841our $GOTOGEN;
2671 2842
2672sub cf::object::player::goto { 2843sub cf::object::player::goto {
2673 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2674 2851
2675 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2676 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2677 2854
2678 $self->enter_link; 2855 $self->enter_link;
… …
2698 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2699 } 2876 }
2700 } 2877 }
2701 2878
2702 my $map = eval { 2879 my $map = eval {
2703 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2704 2881
2705 if ($map) { 2882 if ($map) {
2706 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2707 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2708 } else { 2885 } else {
2709 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2710 } 2887 }
2711 2888
2712 $map 2889 $map
… …
2720 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2721 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2722 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2723 } 2900 }
2724 2901
2725 $done->() if $done; 2902 $done->($self) if $done;
2726 })->prio (1); 2903 })->prio (1);
2727} 2904}
2728 2905
2729=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2730 2907
… …
2798 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2799 2976
2800 unless (eval { 2977 unless (eval {
2801 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2802 2979
2803 # random map handling
2804 {
2805 my $guard = cf::lock_acquire "exit_prepare:$exit";
2806
2807 prepare_random_map $exit
2808 if $exit->slaying eq "/!";
2809 }
2810
2811 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2812 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2813 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2814 3006
2815 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2816 3008
2817 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2818 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
2823 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2824 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2825 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2826 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2827 3019
2828 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2829 $self->leave_link; 3021 $self->leave_link;
2830 } 3022 }
2831 })->prio (1); 3023 })->prio (1);
2832} 3024}
2833 3025
… …
3060=cut 3252=cut
3061 3253
3062sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3063 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3064 3256
3065 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3066 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3067 } elsif ($self->extcmd == 1) {
3068 #TODO: version 1, remove
3069 unshift @msg, msgtype => "reply", msgid => $id;
3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3071 }
3072} 3260}
3073 3261
3074=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3075 3263
3076Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
… …
3131 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3132 3320
3133 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3134 3322
3135 if (ref $msg) { 3323 if (ref $msg) {
3136 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3137 "ARRAY" eq ref $msg
3138 ? @$msg
3139 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3140 3325
3141 my @reply; 3326 my @reply;
3142 3327
3143 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3144 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
… …
3146 3331
3147 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
3148 if $reply; 3333 if $reply;
3149 3334
3150 } else { 3335 } else {
3151 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3152 } 3337 }
3153 3338
3154 cf::override; 3339 cf::override;
3155 }, 3340 },
3156); 3341);
… …
3237 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3238 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3239 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3240 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3241) { 3426) {
3242 no strict 'refs';
3243 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3245 for @funs; 3429 for @funs;
3246} 3430}
3247 3431
… …
3286 local @cf::_safe_eval_args = values %vars; 3470 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval; 3471 @res = wantarray ? eval eval : scalar eval $eval;
3288 } 3472 }
3289 3473
3290 if ($@) { 3474 if ($@) {
3291 warn "$@"; 3475 warn "$@",
3292 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3293 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3294 } 3478 }
3295 3479
3296 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3297} 3481}
3298 3482
… …
3323=cut 3507=cut
3324 3508
3325############################################################################# 3509#############################################################################
3326# the server's init and main functions 3510# the server's init and main functions
3327 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3328sub load_facedata($) { 3514sub load_facedata($) {
3329 my ($path) = @_; 3515 my ($path) = @_;
3330 3516
3331 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3332 # for this (global event?) 3518 # for this (global event?)
3333 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3334 3520
3335 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3521 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3336 3522
3337 warn "loading facedata from $path\n"; 3523 trace "loading facedata from $path\n";
3338 3524
3339 my $facedata; 3525 my $facedata = decode_storable load_file $path;
3340 0 < aio_load $path, $facedata
3341 or die "$path: $!";
3342
3343 $facedata = Coro::Storable::thaw $facedata;
3344 3526
3345 $facedata->{version} == 2 3527 $facedata->{version} == 2
3346 or cf::cleanup "$path: version mismatch, cannot proceed."; 3528 or cf::cleanup "$path: version mismatch, cannot proceed.";
3347 3529
3348 # patch in the exptable 3530 # patch in the exptable
… …
3355 cf::cede_to_tick; 3537 cf::cede_to_tick;
3356 3538
3357 { 3539 {
3358 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3359 3541
3360 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3361 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3362 3545
3363 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3364 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3551 $FACEHASH{$info->{hash64}} = $idx;#d#
3367 3552
3368 cf::cede_to_tick; 3553 cf::cede_to_tick;
3369 } 3554 }
3370 3555
3371 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
… …
3376 3561
3377 if (my $smooth = cf::face::find $info->{smooth}) { 3562 if (my $smooth = cf::face::find $info->{smooth}) {
3378 cf::face::set_smooth $idx, $smooth; 3563 cf::face::set_smooth $idx, $smooth;
3379 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3564 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3380 } else { 3565 } else {
3381 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3566 error "smooth face '$info->{smooth}' not found for face '$face'";
3382 } 3567 }
3383 3568
3384 cf::cede_to_tick; 3569 cf::cede_to_tick;
3385 } 3570 }
3386 } 3571 }
… …
3398 3583
3399 { 3584 {
3400 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3401 3586
3402 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3403 if (defined $info->{type}) { 3588 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue
3404 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3405 3591
3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3407 cf::face::set_type $idx, $info->{type}; 3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d#
3408 } else { 3596 } else {
3409 $RESOURCE{$name} = $info; 3597# $RESOURCE{$name} = $info; # unused
3410 } 3598 }
3411 3599
3412 cf::cede_to_tick; 3600 cf::cede_to_tick;
3413 } 3601 }
3414 } 3602 }
3415 3603
3416 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3604 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3417 3605
3418 1 3606 1
3419} 3607}
3420
3421cf::global->attach (on_resource_update => sub {
3422 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3423 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3424
3425 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3426 my $sound = $soundconf->{compat}[$_]
3427 or next;
3428
3429 my $face = cf::face::find "sound/$sound->[1]";
3430 cf::sound::set $sound->[0] => $face;
3431 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3432 }
3433
3434 while (my ($k, $v) = each %{$soundconf->{event}}) {
3435 my $face = cf::face::find "sound/$v";
3436 cf::sound::set $k => $face;
3437 }
3438 }
3439});
3440 3608
3441register_exticmd fx_want => sub { 3609register_exticmd fx_want => sub {
3442 my ($ns, $want) = @_; 3610 my ($ns, $want) = @_;
3443 3611
3444 while (my ($k, $v) = each %$want) { 3612 while (my ($k, $v) = each %$want) {
… …
3483sub reload_treasures { 3651sub reload_treasures {
3484 load_resource_file "$DATADIR/treasures" 3652 load_resource_file "$DATADIR/treasures"
3485 or die "unable to load treasurelists\n"; 3653 or die "unable to load treasurelists\n";
3486} 3654}
3487 3655
3656sub reload_sound {
3657 trace "loading sound config from $DATADIR/sound\n";
3658
3659 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3660
3661 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3662 my $sound = $soundconf->{compat}[$_]
3663 or next;
3664
3665 my $face = cf::face::find "sound/$sound->[1]";
3666 cf::sound::set $sound->[0] => $face;
3667 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3668 }
3669
3670 while (my ($k, $v) = each %{$soundconf->{event}}) {
3671 my $face = cf::face::find "sound/$v";
3672 cf::sound::set $k => $face;
3673 }
3674}
3675
3488sub reload_resources { 3676sub reload_resources {
3489 warn "reloading resource files...\n"; 3677 trace "reloading resource files...\n";
3490 3678
3679 reload_exp_table;
3680 reload_materials;
3491 reload_facedata; 3681 reload_facedata;
3682 reload_sound;
3492 reload_archetypes; 3683 reload_archetypes;
3493 reload_regions; 3684 reload_regions;
3494 reload_treasures; 3685 reload_treasures;
3495 3686
3496 warn "finished reloading resource files\n"; 3687 trace "finished reloading resource files\n";
3497} 3688}
3498 3689
3499sub reload_config { 3690sub reload_config {
3500 warn "reloading config file...\n"; 3691 trace "reloading config file...\n";
3501 3692
3502 open my $fh, "<:utf8", "$CONFDIR/config" 3693 my $config = load_file "$CONFDIR/config";
3503 or return; 3694 utf8::decode $config;
3695 *CFG = decode_yaml $config;
3504 3696
3505 local $/;
3506 *CFG = YAML::XS::Load scalar <$fh>;
3507
3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3509 3698
3510 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3512 3701
3513 if (exists $CFG{mlockall}) { 3702 if (exists $CFG{mlockall}) {
… …
3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3704 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3516 and die "WARNING: m(un)lockall failed: $!\n"; 3705 and die "WARNING: m(un)lockall failed: $!\n";
3517 }; 3706 };
3518 warn $@ if $@; 3707 warn $@ if $@;
3519 } 3708 }
3520
3521 warn "finished reloading resource files\n";
3522} 3709}
3523 3710
3524sub pidfile() { 3711sub pidfile() {
3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3712 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3526 or die "$PIDFILE: $!"; 3713 or die "$PIDFILE: $!";
… …
3539 seek $fh, 0, 0; 3726 seek $fh, 0, 0;
3540 print $fh $$; 3727 print $fh $$;
3541} 3728}
3542 3729
3543sub main_loop { 3730sub main_loop {
3544 warn "EV::loop starting\n"; 3731 trace "EV::loop starting\n";
3545 if (1) { 3732 if (1) {
3546 EV::loop; 3733 EV::loop;
3547 } 3734 }
3548 warn "EV::loop returned\n"; 3735 trace "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP; 3736 goto &main_loop unless $REALLY_UNLOOP;
3550} 3737}
3551 3738
3552sub main { 3739sub main {
3553 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3554 3741
3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559 3746
3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3747 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3561 3748
3562 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3563 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3564 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3751 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3565 (async { 3752 (async {
3566 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3567 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3568 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
3569 }; 3756 };
3570 3757
3571 evthread_start IO::AIO::poll_fileno; 3758 evthread_start IO::AIO::poll_fileno;
3572 3759
3573 cf::sync_job { 3760 cf::sync_job {
3574 cf::init_experience; 3761 cf::incloader::init ();
3762
3575 cf::init_anim; 3763 cf::init_anim;
3576 cf::init_attackmess; 3764 cf::init_attackmess;
3577 cf::init_dynamic; 3765 cf::init_dynamic;
3578 3766
3579 cf::load_settings; 3767 cf::load_settings;
3580 cf::load_materials;
3581 3768
3582 reload_resources; 3769 reload_resources;
3583 reload_config; 3770 reload_config;
3584 db_init; 3771 db_init;
3585 3772
… …
3597 3784
3598 # no (long-running) fork's whatsoever before this point(!) 3785 # no (long-running) fork's whatsoever before this point(!)
3599 use POSIX (); 3786 use POSIX ();
3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3787 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3601 3788
3602 (pop @POST_INIT)->(0) while @POST_INIT; 3789 cf::_post_init 0;
3603 }; 3790 };
3604 3791
3605 cf::object::thawer::errors_are_fatal 0; 3792 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n"; 3793 info "parse errors in files are no longer fatal from this point on.\n";
3607 3794
3795 AE::postpone {
3796 undef &main; # free gobs of memory :)
3797 };
3798
3608 main_loop; 3799 goto &main_loop;
3609} 3800}
3610 3801
3611############################################################################# 3802#############################################################################
3612# initialisation and cleanup 3803# initialisation and cleanup
3613 3804
… …
3652 or return; 3843 or return;
3653 3844
3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3845 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3655 and return; 3846 and return;
3656 3847
3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3848 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3658 3849
3659 1 3850 1
3660} 3851}
3661 3852
3662our $uuid_lock; 3853our $uuid_lock;
… …
3674 or return; 3865 or return;
3675 3866
3676 my $value = uuid_seq uuid_cur; 3867 my $value = uuid_seq uuid_cur;
3677 3868
3678 unless ($value) { 3869 unless ($value) {
3679 warn "cowardly refusing to write zero uuid value!\n"; 3870 info "cowardly refusing to write zero uuid value!\n";
3680 return; 3871 return;
3681 } 3872 }
3682 3873
3683 my $value = uuid_str $value + $uuid_skip; 3874 my $value = uuid_str $value + $uuid_skip;
3684 $uuid_skip = 0; 3875 $uuid_skip = 0;
… …
3694 or return; 3885 or return;
3695 3886
3696 aio_rename "$uuid~", $uuid 3887 aio_rename "$uuid~", $uuid
3697 and return; 3888 and return;
3698 3889
3699 warn "uuid file written ($value).\n"; 3890 trace "uuid file written ($value).\n";
3700 3891
3701 1 3892 1
3702 3893
3703} 3894}
3704 3895
… …
3710} 3901}
3711 3902
3712sub emergency_save() { 3903sub emergency_save() {
3713 my $freeze_guard = cf::freeze_mainloop; 3904 my $freeze_guard = cf::freeze_mainloop;
3714 3905
3715 warn "emergency_perl_save: enter\n"; 3906 info "emergency_perl_save: enter\n";
3907
3908 # this is a trade-off: we want to be very quick here, so
3909 # save all maps without fsync, and later call a global sync
3910 # (which in turn might be very very slow)
3911 local $USE_FSYNC = 0;
3716 3912
3717 cf::sync_job { 3913 cf::sync_job {
3718 # this is a trade-off: we want to be very quick here, so 3914 cf::write_runtime_sync; # external watchdog should not bark
3719 # save all maps without fsync, and later call a global sync
3720 # (which in turn might be very very slow)
3721 local $USE_FSYNC = 0;
3722 3915
3723 # use a peculiar iteration method to avoid tripping on perl 3916 # use a peculiar iteration method to avoid tripping on perl
3724 # refcount bugs in for. also avoids problems with players 3917 # refcount bugs in for. also avoids problems with players
3725 # and maps saved/destroyed asynchronously. 3918 # and maps saved/destroyed asynchronously.
3726 warn "emergency_perl_save: begin player save\n"; 3919 info "emergency_perl_save: begin player save\n";
3727 for my $login (keys %cf::PLAYER) { 3920 for my $login (keys %cf::PLAYER) {
3728 my $pl = $cf::PLAYER{$login} or next; 3921 my $pl = $cf::PLAYER{$login} or next;
3729 $pl->valid or next; 3922 $pl->valid or next;
3730 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3923 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3731 $pl->save; 3924 $pl->save;
3732 } 3925 }
3733 warn "emergency_perl_save: end player save\n"; 3926 info "emergency_perl_save: end player save\n";
3734 3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3735 warn "emergency_perl_save: begin map save\n"; 3930 info "emergency_perl_save: begin map save\n";
3736 for my $path (keys %cf::MAP) { 3931 for my $path (keys %cf::MAP) {
3737 my $map = $cf::MAP{$path} or next; 3932 my $map = $cf::MAP{$path} or next;
3738 $map->valid or next; 3933 $map->valid or next;
3739 $map->save; 3934 $map->save;
3740 } 3935 }
3741 warn "emergency_perl_save: end map save\n"; 3936 info "emergency_perl_save: end map save\n";
3742 3937
3938 cf::write_runtime_sync; # external watchdog should not bark
3939
3743 warn "emergency_perl_save: begin database checkpoint\n"; 3940 info "emergency_perl_save: begin database checkpoint\n";
3744 BDB::db_env_txn_checkpoint $DB_ENV; 3941 BDB::db_env_txn_checkpoint $DB_ENV;
3745 warn "emergency_perl_save: end database checkpoint\n"; 3942 info "emergency_perl_save: end database checkpoint\n";
3746 3943
3747 warn "emergency_perl_save: begin write uuid\n"; 3944 info "emergency_perl_save: begin write uuid\n";
3748 write_uuid_sync 1; 3945 write_uuid_sync 1;
3749 warn "emergency_perl_save: end write uuid\n"; 3946 info "emergency_perl_save: end write uuid\n";
3947
3948 cf::write_runtime_sync; # external watchdog should not bark
3949
3950 trace "emergency_perl_save: syncing database to disk";
3951 BDB::db_env_txn_checkpoint $DB_ENV;
3952
3953 info "emergency_perl_save: starting sync\n";
3954 IO::AIO::aio_sync sub {
3955 info "emergency_perl_save: finished sync\n";
3956 };
3957
3958 cf::write_runtime_sync; # external watchdog should not bark
3959
3960 trace "emergency_perl_save: flushing outstanding aio requests";
3961 while (IO::AIO::nreqs || BDB::nreqs) {
3962 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3963 }
3964
3965 cf::write_runtime_sync; # external watchdog should not bark
3750 }; 3966 };
3751 3967
3752 warn "emergency_perl_save: starting sync()\n";
3753 IO::AIO::aio_sync sub {
3754 warn "emergency_perl_save: finished sync()\n";
3755 };
3756
3757 warn "emergency_perl_save: leave\n"; 3968 info "emergency_perl_save: leave\n";
3758} 3969}
3759 3970
3760sub post_cleanup { 3971sub post_cleanup {
3761 my ($make_core) = @_; 3972 my ($make_core) = @_;
3762 3973
3974 IO::AIO::flush;
3975
3763 warn Carp::longmess "post_cleanup backtrace" 3976 error Carp::longmess "post_cleanup backtrace"
3764 if $make_core; 3977 if $make_core;
3765 3978
3766 my $fh = pidfile; 3979 my $fh = pidfile;
3767 unlink $PIDFILE if <$fh> == $$; 3980 unlink $PIDFILE if <$fh> == $$;
3768} 3981}
… …
3792 } 4005 }
3793} 4006}
3794 4007
3795sub do_reload_perl() { 4008sub do_reload_perl() {
3796 # can/must only be called in main 4009 # can/must only be called in main
3797 if ($Coro::current != $Coro::main) { 4010 unless (in_main) {
3798 warn "can only reload from main coroutine"; 4011 error "can only reload from main coroutine";
3799 return; 4012 return;
3800 } 4013 }
3801 4014
3802 return if $RELOAD++; 4015 return if $RELOAD++;
3803 4016
3804 my $t1 = AE::time; 4017 my $t1 = AE::time;
3805 4018
3806 while ($RELOAD) { 4019 while ($RELOAD) {
3807 warn "reloading..."; 4020 cf::get_slot 0.1, -1, "reload_perl";
4021 info "perl_reload: reloading...";
3808 4022
3809 warn "entering sync_job"; 4023 trace "perl_reload: entering sync_job";
3810 4024
3811 cf::sync_job { 4025 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813 cf::emergency_save; 4026 #cf::emergency_save;
3814 cf::write_runtime_sync; # external watchdog should not bark
3815 4027
3816 warn "syncing database to disk";
3817 BDB::db_env_txn_checkpoint $DB_ENV;
3818
3819 # if anything goes wrong in here, we should simply crash as we already saved
3820
3821 warn "flushing outstanding aio requests";
3822 while (IO::AIO::nreqs || BDB::nreqs) {
3823 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3824 }
3825
3826 warn "cancelling all extension coros"; 4028 trace "perl_reload: cancelling all extension coros";
3827 $_->cancel for values %EXT_CORO; 4029 $_->cancel for values %EXT_CORO;
3828 %EXT_CORO = (); 4030 %EXT_CORO = ();
3829 4031
3830 warn "removing commands"; 4032 trace "perl_reload: removing commands";
3831 %COMMAND = (); 4033 %COMMAND = ();
3832 4034
3833 warn "removing ext/exti commands"; 4035 trace "perl_reload: removing ext/exti commands";
3834 %EXTCMD = (); 4036 %EXTCMD = ();
3835 %EXTICMD = (); 4037 %EXTICMD = ();
3836 4038
3837 warn "unloading/nuking all extensions"; 4039 trace "perl_reload: unloading/nuking all extensions";
3838 for my $pkg (@EXTS) { 4040 for my $pkg (@EXTS) {
3839 warn "... unloading $pkg"; 4041 trace "... unloading $pkg";
3840 4042
3841 if (my $cb = $pkg->can ("unload")) { 4043 if (my $cb = $pkg->can ("unload")) {
3842 eval { 4044 eval {
3843 $cb->($pkg); 4045 $cb->($pkg);
3844 1 4046 1
3845 } or warn "$pkg unloaded, but with errors: $@"; 4047 } or error "$pkg unloaded, but with errors: $@";
3846 } 4048 }
3847 4049
3848 warn "... clearing $pkg"; 4050 trace "... clearing $pkg";
3849 clear_package $pkg; 4051 clear_package $pkg;
3850 } 4052 }
3851 4053
3852 warn "unloading all perl modules loaded from $LIBDIR"; 4054 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3853 while (my ($k, $v) = each %INC) { 4055 while (my ($k, $v) = each %INC) {
3854 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4056 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3855 4057
3856 warn "... unloading $k"; 4058 trace "... unloading $k";
3857 delete $INC{$k}; 4059 delete $INC{$k};
3858 4060
3859 $k =~ s/\.pm$//; 4061 $k =~ s/\.pm$//;
3860 $k =~ s/\//::/g; 4062 $k =~ s/\//::/g;
3861 4063
… …
3864 } 4066 }
3865 4067
3866 clear_package $k; 4068 clear_package $k;
3867 } 4069 }
3868 4070
3869 warn "getting rid of safe::, as good as possible"; 4071 trace "perl_reload: getting rid of safe::, as good as possible";
3870 clear_package "safe::$_" 4072 clear_package "safe::$_"
3871 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4073 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3872 4074
3873 warn "unloading cf.pm \"a bit\""; 4075 trace "perl_reload: unloading cf.pm \"a bit\"";
3874 delete $INC{"cf.pm"}; 4076 delete $INC{"cf.pm"};
3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4077 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3876 4078
3877 # don't, removes xs symbols, too, 4079 # don't, removes xs symbols, too,
3878 # and global variables created in xs 4080 # and global variables created in xs
3879 #clear_package __PACKAGE__; 4081 #clear_package __PACKAGE__;
3880 4082
3881 warn "unload completed, starting to reload now"; 4083 info "perl_reload: unload completed, starting to reload now";
3882 4084
3883 warn "reloading cf.pm"; 4085 trace "perl_reload: reloading cf.pm";
3884 require cf; 4086 require cf;
3885 cf::_connect_to_perl_1; 4087 cf::_connect_to_perl_1;
3886 4088
3887 warn "loading config and database again"; 4089 trace "perl_reload: loading config and database again";
3888 cf::reload_config; 4090 cf::reload_config;
3889 4091
3890 warn "loading extensions"; 4092 trace "perl_reload: loading extensions";
3891 cf::load_extensions; 4093 cf::load_extensions;
3892 4094
3893 if ($REATTACH_ON_RELOAD) { 4095 if ($REATTACH_ON_RELOAD) {
3894 warn "reattaching attachments to objects/players"; 4096 trace "perl_reload: reattaching attachments to objects/players";
3895 _global_reattach; # objects, sockets 4097 _global_reattach; # objects, sockets
3896 warn "reattaching attachments to maps"; 4098 trace "perl_reload: reattaching attachments to maps";
3897 reattach $_ for values %MAP; 4099 reattach $_ for values %MAP;
3898 warn "reattaching attachments to players"; 4100 trace "perl_reload: reattaching attachments to players";
3899 reattach $_ for values %PLAYER; 4101 reattach $_ for values %PLAYER;
3900 } 4102 }
3901 4103
3902 warn "running post_init jobs"; 4104 cf::_post_init 1;
3903 (pop @POST_INIT)->(1) while @POST_INIT;
3904 4105
3905 warn "leaving sync_job"; 4106 trace "perl_reload: leaving sync_job";
3906 4107
3907 1 4108 1
3908 } or do { 4109 } or do {
3909 warn $@; 4110 error $@;
3910 cf::cleanup "error while reloading, exiting."; 4111 cf::cleanup "perl_reload: error, exiting.";
3911 }; 4112 };
3912 4113
3913 warn "reloaded";
3914 --$RELOAD; 4114 --$RELOAD;
3915 } 4115 }
3916 4116
3917 $t1 = AE::time - $t1; 4117 $t1 = AE::time - $t1;
3918 warn "reload completed in ${t1}s\n"; 4118 info "perl_reload: completed in ${t1}s\n";
3919}; 4119};
3920 4120
3921our $RELOAD_WATCHER; # used only during reload 4121our $RELOAD_WATCHER; # used only during reload
3922 4122
3923sub reload_perl() { 4123sub reload_perl() {
… …
3944 reload_perl; 4144 reload_perl;
3945 }; 4145 };
3946 } 4146 }
3947}; 4147};
3948 4148
3949unshift @INC, $LIBDIR; 4149#############################################################################
3950 4150
3951my $bug_warning = 0; 4151my $bug_warning = 0;
3952 4152
3953our @WAIT_FOR_TICK;
3954our @WAIT_FOR_TICK_BEGIN;
3955
3956sub wait_for_tick { 4153sub wait_for_tick() {
3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3958 4155
3959 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
3960 push @WAIT_FOR_TICK, $signal;
3961 $signal->wait;
3962} 4157}
3963 4158
3964sub wait_for_tick_begin { 4159sub wait_for_tick_begin() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966 4161
3967 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
3968 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
3969 $signal->wait; 4164 $signal->wait;
3970} 4165}
… …
3974 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4169 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3975 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
3976 return; 4171 return;
3977 } 4172 }
3978 4173
3979 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
3980 4175
3981 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4176 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3982 4177
3983 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4179 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3985 Coro::async_pool { 4180 Coro::async_pool {
3986 $Coro::current->{desc} = "runtime saver"; 4181 $Coro::current->{desc} = "runtime saver";
3987 write_runtime_sync 4182 write_runtime_sync
3988 or warn "ERROR: unable to write runtime file: $!"; 4183 or error "ERROR: unable to write runtime file: $!";
3989 }; 4184 };
3990 } 4185 }
3991 4186
3992 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3993 $sig->send; 4188 $sig->send;
3994 } 4189 }
3995 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
3996 $sig->send;
3997 }
3998 4191
3999 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
4000 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4001 4194
4002 if (0) { 4195 if (0) {
4003 if ($NEXT_TICK) { 4196 if ($NEXT_TICK) {
4004 my $jitter = $TICK_START - $NEXT_TICK; 4197 my $jitter = $TICK_START - $NEXT_TICK;
4005 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4198 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4006 warn "jitter $JITTER\n";#d# 4199 debug "jitter $JITTER\n";#d#
4007 } 4200 }
4008 } 4201 }
4009} 4202}
4010 4203
4011{ 4204{
4012 # configure BDB 4205 # configure BDB
4013 4206
4014 BDB::min_parallel 16; 4207 BDB::min_parallel 16;
4015 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
4016 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
4017 4210
4018 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
4019 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
4020 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4021 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4214 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4056 IO::AIO::min_parallel 8; 4249 IO::AIO::min_parallel 8;
4057 IO::AIO::max_poll_time $TICK * 0.1; 4250 IO::AIO::max_poll_time $TICK * 0.1;
4058 undef $AnyEvent::AIO::WATCHER; 4251 undef $AnyEvent::AIO::WATCHER;
4059} 4252}
4060 4253
4061my $_log_backtrace; 4254our $_log_backtrace;
4255our $_log_backtrace_last;
4062 4256
4063sub _log_backtrace { 4257sub _log_backtrace {
4064 my ($msg, @addr) = @_; 4258 my ($msg, @addr) = @_;
4065 4259
4066 $msg =~ s/\n//; 4260 $msg =~ s/\n$//;
4067 4261
4262 if ($_log_backtrace_last eq $msg) {
4263 LOG llevInfo, "[ABT] $msg\n";
4264 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4068 # limit the # of concurrent backtraces 4265 # limit the # of concurrent backtraces
4069 if ($_log_backtrace < 2) { 4266 } elsif ($_log_backtrace < 2) {
4267 $_log_backtrace_last = $msg;
4070 ++$_log_backtrace; 4268 ++$_log_backtrace;
4071 my $perl_bt = Carp::longmess $msg; 4269 my $perl_bt = Carp::longmess $msg;
4072 async { 4270 async {
4073 $Coro::current->{desc} = "abt $msg"; 4271 $Coro::current->{desc} = "abt $msg";
4074 4272
… …
4094 LOG llevInfo, "[ABT] $_\n" for @bt; 4292 LOG llevInfo, "[ABT] $_\n" for @bt;
4095 --$_log_backtrace; 4293 --$_log_backtrace;
4096 }; 4294 };
4097 } else { 4295 } else {
4098 LOG llevInfo, "[ABT] $msg\n"; 4296 LOG llevInfo, "[ABT] $msg\n";
4099 LOG llevInfo, "[ABT] [suppressed]\n"; 4297 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4100 } 4298 }
4101} 4299}
4102 4300
4103# load additional modules 4301# load additional modules
4104require "cf/$_.pm" for @EXTRA_MODULES; 4302require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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