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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.491 by root, Sat Oct 24 09:18:44 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;
… …
53use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
54use BDB (); 55use BDB ();
55use Data::Dumper; 56use Data::Dumper;
56use Digest::MD5; 57use 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
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
105our %RESOURCE; 111our %RESOURCE;
106 112
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 115our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
111 117
112our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 121our $DB_ENV;
116 122
117our @EXTRA_MODULES = qw(pod mapscript); 123our @EXTRA_MODULES = qw(pod match mapscript);
118 124
119our %CFG; 125our %CFG;
120 126
121our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 128our $RUNTIME;
… …
134our $JITTER; # average jitter 140our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
136 142
137our @POST_INIT; 143our @POST_INIT;
138 144
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
140 147
141binmode STDOUT; 148binmode STDOUT;
142binmode STDERR; 149binmode STDERR;
143 150
144# read virtual server time, if available 151# read virtual server time, if available
… …
146 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
149} 156}
150 157
158eval "sub TICK() { $TICK } 1" or die;
159
151mkdir $_ 160mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 162
154our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
155 164
156sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
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::"} };
157 177
158############################################################################# 178#############################################################################
159 179
160=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
161 181
… …
208returns 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
209per 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.
210 230
211=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
212 232
213This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
214C<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
215that call. 235that call.
216 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
217=back 243=back
218 244
219=cut 245=cut
220 246
221BEGIN { 247$Coro::State::WARNHOOK = sub {
222 *CORE::GLOBAL::warn = sub {
223 my $msg = join "", @_; 248 my $msg = join "", @_;
224 249
225 $msg .= "\n" 250 $msg .= "\n"
226 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
227 252
228 $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;
229 254
230 LOG llevError, $msg; 255 LOG llevError, $msg;
231 }; 256};
232}
233 257
234$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
236 262
237 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 265 return;#d#
240 }#d# 266 }#d#
241 267
242 # kill coroutine otherwise 268 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 269 Coro::terminate
245}; 270};
246
247$SIG{__DIE__} = sub { }; #d#?
248 271
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
1149 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1150 1173
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1155 aio_close $fh; 1181 aio_close $fh;
1156 1182
1157 if (@$objs) { 1183 if (@$objs) {
1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1159 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1162 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1163 aio_close $fh; 1192 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1194 }
1166 } else { 1195 } else {
1167 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
… …
1318 1347
1319# "readahead" all extensions 1348# "readahead" all extensions
1320sub cache_extensions { 1349sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1350 my $grp = IO::AIO::aio_group;
1322 1351
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1353 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1355 }
1327 }; 1356 };
1328 1357
… …
2211 2240
2212 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213 2242
2214 return if $self->players; 2243 return if $self->players;
2215 2244
2216 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2217 2246
2218 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2219 2248
2220 # need to save uniques path 2249 # need to save uniques path
2221 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2312 : normalise $_ 2341 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2343 ]
2315} 2344}
2316 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
2317=back 2378=back
2318 2379
2319=head3 cf::object 2380=head3 cf::object
2320 2381
2321=cut 2382=cut
… …
2386 2447
2387our $SAY_CHANNEL = { 2448our $SAY_CHANNEL = {
2388 id => "say", 2449 id => "say",
2389 title => "Map", 2450 title => "Map",
2390 reply => "say ", 2451 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2453};
2393 2454
2394our $CHAT_CHANNEL = { 2455our $CHAT_CHANNEL = {
2395 id => "chat", 2456 id => "chat",
2396 title => "Chat", 2457 title => "Chat",
… …
2522 2583
2523 $map->load; 2584 $map->load;
2524 $map->load_neighbours; 2585 $map->load_neighbours;
2525 2586
2526 return unless $self->contr->active; 2587 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2588
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $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;
2532} 2594}
2533 2595
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2535 2597
2536Moves 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
… …
2735 2797
2736=cut 2798=cut
2737 2799
2738# non-persistent channels (usually the info channel) 2800# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2801our %CHANNEL = (
2802 "c/motd" => {
2803 id => "infobox",
2804 title => "MOTD",
2805 reply => undef,
2806 tooltip => "The message of the day",
2807 },
2740 "c/identify" => { 2808 "c/identify" => {
2741 id => "infobox", 2809 id => "infobox",
2742 title => "Identify", 2810 title => "Identify",
2743 reply => undef, 2811 reply => undef,
2744 tooltip => "Items recently identified", 2812 tooltip => "Items recently identified",
… …
2746 "c/examine" => { 2814 "c/examine" => {
2747 id => "infobox", 2815 id => "infobox",
2748 title => "Examine", 2816 title => "Examine",
2749 reply => undef, 2817 reply => undef,
2750 tooltip => "Signs and other items you examined", 2818 tooltip => "Signs and other items you examined",
2819 },
2820 "c/shopinfo" => {
2821 id => "infobox",
2822 title => "Shop Info",
2823 reply => undef,
2824 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 2825 },
2752 "c/book" => { 2826 "c/book" => {
2753 id => "infobox", 2827 id => "infobox",
2754 title => "Book", 2828 title => "Book",
2755 reply => undef, 2829 reply => undef,
… …
2783 id => "infobox", 2857 id => "infobox",
2784 title => "Skills", 2858 title => "Skills",
2785 reply => undef, 2859 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 2860 tooltip => "Shows your experience per skill and item power",
2787 }, 2861 },
2862 "c/shopitems" => {
2863 id => "infobox",
2864 title => "Shop Items",
2865 reply => undef,
2866 tooltip => "Shows the items currently for sale in this shop",
2867 },
2788 "c/resistances" => { 2868 "c/resistances" => {
2789 id => "infobox", 2869 id => "infobox",
2790 title => "Resistances", 2870 title => "Resistances",
2791 reply => undef, 2871 reply => undef,
2792 tooltip => "Shows your resistances", 2872 tooltip => "Shows your resistances",
… …
2794 "c/pets" => { 2874 "c/pets" => {
2795 id => "infobox", 2875 id => "infobox",
2796 title => "Pets", 2876 title => "Pets",
2797 reply => undef, 2877 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 2878 tooltip => "Shows information abotu your pets/a specific pet",
2879 },
2880 "c/perceiveself" => {
2881 id => "infobox",
2882 title => "Perceive Self",
2883 reply => undef,
2884 tooltip => "You gained detailed knowledge about yourself",
2799 }, 2885 },
2800 "c/uptime" => { 2886 "c/uptime" => {
2801 id => "infobox", 2887 id => "infobox",
2802 title => "Uptime", 2888 title => "Uptime",
2803 reply => undef, 2889 reply => undef,
… …
3341 3427
3342 warn "finished reloading resource files\n"; 3428 warn "finished reloading resource files\n";
3343} 3429}
3344 3430
3345sub reload_config { 3431sub reload_config {
3432 warn "reloading config file...\n";
3433
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3434 open my $fh, "<:utf8", "$CONFDIR/config"
3347 or return; 3435 or return;
3348 3436
3349 local $/; 3437 local $/;
3350 *CFG = YAML::Load <$fh>; 3438 *CFG = YAML::XS::Load scalar <$fh>;
3351 3439
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3440 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3353 3441
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3442 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3443 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3359 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3447 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3360 and die "WARNING: m(un)lockall failed: $!\n"; 3448 and die "WARNING: m(un)lockall failed: $!\n";
3361 }; 3449 };
3362 warn $@ if $@; 3450 warn $@ if $@;
3363 } 3451 }
3452
3453 warn "finished reloading resource files\n";
3364} 3454}
3365 3455
3366sub pidfile() { 3456sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3457 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!"; 3458 or die "$PIDFILE: $!";
… …
3378 my $pid = <$fh>; 3468 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0; 3469 kill 9, $pid if $pid > 0;
3380 3470
3381 seek $fh, 0, 0; 3471 seek $fh, 0, 0;
3382 print $fh $$; 3472 print $fh $$;
3473}
3474
3475sub main_loop {
3476 warn "EV::loop starting\n";
3477 if (1) {
3478 EV::loop;
3479 }
3480 warn "EV::loop returned\n";
3481 goto &main_loop unless $REALLY_UNLOOP;
3383} 3482}
3384 3483
3385sub main { 3484sub main {
3386 cf::init_globals; # initialise logging 3485 cf::init_globals; # initialise logging
3387 3486
… …
3427 load_extensions; 3526 load_extensions;
3428 3527
3429 utime time, time, $RUNTIMEFILE; 3528 utime time, time, $RUNTIMEFILE;
3430 3529
3431 # no (long-running) fork's whatsoever before this point(!) 3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3432 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};
3433 3533
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3534 (pop @POST_INIT)->(0) while @POST_INIT;
3435 }; 3535 };
3436 3536
3437 EV::loop; 3537 main_loop;
3438} 3538}
3439 3539
3440############################################################################# 3540#############################################################################
3441# initialisation and cleanup 3541# initialisation and cleanup
3442 3542
… …
3708 3808
3709 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3710 3810
3711 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3712 require cf; 3812 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3714 3814
3715 warn "loading config and database again"; 3815 warn "loading config and database again";
3716 cf::reload_config; 3816 cf::reload_config;
3717 3817
3718 warn "loading extensions"; 3818 warn "loading extensions";
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4026 }
3927} 4027}
3928 4028
3929# load additional modules 4029# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3931 4032
3932END { cf::emergency_save } 4033END { cf::emergency_save }
3933 4034
39341 40351
3935 4036

Diff Legend

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