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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.496 by root, Sun Nov 15 18:03:59 2009 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.
222 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.
242
223=back 243=back
224 244
225=cut 245=cut
226 246
227BEGIN { 247$Coro::State::WARNHOOK = sub {
228 *CORE::GLOBAL::warn = sub {
229 my $msg = join "", @_; 248 my $msg = join "", @_;
230 249
231 $msg .= "\n" 250 $msg .= "\n"
232 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
233 252
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 254
236 LOG llevError, $msg; 255 LOG llevError, $msg;
237 }; 256};
238}
239 257
240$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
242 262
243 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 265 return;#d#
246 }#d# 266 }#d#
247 267
248 # kill coroutine otherwise 268 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 269 Coro::terminate
251}; 270};
252
253$SIG{__DIE__} = sub { }; #d#?
254 271
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
272)) { 289)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 291}
275 292
276$EV::DIED = sub { 293$EV::DIED = sub {
277 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
278}; 295};
279 296
280############################################################################# 297#############################################################################
281 298
282=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
2223 2240
2224 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2242
2226 return if $self->players; 2243 return if $self->players;
2227 2244
2228 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2229 2246
2230 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2231 2248
2232 # need to save uniques path 2249 # need to save uniques path
2233 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2324 : normalise $_ 2341 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2343 ]
2327} 2344}
2328 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
2329=back 2378=back
2330 2379
2331=head3 cf::object 2380=head3 cf::object
2332 2381
2333=cut 2382=cut
… …
2528 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2530 2579
2531 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2534 2583
2535 $map->load; 2584 $map->load;
2536 $map->load_neighbours; 2585 $map->load_neighbours;
2537 2586
2538 return unless $self->contr->active; 2587 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2588
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2544} 2594}
2545 2595
2546=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2547 2597
2548Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
… …
2736 2786
2737 utf8::encode $text; 2787 utf8::encode $text;
2738 $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);
2739} 2789}
2740 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
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 2817
2743Send 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
2744client 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
2745the 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
… …
2747 2822
2748=cut 2823=cut
2749 2824
2750# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2752 "c/identify" => { 2833 "c/identify" => {
2753 id => "infobox", 2834 id => "infobox",
2754 title => "Identify", 2835 title => "Identify",
2755 reply => undef, 2836 reply => undef,
2756 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2758 "c/examine" => { 2839 "c/examine" => {
2759 id => "infobox", 2840 id => "infobox",
2760 title => "Examine", 2841 title => "Examine",
2761 reply => undef, 2842 reply => undef,
2762 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",
2763 }, 2850 },
2764 "c/book" => { 2851 "c/book" => {
2765 id => "infobox", 2852 id => "infobox",
2766 title => "Book", 2853 title => "Book",
2767 reply => undef, 2854 reply => undef,
… …
2883 my $pkt = "msg " 2970 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 2973 );
2887 2974
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt); 2975 $self->send_big_packet ($pkt);
2899} 2976}
2900 2977
2901=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2902 2979
2903Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2906 2983
2907sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2909 2986
2910 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 } 2992 }
2916} 2993}
2917 2994
2918=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2919 2996
… …
2923 3000
2924sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2926 3003
2927 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove 3007 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3010 }
2934} 3011}
2935 3012
2936=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2937 3014
… …
3214 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3293
3217 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3221 3298
3222 cf::cede_to_tick; 3299 cf::cede_to_tick;
3223 } 3300 }
3224 3301
3225 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
… …
3249 3326
3250 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3251 } 3328 }
3252 3329
3253 { 3330 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3257 3332
3258 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) { 3334 if (defined $info->{type}) {
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3336
3263 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type}; 3338 cf::face::set_type $idx, $info->{type};
3278 } else { 3339 } else {
3279 $RESOURCE{$name} = $info; 3340 $RESOURCE{$name} = $info;
3280 } 3341 }
3281 3342
… …
3365 3426
3366 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3367} 3428}
3368 3429
3369sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3371 or return; 3434 or return;
3372 3435
3373 local $/; 3436 local $/;
3374 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3375 3438
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3377 3440
3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3383 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3384 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3385 }; 3448 };
3386 warn $@ if $@; 3449 warn $@ if $@;
3387 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3388} 3453}
3389 3454
3390sub pidfile() { 3455sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!"; 3457 or die "$PIDFILE: $!";
… …
3440 }; 3505 };
3441 3506
3442 evthread_start IO::AIO::poll_fileno; 3507 evthread_start IO::AIO::poll_fileno;
3443 3508
3444 cf::sync_job { 3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3445 reload_resources; 3513 reload_resources;
3446 reload_config; 3514 reload_config;
3447 db_init; 3515 db_init;
3448 3516
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3517 cf::init_uuid;
3452 cf::init_signals; 3518 cf::init_signals;
3453 cf::init_commands; 3519 cf::init_commands;
3454 cf::init_skills; 3520 cf::init_skills;
3455 3521
… …
3460 load_extensions; 3526 load_extensions;
3461 3527
3462 utime time, time, $RUNTIMEFILE; 3528 utime time, time, $RUNTIMEFILE;
3463 3529
3464 # no (long-running) fork's whatsoever before this point(!) 3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466 3533
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3534 (pop @POST_INIT)->(0) while @POST_INIT;
3468 }; 3535 };
3469 3536
… …
3741 3808
3742 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3743 3810
3744 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3745 require cf; 3812 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3747 3814
3748 warn "loading config and database again"; 3815 warn "loading config and database again";
3749 cf::reload_config; 3816 cf::reload_config;
3750 3817
3751 warn "loading extensions"; 3818 warn "loading extensions";
… …
3959 } 4026 }
3960} 4027}
3961 4028
3962# load additional modules 4029# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3964 4032
3965END { cf::emergency_save } 4033END { cf::emergency_save }
3966 4034
39671 40351
3968 4036

Diff Legend

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