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.477 by root, Wed Sep 2 22:52:36 2009 UTC vs.
Revision 1.501 by root, Sat Jan 16 23:27:21 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
… …
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
115our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 121our $DB_ENV;
119 122
120our @EXTRA_MODULES = qw(pod mapscript); 123our @EXTRA_MODULES = qw(pod match mapscript);
121 124
122our %CFG; 125our %CFG;
123 126
124our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 128our $RUNTIME;
… …
161 164
162sub cf::map::normalise; 165sub cf::map::normalise;
163 166
164############################################################################# 167#############################################################################
165 168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
177
178#############################################################################
179
166=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
167 181
168=over 4 182=over 4
169 183
170=item $cf::UPTIME 184=item $cf::UPTIME
… …
214returns 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
215per 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.
216 230
217=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
218 232
219This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 235that call.
236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
222 242
223=back 243=back
224 244
225=cut 245=cut
226 246
… …
269)) { 289)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 291}
272 292
273$EV::DIED = sub { 293$EV::DIED = sub {
274 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
275}; 295};
276 296
277############################################################################# 297#############################################################################
278 298
279=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
1989 2009
1990 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1991 } 2011 }
1992} 2012}
1993 2013
1994sub pre_load { } 2014sub pre_load { }
1995sub post_load { } 2015#sub post_load { } # XS
1996 2016
1997sub load { 2017sub load {
1998 my ($self) = @_; 2018 my ($self) = @_;
1999 2019
2000 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
… …
2220 2240
2221 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222 2242
2223 return if $self->players; 2243 return if $self->players;
2224 2244
2225 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2226 2246
2227 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2228 2248
2229 # need to save uniques path 2249 # need to save uniques path
2230 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2321 : normalise $_ 2341 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2343 ]
2324} 2344}
2325 2345
2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2377
2326=back 2378=back
2327 2379
2328=head3 cf::object 2380=head3 cf::object
2329 2381
2330=cut 2382=cut
… …
2525 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2527 2579
2528 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2531 2583
2532 $map->load; 2584 $map->load;
2533 $map->load_neighbours; 2585 $map->load_neighbours;
2534 2586
2535 return unless $self->contr->active; 2587 return unless $self->contr->active;
… …
2734 2786
2735 utf8::encode $text; 2787 utf8::encode $text;
2736 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2737} 2789}
2738 2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2814}
2815
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2817
2741Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
2742client if neccessary. C<$type> should be a string identifying the type of 2819client if neccessary. C<$type> should be a string identifying the type of
2743the message, with C<log> being the default. If C<$color> is negative, suppress 2820the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2745 2822
2746=cut 2823=cut
2747 2824
2748# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2750 "c/identify" => { 2833 "c/identify" => {
2751 id => "infobox", 2834 id => "infobox",
2752 title => "Identify", 2835 title => "Identify",
2753 reply => undef, 2836 reply => undef,
2754 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2756 "c/examine" => { 2839 "c/examine" => {
2757 id => "infobox", 2840 id => "infobox",
2758 title => "Examine", 2841 title => "Examine",
2759 reply => undef, 2842 reply => undef,
2760 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2761 }, 2850 },
2762 "c/book" => { 2851 "c/book" => {
2763 id => "infobox", 2852 id => "infobox",
2764 title => "Book", 2853 title => "Book",
2765 reply => undef, 2854 reply => undef,
… …
2881 my $pkt = "msg " 2970 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 2973 );
2885 2974
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 2975 $self->send_big_packet ($pkt);
2897} 2976}
2898 2977
2899=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2900 2979
2901Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2904 2983
2905sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2907 2986
2908 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 2992 }
2914} 2993}
2915 2994
2916=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2917 2996
… …
2921 3000
2922sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2924 3003
2925 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3007 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3010 }
2932} 3011}
2933 3012
2934=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2935 3014
… …
3062our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3063 3142
3064$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3065 3144
3066$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3069 sort time 3148 sort time
3070)); 3149));
3071 3150
3072# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3126 3205
3127 %vars = (_dummy => 0) unless %vars; 3206 %vars = (_dummy => 0) unless %vars;
3128 3207
3208 my @res;
3129 local $_; 3209 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3210
3132 my $eval = 3211 my $eval =
3133 "do {\n" 3212 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3215 . $code
3137 . "\n}" 3216 . "\n}"
3138 ; 3217 ;
3139 3218
3219 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3223 sub_generation_inc;
3224 } else {
3225 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval;
3227 }
3143 3228
3144 if ($@) { 3229 if ($@) {
3145 warn "$@"; 3230 warn "$@";
3146 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
… …
3166=cut 3251=cut
3167 3252
3168sub register_script_function { 3253sub register_script_function {
3169 my ($fun, $cb) = @_; 3254 my ($fun, $cb) = @_;
3170 3255
3171 no strict 'refs'; 3256 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3257 *$fun = $safe_hole->wrap ($cb);
3173} 3258}
3174 3259
3175=back 3260=back
3176 3261
3177=cut 3262=cut
… …
3198 3283
3199 $facedata->{version} == 2 3284 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3285 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3286
3202 # patch in the exptable 3287 # patch in the exptable
3288 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3289 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3290 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3291 data => $exp_table,
3292 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3293 };
3207 cf::cede_to_tick; 3294 cf::cede_to_tick;
3208 3295
3209 { 3296 {
3210 my $faces = $facedata->{faceinfo}; 3297 my $faces = $facedata->{faceinfo};
… …
3212 while (my ($face, $info) = each %$faces) { 3299 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3300 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3301
3215 cf::face::set_visibility $idx, $info->{visibility}; 3302 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3303 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3306
3220 cf::cede_to_tick; 3307 cf::cede_to_tick;
3221 } 3308 }
3222 3309
3223 while (my ($face, $info) = each %$faces) { 3310 while (my ($face, $info) = each %$faces) {
… …
3247 3334
3248 cf::anim::invalidate_all; # d'oh 3335 cf::anim::invalidate_all; # d'oh
3249 } 3336 }
3250 3337
3251 { 3338 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3339 my $res = $facedata->{resource};
3255 3340
3256 while (my ($name, $info) = each %$res) { 3341 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3342 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3343 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3344
3261 if ($info->{type} & 1) { 3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3346 cf::face::set_type $idx, $info->{type};
3276 } else { 3347 } else {
3277 $RESOURCE{$name} = $info; 3348 $RESOURCE{$name} = $info;
3278 } 3349 }
3279 3350
… …
3363 3434
3364 warn "finished reloading resource files\n"; 3435 warn "finished reloading resource files\n";
3365} 3436}
3366 3437
3367sub reload_config { 3438sub reload_config {
3439 warn "reloading config file...\n";
3440
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3441 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3442 or return;
3370 3443
3371 local $/; 3444 local $/;
3372 *CFG = YAML::Load <$fh>; 3445 *CFG = YAML::XS::Load scalar <$fh>;
3373 3446
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3375 3448
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3449 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3455 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3456 };
3384 warn $@ if $@; 3457 warn $@ if $@;
3385 } 3458 }
3459
3460 warn "finished reloading resource files\n";
3386} 3461}
3387 3462
3388sub pidfile() { 3463sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!"; 3465 or die "$PIDFILE: $!";
… …
3438 }; 3513 };
3439 3514
3440 evthread_start IO::AIO::poll_fileno; 3515 evthread_start IO::AIO::poll_fileno;
3441 3516
3442 cf::sync_job { 3517 cf::sync_job {
3518 cf::load_settings;
3519 cf::load_materials;
3520
3443 reload_resources; 3521 reload_resources;
3444 reload_config; 3522 reload_config;
3445 db_init; 3523 db_init;
3446 3524
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3525 cf::init_uuid;
3450 cf::init_signals; 3526 cf::init_signals;
3451 cf::init_commands; 3527 cf::init_commands;
3452 cf::init_skills; 3528 cf::init_skills;
3453 3529
… …
3740 3816
3741 warn "unload completed, starting to reload now"; 3817 warn "unload completed, starting to reload now";
3742 3818
3743 warn "reloading cf.pm"; 3819 warn "reloading cf.pm";
3744 require cf; 3820 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3821 cf::_connect_to_perl_1;
3746 3822
3747 warn "loading config and database again"; 3823 warn "loading config and database again";
3748 cf::reload_config; 3824 cf::reload_config;
3749 3825
3750 warn "loading extensions"; 3826 warn "loading extensions";
… …
3812 3888
3813our @WAIT_FOR_TICK; 3889our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 3890our @WAIT_FOR_TICK_BEGIN;
3815 3891
3816sub wait_for_tick { 3892sub wait_for_tick {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 3894
3819 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 3896 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 3897 $signal->wait;
3822} 3898}
3823 3899
3824sub wait_for_tick_begin { 3900sub wait_for_tick_begin {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 3902
3827 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 3904 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 3905 $signal->wait;
3830} 3906}
… …
3958 } 4034 }
3959} 4035}
3960 4036
3961# load additional modules 4037# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4038require "cf/$_.pm" for @EXTRA_MODULES;
4039cf::_connect_to_perl_2;
3963 4040
3964END { cf::emergency_save } 4041END { cf::emergency_save }
3965 4042
39661 40431
3967 4044

Diff Legend

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