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.483 by root, Mon Oct 12 04:02:17 2009 UTC vs.
Revision 1.506 by root, Wed Feb 3 20:48:22 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
227returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
228per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
229 230
230=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
231 232
232This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call. 235that call.
235 236
236=item %cf::REFLECT 237=item %cf::REFLECT
237 238
… …
288)) { 289)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 291}
291 292
292$EV::DIED = sub { 293$EV::DIED = sub {
293 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
294}; 295};
295 296
296############################################################################# 297#############################################################################
297 298
298=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
422 423
423=cut 424=cut
424 425
425our @SLOT_QUEUE; 426our @SLOT_QUEUE;
426our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
427 429
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
431 433
432 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
433 436
434 while () { 437 while () {
435 next_job: 438 next_job:
439
436 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 441
438 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 446 $job->[2]->send;
442 Coro::cede; 447 Coro::cede;
443 goto next_job; 448 goto next_job;
444 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 451 }
446 } 452 }
447 453
448 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait; 457 $signal->wait;
452 } else { 458 } else {
459 $busy = 0;
453 Coro::schedule; 460 Coro::schedule;
454 } 461 }
455 } 462 }
456}; 463};
457 464
458sub get_slot($;$$) { 465sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
460 467
461 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
462 469
463 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
464 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
465 473
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1391 . "\n};\n1"; 1399 . "\n};\n1";
1392 1400
1393 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1394 } 1402 }
1395 1403
1404 my $pass = 0;
1396 my %done; 1405 my %done;
1397 while (%todo) { 1406 while (%todo) {
1398 my $progress; 1407 my $progress;
1399 1408
1409 ++$pass;
1410
1411 ext:
1400 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1414 next ext
1403 unless exists $done{$_}; 1415 unless exists $done{$_};
1404 } 1416 }
1405 1417
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1419
1408 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1424
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1426 if exists $v->{meta}{mandatory};
1416 1427 } else {
1417 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1418 } 1434 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1435 }
1424 1436
1425 skip: 1437 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1428 } 1445 }
1429 }; 1446 };
1430} 1447}
1431 1448
1432############################################################################# 1449#############################################################################
… …
2008 2025
2009 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2010 } 2027 }
2011} 2028}
2012 2029
2013sub pre_load { } 2030sub pre_load { }
2014sub post_load { } 2031#sub post_load { } # XS
2015 2032
2016sub load { 2033sub load {
2017 my ($self) = @_; 2034 my ($self) = @_;
2018 2035
2019 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2340 : normalise $_ 2357 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2359 ]
2343} 2360}
2344 2361
2362=item cf::map::static_maps
2363
2364Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2365file in the shared directory excluding F</styles> and F</editor>). May
2366block.
2367
2368=cut
2369
2370sub static_maps() {
2371 my @dirs = "";
2372 my @maps;
2373
2374 while (@dirs) {
2375 my $dir = shift @dirs;
2376
2377 next if $dir eq "/styles" || $dir eq "/editor";
2378
2379 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2380 or return;
2381
2382 for (@$files) {
2383 s/\.map$// or next;
2384 utf8::decode $_;
2385 push @maps, "$dir/$_";
2386 }
2387
2388 push @dirs, map "$dir/$_", @$dirs;
2389 }
2390
2391 \@maps
2392}
2393
2345=back 2394=back
2346 2395
2347=head3 cf::object 2396=head3 cf::object
2348 2397
2349=cut 2398=cut
… …
2544 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2546 2595
2547 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2550 2599
2551 $map->load; 2600 $map->load;
2552 $map->load_neighbours; 2601 $map->load_neighbours;
2553 2602
2554 return unless $self->contr->active; 2603 return unless $self->contr->active;
… …
2753 2802
2754 utf8::encode $text; 2803 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2756} 2805}
2757 2806
2807=item $client->send_big_packet ($pkt)
2808
2809Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required.
2811
2812=cut
2813
2814our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2815
2816sub cf::client::send_big_packet {
2817 my ($self, $pkt) = @_;
2818
2819 # try lzf for large packets
2820 $pkt = "lzf " . Compress::LZF::compress $pkt
2821 if 1024 <= length $pkt and $self->{can_lzf};
2822
2823 # split very large packets
2824 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2825 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2826 $pkt = "frag";
2827 }
2828
2829 $self->send_packet ($pkt);
2830}
2831
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2833
2760Send a drawinfo or msg packet to the client, formatting the msg for the 2834Send a drawinfo or msg packet to the client, formatting the msg for the
2761client if neccessary. C<$type> should be a string identifying the type of 2835client if neccessary. C<$type> should be a string identifying the type of
2762the message, with C<log> being the default. If C<$color> is negative, suppress 2836the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2764 2838
2765=cut 2839=cut
2766 2840
2767# non-persistent channels (usually the info channel) 2841# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2769 "c/identify" => { 2849 "c/identify" => {
2770 id => "infobox", 2850 id => "infobox",
2771 title => "Identify", 2851 title => "Identify",
2772 reply => undef, 2852 reply => undef,
2773 tooltip => "Items recently identified", 2853 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2855 "c/examine" => {
2776 id => "infobox", 2856 id => "infobox",
2777 title => "Examine", 2857 title => "Examine",
2778 reply => undef, 2858 reply => undef,
2779 tooltip => "Signs and other items you examined", 2859 tooltip => "Signs and other items you examined",
2860 },
2861 "c/shopinfo" => {
2862 id => "infobox",
2863 title => "Shop Info",
2864 reply => undef,
2865 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 2866 },
2781 "c/book" => { 2867 "c/book" => {
2782 id => "infobox", 2868 id => "infobox",
2783 title => "Book", 2869 title => "Book",
2784 reply => undef, 2870 reply => undef,
… …
2900 my $pkt = "msg " 2986 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 2987 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 2989 );
2904 2990
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 2991 $self->send_big_packet ($pkt);
2916} 2992}
2917 2993
2918=item $client->ext_msg ($type, @msg) 2994=item $client->ext_msg ($type, @msg)
2919 2995
2920Sends an ext event to the client. 2996Sends an ext event to the client.
… …
2923 2999
2924sub cf::client::ext_msg($$@) { 3000sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3001 my ($self, $type, @msg) = @_;
2926 3002
2927 if ($self->extcmd == 2) { 3003 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3005 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3006 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3008 }
2933} 3009}
2934 3010
2935=item $client->ext_reply ($msgid, @msg) 3011=item $client->ext_reply ($msgid, @msg)
2936 3012
… …
2940 3016
2941sub cf::client::ext_reply($$@) { 3017sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3018 my ($self, $id, @msg) = @_;
2943 3019
2944 if ($self->extcmd == 2) { 3020 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3022 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3023 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3024 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3026 }
2951} 3027}
2952 3028
2953=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2954 3030
… …
3081our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
3082 3158
3083$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
3084 3160
3085$safe->permit_only (Opcode::opset qw( 3161$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3162 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3163 grepstart grepwhile mapstart mapwhile
3088 sort time 3164 sort time
3089)); 3165));
3090 3166
3091# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
3145 3221
3146 %vars = (_dummy => 0) unless %vars; 3222 %vars = (_dummy => 0) unless %vars;
3147 3223
3224 my @res;
3148 local $_; 3225 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3226
3151 my $eval = 3227 my $eval =
3152 "do {\n" 3228 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3231 . $code
3156 . "\n}" 3232 . "\n}"
3157 ; 3233 ;
3158 3234
3235 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3239 sub_generation_inc;
3240 } else {
3241 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval;
3243 }
3162 3244
3163 if ($@) { 3245 if ($@) {
3164 warn "$@"; 3246 warn "$@";
3165 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
3185=cut 3267=cut
3186 3268
3187sub register_script_function { 3269sub register_script_function {
3188 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
3189 3271
3190 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
3192} 3274}
3193 3275
3194=back 3276=back
3195 3277
3196=cut 3278=cut
… …
3217 3299
3218 $facedata->{version} == 2 3300 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3302
3221 # patch in the exptable 3303 # patch in the exptable
3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3305 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3306 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3307 data => $exp_table,
3308 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3309 };
3226 cf::cede_to_tick; 3310 cf::cede_to_tick;
3227 3311
3228 { 3312 {
3229 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3317
3234 cf::face::set_visibility $idx, $info->{visibility}; 3318 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3322
3239 cf::cede_to_tick; 3323 cf::cede_to_tick;
3240 } 3324 }
3241 3325
3242 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
… …
3266 3350
3267 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
3268 } 3352 }
3269 3353
3270 { 3354 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3355 my $res = $facedata->{resource};
3274 3356
3275 while (my ($name, $info) = each %$res) { 3357 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3358 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3360
3280 if ($info->{type} & 1) { 3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3362 cf::face::set_type $idx, $info->{type};
3295 } else { 3363 } else {
3296 $RESOURCE{$name} = $info; 3364 $RESOURCE{$name} = $info;
3297 } 3365 }
3298 3366
… …
3382 3450
3383 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
3384} 3452}
3385 3453
3386sub reload_config { 3454sub reload_config {
3455 warn "reloading config file...\n";
3456
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
3388 or return; 3458 or return;
3389 3459
3390 local $/; 3460 local $/;
3391 *CFG = YAML::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
3392 3462
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3394 3464
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3400 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3401 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
3402 }; 3472 };
3403 warn $@ if $@; 3473 warn $@ if $@;
3404 } 3474 }
3475
3476 warn "finished reloading resource files\n";
3405} 3477}
3406 3478
3407sub pidfile() { 3479sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!"; 3481 or die "$PIDFILE: $!";
… …
3457 }; 3529 };
3458 3530
3459 evthread_start IO::AIO::poll_fileno; 3531 evthread_start IO::AIO::poll_fileno;
3460 3532
3461 cf::sync_job { 3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3462 reload_resources; 3537 reload_resources;
3463 reload_config; 3538 reload_config;
3464 db_init; 3539 db_init;
3465 3540
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3541 cf::init_uuid;
3469 cf::init_signals; 3542 cf::init_signals;
3470 cf::init_commands; 3543 cf::init_commands;
3471 cf::init_skills; 3544 cf::init_skills;
3472 3545
… …
3500 }; 3573 };
3501 } 3574 }
3502} 3575}
3503 3576
3504sub write_runtime_sync { 3577sub write_runtime_sync {
3578 my $t0 = EV::time;
3579
3505 # first touch the runtime file to show we are still running: 3580 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3581 # the fsync below can take a very very long time.
3507 3582
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3584
3510 my $guard = cf::lock_acquire "write_runtime"; 3585 my $guard = cf::lock_acquire "write_runtime";
3511 3586
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3587 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3588 or return;
3514 3589
3515 my $value = $cf::RUNTIME + 90 + 10; 3590 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3591 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3592 # 60 allows for the watchdog to kill the server.
… …
3530 or return; 3605 or return;
3531 3606
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3608 and return;
3534 3609
3535 warn "runtime file written.\n"; 3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3536 3611
3537 1 3612 1
3538} 3613}
3539 3614
3540our $uuid_lock; 3615our $uuid_lock;
… …
3831 3906
3832our @WAIT_FOR_TICK; 3907our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 3908our @WAIT_FOR_TICK_BEGIN;
3834 3909
3835sub wait_for_tick { 3910sub wait_for_tick {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 3912
3838 my $signal = new Coro::Signal; 3913 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 3914 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 3915 $signal->wait;
3841} 3916}
3842 3917
3843sub wait_for_tick_begin { 3918sub wait_for_tick_begin {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 3920
3846 my $signal = new Coro::Signal; 3921 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 3922 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 3923 $signal->wait;
3849} 3924}
… …
3854 unless ++$bug_warning > 10; 3929 unless ++$bug_warning > 10;
3855 return; 3930 return;
3856 } 3931 }
3857 3932
3858 cf::server_tick; # one server iteration 3933 cf::server_tick; # one server iteration
3934
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3859 3936
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3937 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 3939 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 3940 $Coro::current->{desc} = "runtime saver";
… …
3886} 3963}
3887 3964
3888{ 3965{
3889 # configure BDB 3966 # configure BDB
3890 3967
3891 BDB::min_parallel 8; 3968 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 3969 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 3970 $AnyEvent::BDB::WATCHER->priority (1);
3894 3971
3895 unless ($DB_ENV) { 3972 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 3973 $DB_ENV = BDB::db_env_create;

Diff Legend

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