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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.503 by root, Sat Jan 30 23:46:39 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 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
… …
117our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 121our $DB_ENV;
121 122
122our @EXTRA_MODULES = qw(pod mapscript); 123our @EXTRA_MODULES = qw(pod match mapscript);
123 124
124our %CFG; 125our %CFG;
125 126
126our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 128our $RUNTIME;
… …
170 my $reflect = JSON::XS::decode_json $_; 171 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 172 $REFLECT{$reflect->{class}} = $reflect;
172} 173}
173 174
174# this is decidedly evil 175# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 177
177############################################################################# 178#############################################################################
178 179
179=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
180 181
… …
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;
… …
2008 2016
2009 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
2010 } 2018 }
2011} 2019}
2012 2020
2013sub pre_load { } 2021sub pre_load { }
2014sub post_load { } 2022#sub post_load { } # XS
2015 2023
2016sub load { 2024sub load {
2017 my ($self) = @_; 2025 my ($self) = @_;
2018 2026
2019 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
… …
2340 : normalise $_ 2348 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2350 ]
2343} 2351}
2344 2352
2353=item cf::map::static_maps
2354
2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2358
2359=cut
2360
2361sub static_maps() {
2362 my @dirs = "";
2363 my @maps;
2364
2365 while (@dirs) {
2366 my $dir = shift @dirs;
2367
2368 next if $dir eq "/styles" || $dir eq "/editor";
2369
2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2371 or return;
2372
2373 for (@$files) {
2374 s/\.map$// or next;
2375 utf8::decode $_;
2376 push @maps, "$dir/$_";
2377 }
2378
2379 push @dirs, map "$dir/$_", @$dirs;
2380 }
2381
2382 \@maps
2383}
2384
2345=back 2385=back
2346 2386
2347=head3 cf::object 2387=head3 cf::object
2348 2388
2349=cut 2389=cut
… …
2544 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2546 2586
2547 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2550 2590
2551 $map->load; 2591 $map->load;
2552 $map->load_neighbours; 2592 $map->load_neighbours;
2553 2593
2554 return unless $self->contr->active; 2594 return unless $self->contr->active;
… …
2753 2793
2754 utf8::encode $text; 2794 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2756} 2796}
2757 2797
2798=item $client->send_big_packet ($pkt)
2799
2800Like C<send_packet>, but tries to compress large packets, and fragments
2801them as required.
2802
2803=cut
2804
2805our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2806
2807sub cf::client::send_big_packet {
2808 my ($self, $pkt) = @_;
2809
2810 # try lzf for large packets
2811 $pkt = "lzf " . Compress::LZF::compress $pkt
2812 if 1024 <= length $pkt and $self->{can_lzf};
2813
2814 # split very large packets
2815 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2816 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2817 $pkt = "frag";
2818 }
2819
2820 $self->send_packet ($pkt);
2821}
2822
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2824
2760Send a drawinfo or msg packet to the client, formatting the msg for the 2825Send 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 2826client 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 2827the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2764 2829
2765=cut 2830=cut
2766 2831
2767# non-persistent channels (usually the info channel) 2832# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2769 "c/identify" => { 2840 "c/identify" => {
2770 id => "infobox", 2841 id => "infobox",
2771 title => "Identify", 2842 title => "Identify",
2772 reply => undef, 2843 reply => undef,
2773 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2846 "c/examine" => {
2776 id => "infobox", 2847 id => "infobox",
2777 title => "Examine", 2848 title => "Examine",
2778 reply => undef, 2849 reply => undef,
2779 tooltip => "Signs and other items you examined", 2850 tooltip => "Signs and other items you examined",
2851 },
2852 "c/shopinfo" => {
2853 id => "infobox",
2854 title => "Shop Info",
2855 reply => undef,
2856 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 2857 },
2781 "c/book" => { 2858 "c/book" => {
2782 id => "infobox", 2859 id => "infobox",
2783 title => "Book", 2860 title => "Book",
2784 reply => undef, 2861 reply => undef,
… …
2900 my $pkt = "msg " 2977 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 2978 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 2980 );
2904 2981
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); 2982 $self->send_big_packet ($pkt);
2916} 2983}
2917 2984
2918=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2919 2986
2920Sends an ext event to the client. 2987Sends an ext event to the client.
… …
2923 2990
2924sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2926 2993
2927 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 2999 }
2933} 3000}
2934 3001
2935=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2936 3003
… …
2940 3007
2941sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2943 3010
2944 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3014 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3017 }
2951} 3018}
2952 3019
2953=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2954 3021
… …
3081our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
3082 3149
3083$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
3084 3151
3085$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
3088 sort time 3155 sort time
3089)); 3156));
3090 3157
3091# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
3145 3212
3146 %vars = (_dummy => 0) unless %vars; 3213 %vars = (_dummy => 0) unless %vars;
3147 3214
3215 my @res;
3148 local $_; 3216 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3217
3151 my $eval = 3218 my $eval =
3152 "do {\n" 3219 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3222 . $code
3156 . "\n}" 3223 . "\n}"
3157 ; 3224 ;
3158 3225
3226 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3230 sub_generation_inc;
3231 } else {
3232 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval;
3234 }
3162 3235
3163 if ($@) { 3236 if ($@) {
3164 warn "$@"; 3237 warn "$@";
3165 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
3185=cut 3258=cut
3186 3259
3187sub register_script_function { 3260sub register_script_function {
3188 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
3189 3262
3190 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
3192} 3265}
3193 3266
3194=back 3267=back
3195 3268
3196=cut 3269=cut
… …
3217 3290
3218 $facedata->{version} == 2 3291 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3293
3221 # patch in the exptable 3294 # patch in the exptable
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3297 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3298 data => $exp_table,
3299 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3300 };
3226 cf::cede_to_tick; 3301 cf::cede_to_tick;
3227 3302
3228 { 3303 {
3229 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3308
3234 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3313
3239 cf::cede_to_tick; 3314 cf::cede_to_tick;
3240 } 3315 }
3241 3316
3242 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
… …
3266 3341
3267 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3268 } 3343 }
3269 3344
3270 { 3345 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3274 3347
3275 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3349 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3351
3280 if ($info->{type} & 1) { 3352 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}; 3353 cf::face::set_type $idx, $info->{type};
3295 } else { 3354 } else {
3296 $RESOURCE{$name} = $info; 3355 $RESOURCE{$name} = $info;
3297 } 3356 }
3298 3357
… …
3382 3441
3383 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3384} 3443}
3385 3444
3386sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3388 or return; 3449 or return;
3389 3450
3390 local $/; 3451 local $/;
3391 *CFG = YAML::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3392 3453
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3394 3455
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3456 $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}; 3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3400 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3401 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3402 }; 3463 };
3403 warn $@ if $@; 3464 warn $@ if $@;
3404 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3405} 3468}
3406 3469
3407sub pidfile() { 3470sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!"; 3472 or die "$PIDFILE: $!";
… …
3457 }; 3520 };
3458 3521
3459 evthread_start IO::AIO::poll_fileno; 3522 evthread_start IO::AIO::poll_fileno;
3460 3523
3461 cf::sync_job { 3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3462 reload_resources; 3528 reload_resources;
3463 reload_config; 3529 reload_config;
3464 db_init; 3530 db_init;
3465 3531
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3532 cf::init_uuid;
3469 cf::init_signals; 3533 cf::init_signals;
3470 cf::init_commands; 3534 cf::init_commands;
3471 cf::init_skills; 3535 cf::init_skills;
3472 3536
… …
3759 3823
3760 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3761 3825
3762 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3763 require cf; 3827 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3765 3829
3766 warn "loading config and database again"; 3830 warn "loading config and database again";
3767 cf::reload_config; 3831 cf::reload_config;
3768 3832
3769 warn "loading extensions"; 3833 warn "loading extensions";
… …
3831 3895
3832our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3834 3898
3835sub wait_for_tick { 3899sub wait_for_tick {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 3901
3838 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 3904 $signal->wait;
3841} 3905}
3842 3906
3843sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 3909
3846 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 3912 $signal->wait;
3849} 3913}
… …
3854 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3855 return; 3919 return;
3856 } 3920 }
3857 3921
3858 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3923
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3859 3925
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 3928 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";
… …
3886} 3952}
3887 3953
3888{ 3954{
3889 # configure BDB 3955 # configure BDB
3890 3956
3891 BDB::min_parallel 8; 3957 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 3958 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 3959 $AnyEvent::BDB::WATCHER->priority (1);
3894 3960
3895 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
… …
3977 } 4043 }
3978} 4044}
3979 4045
3980# load additional modules 4046# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3982 4049
3983END { cf::emergency_save } 4050END { cf::emergency_save }
3984 4051
39851 40521
3986 4053

Diff Legend

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