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.468 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.493 by root, Mon Oct 26 02:34:37 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;
… …
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5; 58use Digest::MD5;
57use Fcntl; 59use Fcntl;
58use YAML (); 60use YAML::XS ();
59use IO::AIO (); 61use IO::AIO ();
60use Time::HiRes; 62use Time::HiRes;
61use Compress::LZF; 63use Compress::LZF;
62use Digest::MD5 (); 64use Digest::MD5 ();
63 65
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 74
73# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 81
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 83
79our %COMMAND = (); 84our %COMMAND = ();
80our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
87 92
88our $RELOAD; # number of reloads so far, non-zero while in reload 93our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
90 97
91our $CONFDIR = confdir; 98our $CONFDIR = confdir;
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
… …
105our %RESOURCE; 112our %RESOURCE;
106 113
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 116our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
111 118
112our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 122our $DB_ENV;
116 123
117our @EXTRA_MODULES = qw(pod mapscript); 124our @EXTRA_MODULES = qw(pod match mapscript);
118 125
119our %CFG; 126our %CFG;
120 127
121our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 129our $RUNTIME;
… …
134our $JITTER; # average jitter 141our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
136 143
137our @POST_INIT; 144our @POST_INIT;
138 145
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
140 148
141binmode STDOUT; 149binmode STDOUT;
142binmode STDERR; 150binmode STDERR;
143 151
144# read virtual server time, if available 152# read virtual server time, if available
… …
157 165
158sub cf::map::normalise; 166sub cf::map::normalise;
159 167
160############################################################################# 168#############################################################################
161 169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
178
179#############################################################################
180
162=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
163 182
164=over 4 183=over 4
165 184
166=item $cf::UPTIME 185=item $cf::UPTIME
… …
210returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 231
213=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
214 233
215This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 236that call.
218 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
219=back 244=back
220 245
221=cut 246=cut
222 247
223BEGIN { 248$Coro::State::WARNHOOK = sub {
224 *CORE::GLOBAL::warn = sub {
225 my $msg = join "", @_; 249 my $msg = join "", @_;
226 250
227 $msg .= "\n" 251 $msg .= "\n"
228 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
229 253
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 255
232 LOG llevError, $msg; 256 LOG llevError, $msg;
233 }; 257};
234}
235 258
236$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
238 263
239 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 266 return;#d#
242 }#d# 267 }#d#
243 268
244 # kill coroutine otherwise 269 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 270 Coro::terminate
247}; 271};
248
249$SIG{__DIE__} = sub { }; #d#?
250 272
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
268)) { 290)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 292}
271 293
272$EV::DIED = sub { 294$EV::DIED = sub {
273 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
274}; 296};
275 297
276############################################################################# 298#############################################################################
277 299
278=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
… …
1151 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1152 1174
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1176 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1180 aio_fsync $fh;
1181 }
1157 aio_close $fh; 1182 aio_close $fh;
1158 1183
1159 if (@$objs) { 1184 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1186 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1191 aio_fsync $fh;
1192 }
1165 aio_close $fh; 1193 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1195 }
1168 } else { 1196 } else {
1169 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
… …
1320 1348
1321# "readahead" all extensions 1349# "readahead" all extensions
1322sub cache_extensions { 1350sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1351 my $grp = IO::AIO::aio_group;
1324 1352
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1354 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1356 }
1329 }; 1357 };
1330 1358
… …
2213 2241
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2243
2216 return if $self->players; 2244 return if $self->players;
2217 2245
2218 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2219 2247
2220 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2221 2249
2222 # need to save uniques path 2250 # need to save uniques path
2223 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
… …
2314 : normalise $_ 2342 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2344 ]
2317} 2345}
2318 2346
2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2378
2319=back 2379=back
2320 2380
2321=head3 cf::object 2381=head3 cf::object
2322 2382
2323=cut 2383=cut
… …
2518 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2520 2580
2521 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2524 2584
2525 $map->load; 2585 $map->load;
2526 $map->load_neighbours; 2586 $map->load_neighbours;
2527 2587
2528 return unless $self->contr->active; 2588 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2589
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2534} 2595}
2535 2596
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2537 2598
2538Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
… …
2737 2798
2738=cut 2799=cut
2739 2800
2740# non-persistent channels (usually the info channel) 2801# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2802our %CHANNEL = (
2803 "c/motd" => {
2804 id => "infobox",
2805 title => "MOTD",
2806 reply => undef,
2807 tooltip => "The message of the day",
2808 },
2742 "c/identify" => { 2809 "c/identify" => {
2743 id => "infobox", 2810 id => "infobox",
2744 title => "Identify", 2811 title => "Identify",
2745 reply => undef, 2812 reply => undef,
2746 tooltip => "Items recently identified", 2813 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2815 "c/examine" => {
2749 id => "infobox", 2816 id => "infobox",
2750 title => "Examine", 2817 title => "Examine",
2751 reply => undef, 2818 reply => undef,
2752 tooltip => "Signs and other items you examined", 2819 tooltip => "Signs and other items you examined",
2820 },
2821 "c/shopinfo" => {
2822 id => "infobox",
2823 title => "Shop Info",
2824 reply => undef,
2825 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2826 },
2754 "c/book" => { 2827 "c/book" => {
2755 id => "infobox", 2828 id => "infobox",
2756 title => "Book", 2829 title => "Book",
2757 reply => undef, 2830 reply => undef,
… …
2785 id => "infobox", 2858 id => "infobox",
2786 title => "Skills", 2859 title => "Skills",
2787 reply => undef, 2860 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2861 tooltip => "Shows your experience per skill and item power",
2789 }, 2862 },
2863 "c/shopitems" => {
2864 id => "infobox",
2865 title => "Shop Items",
2866 reply => undef,
2867 tooltip => "Shows the items currently for sale in this shop",
2868 },
2790 "c/resistances" => { 2869 "c/resistances" => {
2791 id => "infobox", 2870 id => "infobox",
2792 title => "Resistances", 2871 title => "Resistances",
2793 reply => undef, 2872 reply => undef,
2794 tooltip => "Shows your resistances", 2873 tooltip => "Shows your resistances",
… …
2796 "c/pets" => { 2875 "c/pets" => {
2797 id => "infobox", 2876 id => "infobox",
2798 title => "Pets", 2877 title => "Pets",
2799 reply => undef, 2878 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 2879 tooltip => "Shows information abotu your pets/a specific pet",
2880 },
2881 "c/perceiveself" => {
2882 id => "infobox",
2883 title => "Perceive Self",
2884 reply => undef,
2885 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2886 },
2802 "c/uptime" => { 2887 "c/uptime" => {
2803 id => "infobox", 2888 id => "infobox",
2804 title => "Uptime", 2889 title => "Uptime",
2805 reply => undef, 2890 reply => undef,
… …
3343 3428
3344 warn "finished reloading resource files\n"; 3429 warn "finished reloading resource files\n";
3345} 3430}
3346 3431
3347sub reload_config { 3432sub reload_config {
3433 warn "reloading config file...\n";
3434
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3435 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3436 or return;
3350 3437
3351 local $/; 3438 local $/;
3352 *CFG = YAML::Load <$fh>; 3439 *CFG = YAML::XS::Load scalar <$fh>;
3353 3440
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3355 3442
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3443 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3449 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3450 };
3364 warn $@ if $@; 3451 warn $@ if $@;
3365 } 3452 }
3453
3454 warn "finished reloading resource files\n";
3366} 3455}
3367 3456
3368sub pidfile() { 3457sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3459 or die "$PIDFILE: $!";
… …
3380 my $pid = <$fh>; 3469 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0; 3470 kill 9, $pid if $pid > 0;
3382 3471
3383 seek $fh, 0, 0; 3472 seek $fh, 0, 0;
3384 print $fh $$; 3473 print $fh $$;
3474}
3475
3476sub main_loop {
3477 warn "EV::loop starting\n";
3478 if (1) {
3479 EV::loop;
3480 }
3481 warn "EV::loop returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP;
3385} 3483}
3386 3484
3387sub main { 3485sub main {
3388 cf::init_globals; # initialise logging 3486 cf::init_globals; # initialise logging
3389 3487
… …
3429 load_extensions; 3527 load_extensions;
3430 3528
3431 utime time, time, $RUNTIMEFILE; 3529 utime time, time, $RUNTIMEFILE;
3432 3530
3433 # no (long-running) fork's whatsoever before this point(!) 3531 # no (long-running) fork's whatsoever before this point(!)
3532 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3534
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3535 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3536 };
3438 3537
3439 EV::loop; 3538 main_loop;
3440} 3539}
3441 3540
3442############################################################################# 3541#############################################################################
3443# initialisation and cleanup 3542# initialisation and cleanup
3444 3543
… …
3710 3809
3711 warn "unload completed, starting to reload now"; 3810 warn "unload completed, starting to reload now";
3712 3811
3713 warn "reloading cf.pm"; 3812 warn "reloading cf.pm";
3714 require cf; 3813 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3814 cf::_connect_to_perl_1;
3716 3815
3717 warn "loading config and database again"; 3816 warn "loading config and database again";
3718 cf::reload_config; 3817 cf::reload_config;
3719 3818
3720 warn "loading extensions"; 3819 warn "loading extensions";
… …
3928 } 4027 }
3929} 4028}
3930 4029
3931# load additional modules 4030# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4031require "cf/$_.pm" for @EXTRA_MODULES;
4032cf::_connect_to_perl_2;
3933 4033
3934END { cf::emergency_save } 4034END { cf::emergency_save }
3935 4035
39361 40361
3937 4037

Diff Legend

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