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.465 by root, Thu Jan 8 00:54:55 2009 UTC vs.
Revision 1.487 by root, Fri Oct 16 01:56:41 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;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
… …
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
123our @EXTRA_MODULES = qw(pod match mapscript);
124
117our %CFG; 125our %CFG;
118 126
119our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 128our $RUNTIME;
121our $NOW; 129our $NOW;
… …
132our $JITTER; # average jitter 140our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
134 142
135our @POST_INIT; 143our @POST_INIT;
136 144
137our $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 :)
138 147
139binmode STDOUT; 148binmode STDOUT;
140binmode STDERR; 149binmode STDERR;
141 150
142# read virtual server time, if available 151# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
147} 156}
148 157
158eval "sub TICK() { $TICK } 1" or die;
159
149mkdir $_ 160mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 162
152our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
153 164
154sub 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::"} };
155 177
156############################################################################# 178#############################################################################
157 179
158=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
159 181
… …
210 232
211This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
212C<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
213that call. 235that call.
214 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
215=back 243=back
216 244
217=cut 245=cut
218 246
219BEGIN { 247$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 248 my $msg = join "", @_;
222 249
223 $msg .= "\n" 250 $msg .= "\n"
224 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
225 252
226 $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;
227 254
228 LOG llevError, $msg; 255 LOG llevError, $msg;
229 }; 256};
230}
231 257
232$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
234 262
235 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 265 return;#d#
238 }#d# 266 }#d#
239 267
240 # kill coroutine otherwise 268 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 269 Coro::terminate
243}; 270};
244
245$SIG{__DIE__} = sub { }; #d#?
246 271
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
1147 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1148 1173
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1181 aio_close $fh;
1154 1182
1155 if (@$objs) { 1183 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1192 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1194 }
1164 } else { 1195 } else {
1165 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
… …
1316 1347
1317# "readahead" all extensions 1348# "readahead" all extensions
1318sub cache_extensions { 1349sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1350 my $grp = IO::AIO::aio_group;
1320 1351
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1353 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1355 }
1325 }; 1356 };
1326 1357
… …
2209 2240
2210 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2242
2212 return if $self->players; 2243 return if $self->players;
2213 2244
2214 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2215 2246
2216 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2217 2248
2218 # need to save uniques path 2249 # need to save uniques path
2219 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2384 2415
2385our $SAY_CHANNEL = { 2416our $SAY_CHANNEL = {
2386 id => "say", 2417 id => "say",
2387 title => "Map", 2418 title => "Map",
2388 reply => "say ", 2419 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2421};
2391 2422
2392our $CHAT_CHANNEL = { 2423our $CHAT_CHANNEL = {
2393 id => "chat", 2424 id => "chat",
2394 title => "Chat", 2425 title => "Chat",
… …
2520 2551
2521 $map->load; 2552 $map->load;
2522 $map->load_neighbours; 2553 $map->load_neighbours;
2523 2554
2524 return unless $self->contr->active; 2555 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2556
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2530} 2562}
2531 2563
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2565
2534Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
… …
2733 2765
2734=cut 2766=cut
2735 2767
2736# non-persistent channels (usually the info channel) 2768# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2769our %CHANNEL = (
2770 "c/motd" => {
2771 id => "infobox",
2772 title => "MOTD",
2773 reply => undef,
2774 tooltip => "The message of the day",
2775 },
2738 "c/identify" => { 2776 "c/identify" => {
2739 id => "infobox", 2777 id => "infobox",
2740 title => "Identify", 2778 title => "Identify",
2741 reply => undef, 2779 reply => undef,
2742 tooltip => "Items recently identified", 2780 tooltip => "Items recently identified",
… …
2744 "c/examine" => { 2782 "c/examine" => {
2745 id => "infobox", 2783 id => "infobox",
2746 title => "Examine", 2784 title => "Examine",
2747 reply => undef, 2785 reply => undef,
2748 tooltip => "Signs and other items you examined", 2786 tooltip => "Signs and other items you examined",
2787 },
2788 "c/shopinfo" => {
2789 id => "infobox",
2790 title => "Shop Info",
2791 reply => undef,
2792 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2793 },
2750 "c/book" => { 2794 "c/book" => {
2751 id => "infobox", 2795 id => "infobox",
2752 title => "Book", 2796 title => "Book",
2753 reply => undef, 2797 reply => undef,
… …
2781 id => "infobox", 2825 id => "infobox",
2782 title => "Skills", 2826 title => "Skills",
2783 reply => undef, 2827 reply => undef,
2784 tooltip => "Shows your experience per skill and item power", 2828 tooltip => "Shows your experience per skill and item power",
2785 }, 2829 },
2830 "c/shopitems" => {
2831 id => "infobox",
2832 title => "Shop Items",
2833 reply => undef,
2834 tooltip => "Shows the items currently for sale in this shop",
2835 },
2786 "c/resistances" => { 2836 "c/resistances" => {
2787 id => "infobox", 2837 id => "infobox",
2788 title => "Resistances", 2838 title => "Resistances",
2789 reply => undef, 2839 reply => undef,
2790 tooltip => "Shows your resistances", 2840 tooltip => "Shows your resistances",
… …
2792 "c/pets" => { 2842 "c/pets" => {
2793 id => "infobox", 2843 id => "infobox",
2794 title => "Pets", 2844 title => "Pets",
2795 reply => undef, 2845 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet", 2846 tooltip => "Shows information abotu your pets/a specific pet",
2847 },
2848 "c/perceiveself" => {
2849 id => "infobox",
2850 title => "Perceive Self",
2851 reply => undef,
2852 tooltip => "You gained detailed knowledge about yourself",
2797 }, 2853 },
2798 "c/uptime" => { 2854 "c/uptime" => {
2799 id => "infobox", 2855 id => "infobox",
2800 title => "Uptime", 2856 title => "Uptime",
2801 reply => undef, 2857 reply => undef,
… …
3052The following functions and methods are available within a safe environment: 3108The following functions and methods are available within a safe environment:
3053 3109
3054 cf::object 3110 cf::object
3055 contr pay_amount pay_player map x y force_find force_add destroy 3111 contr pay_amount pay_player map x y force_find force_add destroy
3056 insert remove name archname title slaying race decrease split 3112 insert remove name archname title slaying race decrease split
3113 value
3057 3114
3058 cf::object::player 3115 cf::object::player
3059 player 3116 player
3060 3117
3061 cf::player 3118 cf::player
… …
3067=cut 3124=cut
3068 3125
3069for ( 3126for (
3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3071 insert remove inv nrof name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)], 3129 decrease split destroy change_exp value msg lore send_msg)],
3073 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3074 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful send_msg)],
3075 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3076) { 3133) {
3077 no strict 'refs'; 3134 no strict 'refs';
3078 my ($pkg, @funs) = @$_; 3135 my ($pkg, @funs) = @$_;
3079 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3136 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3096 my ($code, %vars) = @_; 3153 my ($code, %vars) = @_;
3097 3154
3098 my $qcode = $code; 3155 my $qcode = $code;
3099 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3100 $qcode =~ s/\n/\\n/g; 3157 $qcode =~ s/\n/\\n/g;
3158
3159 %vars = (_dummy => 0) unless %vars;
3101 3160
3102 local $_; 3161 local $_;
3103 local @safe::cf::_safe_eval_args = values %vars; 3162 local @safe::cf::_safe_eval_args = values %vars;
3104 3163
3105 my $eval = 3164 my $eval =
… …
3336 3395
3337 warn "finished reloading resource files\n"; 3396 warn "finished reloading resource files\n";
3338} 3397}
3339 3398
3340sub reload_config { 3399sub reload_config {
3400 warn "reloading config file...\n";
3401
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3403 or return;
3343 3404
3344 local $/; 3405 local $/;
3345 *CFG = YAML::Load <$fh>; 3406 *CFG = YAML::XS::Load scalar <$fh>;
3346 3407
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3348 3409
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3416 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3417 };
3357 warn $@ if $@; 3418 warn $@ if $@;
3358 } 3419 }
3420
3421 warn "finished reloading resource files\n";
3359} 3422}
3360 3423
3361sub pidfile() { 3424sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3425 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3426 or die "$PIDFILE: $!";
… …
3373 my $pid = <$fh>; 3436 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0; 3437 kill 9, $pid if $pid > 0;
3375 3438
3376 seek $fh, 0, 0; 3439 seek $fh, 0, 0;
3377 print $fh $$; 3440 print $fh $$;
3441}
3442
3443sub main_loop {
3444 warn "EV::loop starting\n";
3445 if (1) {
3446 EV::loop;
3447 }
3448 warn "EV::loop returned\n";
3449 goto &main_loop unless $REALLY_UNLOOP;
3378} 3450}
3379 3451
3380sub main { 3452sub main {
3381 cf::init_globals; # initialise logging 3453 cf::init_globals; # initialise logging
3382 3454
… …
3422 load_extensions; 3494 load_extensions;
3423 3495
3424 utime time, time, $RUNTIMEFILE; 3496 utime time, time, $RUNTIMEFILE;
3425 3497
3426 # no (long-running) fork's whatsoever before this point(!) 3498 # no (long-running) fork's whatsoever before this point(!)
3499 use POSIX ();
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3500 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428 3501
3429 (pop @POST_INIT)->(0) while @POST_INIT; 3502 (pop @POST_INIT)->(0) while @POST_INIT;
3430 }; 3503 };
3431 3504
3432 EV::loop; 3505 main_loop;
3433} 3506}
3434 3507
3435############################################################################# 3508#############################################################################
3436# initialisation and cleanup 3509# initialisation and cleanup
3437 3510
… …
3693 clear_package "safe::$_" 3766 clear_package "safe::$_"
3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3767 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3695 3768
3696 warn "unloading cf.pm \"a bit\""; 3769 warn "unloading cf.pm \"a bit\"";
3697 delete $INC{"cf.pm"}; 3770 delete $INC{"cf.pm"};
3698 delete $INC{"cf/pod.pm"}; 3771 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3699 3772
3700 # don't, removes xs symbols, too, 3773 # don't, removes xs symbols, too,
3701 # and global variables created in xs 3774 # and global variables created in xs
3702 #clear_package __PACKAGE__; 3775 #clear_package __PACKAGE__;
3703 3776
3704 warn "unload completed, starting to reload now"; 3777 warn "unload completed, starting to reload now";
3705 3778
3706 warn "reloading cf.pm"; 3779 warn "reloading cf.pm";
3707 require cf; 3780 require cf;
3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3781 cf::_connect_to_perl_1;
3709 3782
3710 warn "loading config and database again"; 3783 warn "loading config and database again";
3711 cf::reload_config; 3784 cf::reload_config;
3712 3785
3713 warn "loading extensions"; 3786 warn "loading extensions";
… …
3920 LOG llevInfo, "[ABT] [suppressed]\n"; 3993 LOG llevInfo, "[ABT] [suppressed]\n";
3921 } 3994 }
3922} 3995}
3923 3996
3924# load additional modules 3997# load additional modules
3925use cf::pod; 3998require "cf/$_.pm" for @EXTRA_MODULES;
3999cf::_connect_to_perl_2;
3926 4000
3927END { cf::emergency_save } 4001END { cf::emergency_save }
3928 4002
39291 40031
3930 4004

Diff Legend

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