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.481 by root, Sun Oct 11 00:24:35 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
… …
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} = { map $_ => undef, 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
… …
2008 2009
2009 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2010 } 2011 }
2011} 2012}
2012 2013
2013sub pre_load { } 2014sub pre_load { }
2014sub post_load { } 2015#sub post_load { } # XS
2015 2016
2016sub load { 2017sub load {
2017 my ($self) = @_; 2018 my ($self) = @_;
2018 2019
2019 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
… …
2340 : normalise $_ 2341 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2343 ]
2343} 2344}
2344 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
2345=back 2378=back
2346 2379
2347=head3 cf::object 2380=head3 cf::object
2348 2381
2349=cut 2382=cut
… …
2544 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2546 2579
2547 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2550 2583
2551 $map->load; 2584 $map->load;
2552 $map->load_neighbours; 2585 $map->load_neighbours;
2553 2586
2554 return unless $self->contr->active; 2587 return unless $self->contr->active;
… …
2753 2786
2754 utf8::encode $text; 2787 utf8::encode $text;
2755 $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);
2756} 2789}
2757 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
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2817
2760Send 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
2761client 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
2762the 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
… …
2764 2822
2765=cut 2823=cut
2766 2824
2767# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2769 "c/identify" => { 2833 "c/identify" => {
2770 id => "infobox", 2834 id => "infobox",
2771 title => "Identify", 2835 title => "Identify",
2772 reply => undef, 2836 reply => undef,
2773 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2839 "c/examine" => {
2776 id => "infobox", 2840 id => "infobox",
2777 title => "Examine", 2841 title => "Examine",
2778 reply => undef, 2842 reply => undef,
2779 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",
2780 }, 2850 },
2781 "c/book" => { 2851 "c/book" => {
2782 id => "infobox", 2852 id => "infobox",
2783 title => "Book", 2853 title => "Book",
2784 reply => undef, 2854 reply => undef,
… …
2900 my $pkt = "msg " 2970 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 2973 );
2904 2974
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); 2975 $self->send_big_packet ($pkt);
2916} 2976}
2917 2977
2918=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2919 2979
2920Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2923 2983
2924sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2926 2986
2927 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 2992 }
2933} 2993}
2934 2994
2935=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2936 2996
… …
2940 3000
2941sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2943 3003
2944 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3007 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3010 }
2951} 3011}
2952 3012
2953=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2954 3014
… …
3081our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3082 3142
3083$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3084 3144
3085$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3088 sort time 3148 sort time
3089)); 3149));
3090 3150
3091# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3145 3205
3146 %vars = (_dummy => 0) unless %vars; 3206 %vars = (_dummy => 0) unless %vars;
3147 3207
3208 my @res;
3148 local $_; 3209 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3210
3151 my $eval = 3211 my $eval =
3152 "do {\n" 3212 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3215 . $code
3156 . "\n}" 3216 . "\n}"
3157 ; 3217 ;
3158 3218
3219 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 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 }
3162 3228
3163 if ($@) { 3229 if ($@) {
3164 warn "$@"; 3230 warn "$@";
3165 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
… …
3185=cut 3251=cut
3186 3252
3187sub register_script_function { 3253sub register_script_function {
3188 my ($fun, $cb) = @_; 3254 my ($fun, $cb) = @_;
3189 3255
3190 no strict 'refs'; 3256 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3257 *$fun = $safe_hole->wrap ($cb);
3192} 3258}
3193 3259
3194=back 3260=back
3195 3261
3196=cut 3262=cut
… …
3217 3283
3218 $facedata->{version} == 2 3284 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3285 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3286
3221 # 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]);
3222 $facedata->{resource}{"res/exp_table"} = { 3289 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3290 type => FT_RSRC,
3224 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),
3225 }; 3293 };
3226 cf::cede_to_tick; 3294 cf::cede_to_tick;
3227 3295
3228 { 3296 {
3229 my $faces = $facedata->{faceinfo}; 3297 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3299 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3300 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3301
3234 cf::face::set_visibility $idx, $info->{visibility}; 3302 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3303 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3306
3239 cf::cede_to_tick; 3307 cf::cede_to_tick;
3240 } 3308 }
3241 3309
3242 while (my ($face, $info) = each %$faces) { 3310 while (my ($face, $info) = each %$faces) {
… …
3266 3334
3267 cf::anim::invalidate_all; # d'oh 3335 cf::anim::invalidate_all; # d'oh
3268 } 3336 }
3269 3337
3270 { 3338 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3339 my $res = $facedata->{resource};
3274 3340
3275 while (my ($name, $info) = each %$res) { 3341 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3342 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3343 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3344
3280 if ($info->{type} & 1) { 3345 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}; 3346 cf::face::set_type $idx, $info->{type};
3295 } else { 3347 } else {
3296 $RESOURCE{$name} = $info; 3348 $RESOURCE{$name} = $info;
3297 } 3349 }
3298 3350
… …
3382 3434
3383 warn "finished reloading resource files\n"; 3435 warn "finished reloading resource files\n";
3384} 3436}
3385 3437
3386sub reload_config { 3438sub reload_config {
3439 warn "reloading config file...\n";
3440
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3441 open my $fh, "<:utf8", "$CONFDIR/config"
3388 or return; 3442 or return;
3389 3443
3390 local $/; 3444 local $/;
3391 *CFG = YAML::Load <$fh>; 3445 *CFG = YAML::XS::Load scalar <$fh>;
3392 3446
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3394 3448
3395 $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};
3396 $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};
… …
3400 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3401 and die "WARNING: m(un)lockall failed: $!\n"; 3455 and die "WARNING: m(un)lockall failed: $!\n";
3402 }; 3456 };
3403 warn $@ if $@; 3457 warn $@ if $@;
3404 } 3458 }
3459
3460 warn "finished reloading resource files\n";
3405} 3461}
3406 3462
3407sub pidfile() { 3463sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!"; 3465 or die "$PIDFILE: $!";
… …
3457 }; 3513 };
3458 3514
3459 evthread_start IO::AIO::poll_fileno; 3515 evthread_start IO::AIO::poll_fileno;
3460 3516
3461 cf::sync_job { 3517 cf::sync_job {
3518 cf::load_settings;
3519 cf::load_materials;
3520
3462 reload_resources; 3521 reload_resources;
3463 reload_config; 3522 reload_config;
3464 db_init; 3523 db_init;
3465 3524
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3525 cf::init_uuid;
3469 cf::init_signals; 3526 cf::init_signals;
3470 cf::init_commands; 3527 cf::init_commands;
3471 cf::init_skills; 3528 cf::init_skills;
3472 3529
… …
3759 3816
3760 warn "unload completed, starting to reload now"; 3817 warn "unload completed, starting to reload now";
3761 3818
3762 warn "reloading cf.pm"; 3819 warn "reloading cf.pm";
3763 require cf; 3820 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3821 cf::_connect_to_perl_1;
3765 3822
3766 warn "loading config and database again"; 3823 warn "loading config and database again";
3767 cf::reload_config; 3824 cf::reload_config;
3768 3825
3769 warn "loading extensions"; 3826 warn "loading extensions";
… …
3831 3888
3832our @WAIT_FOR_TICK; 3889our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 3890our @WAIT_FOR_TICK_BEGIN;
3834 3891
3835sub wait_for_tick { 3892sub wait_for_tick {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 3894
3838 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 3896 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 3897 $signal->wait;
3841} 3898}
3842 3899
3843sub wait_for_tick_begin { 3900sub wait_for_tick_begin {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 3902
3846 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 3904 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 3905 $signal->wait;
3849} 3906}
… …
3977 } 4034 }
3978} 4035}
3979 4036
3980# load additional modules 4037# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4038require "cf/$_.pm" for @EXTRA_MODULES;
4039cf::_connect_to_perl_2;
3982 4040
3983END { cf::emergency_save } 4041END { cf::emergency_save }
3984 4042
39851 40431
3986 4044

Diff Legend

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