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.464 by root, Thu Jan 1 18:35:48 2009 UTC vs.
Revision 1.489 by root, Fri Oct 23 03:08:35 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
… …
206returns 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
207per 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.
208 230
209=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
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}) {
… …
2310 : normalise $_ 2341 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2343 ]
2313} 2344}
2314 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). May block.
2350
2351=cut
2352
2353sub static_maps() {
2354 my @dirs = "";
2355 my @maps;
2356
2357 while (@dirs) {
2358 my $dir = shift @dirs;
2359
2360 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2361 or return;
2362
2363 for (@$files) {
2364 s/\.map$// or next;
2365 utf8::decode $_;
2366 push @maps, "$dir/$_";
2367 }
2368
2369 push @dirs, map "$dir/$_", @$dirs;
2370 }
2371
2372 \@maps
2373}
2374
2315=back 2375=back
2316 2376
2317=head3 cf::object 2377=head3 cf::object
2318 2378
2319=cut 2379=cut
… …
2384 2444
2385our $SAY_CHANNEL = { 2445our $SAY_CHANNEL = {
2386 id => "say", 2446 id => "say",
2387 title => "Map", 2447 title => "Map",
2388 reply => "say ", 2448 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2449 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2450};
2391 2451
2392our $CHAT_CHANNEL = { 2452our $CHAT_CHANNEL = {
2393 id => "chat", 2453 id => "chat",
2394 title => "Chat", 2454 title => "Chat",
… …
2520 2580
2521 $map->load; 2581 $map->load;
2522 $map->load_neighbours; 2582 $map->load_neighbours;
2523 2583
2524 return unless $self->contr->active; 2584 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2585
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2586 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2587 $self->enter_map ($map, $x, $y);
2588
2589 # only activate afterwards, to support waiting in hooks
2590 $self->activate_recursive;
2530} 2591}
2531 2592
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2593=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2594
2534Moves the player to the given map-path and coordinates by first freezing 2595Moves the player to the given map-path and coordinates by first freezing
… …
2733 2794
2734=cut 2795=cut
2735 2796
2736# non-persistent channels (usually the info channel) 2797# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2798our %CHANNEL = (
2799 "c/motd" => {
2800 id => "infobox",
2801 title => "MOTD",
2802 reply => undef,
2803 tooltip => "The message of the day",
2804 },
2738 "c/identify" => { 2805 "c/identify" => {
2739 id => "infobox", 2806 id => "infobox",
2740 title => "Identify", 2807 title => "Identify",
2741 reply => undef, 2808 reply => undef,
2742 tooltip => "Items recently identified", 2809 tooltip => "Items recently identified",
… …
2744 "c/examine" => { 2811 "c/examine" => {
2745 id => "infobox", 2812 id => "infobox",
2746 title => "Examine", 2813 title => "Examine",
2747 reply => undef, 2814 reply => undef,
2748 tooltip => "Signs and other items you examined", 2815 tooltip => "Signs and other items you examined",
2816 },
2817 "c/shopinfo" => {
2818 id => "infobox",
2819 title => "Shop Info",
2820 reply => undef,
2821 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2822 },
2750 "c/book" => { 2823 "c/book" => {
2751 id => "infobox", 2824 id => "infobox",
2752 title => "Book", 2825 title => "Book",
2753 reply => undef, 2826 reply => undef,
… …
2769 id => "infobox", 2842 id => "infobox",
2770 title => "Body Parts", 2843 title => "Body Parts",
2771 reply => undef, 2844 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 2845 tooltip => "Shows which body parts you posess and are available",
2773 }, 2846 },
2847 "c/statistics" => {
2848 id => "infobox",
2849 title => "Statistics",
2850 reply => undef,
2851 tooltip => "Shows your primary statistics",
2852 },
2774 "c/skills" => { 2853 "c/skills" => {
2775 id => "infobox", 2854 id => "infobox",
2776 title => "Skills", 2855 title => "Skills",
2777 reply => undef, 2856 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 2857 tooltip => "Shows your experience per skill and item power",
2858 },
2859 "c/shopitems" => {
2860 id => "infobox",
2861 title => "Shop Items",
2862 reply => undef,
2863 tooltip => "Shows the items currently for sale in this shop",
2864 },
2865 "c/resistances" => {
2866 id => "infobox",
2867 title => "Resistances",
2868 reply => undef,
2869 tooltip => "Shows your resistances",
2870 },
2871 "c/pets" => {
2872 id => "infobox",
2873 title => "Pets",
2874 reply => undef,
2875 tooltip => "Shows information abotu your pets/a specific pet",
2876 },
2877 "c/perceiveself" => {
2878 id => "infobox",
2879 title => "Perceive Self",
2880 reply => undef,
2881 tooltip => "You gained detailed knowledge about yourself",
2779 }, 2882 },
2780 "c/uptime" => { 2883 "c/uptime" => {
2781 id => "infobox", 2884 id => "infobox",
2782 title => "Uptime", 2885 title => "Uptime",
2783 reply => undef, 2886 reply => undef,
… …
3034The following functions and methods are available within a safe environment: 3137The following functions and methods are available within a safe environment:
3035 3138
3036 cf::object 3139 cf::object
3037 contr pay_amount pay_player map x y force_find force_add destroy 3140 contr pay_amount pay_player map x y force_find force_add destroy
3038 insert remove name archname title slaying race decrease split 3141 insert remove name archname title slaying race decrease split
3142 value
3039 3143
3040 cf::object::player 3144 cf::object::player
3041 player 3145 player
3042 3146
3043 cf::player 3147 cf::player
… …
3049=cut 3153=cut
3050 3154
3051for ( 3155for (
3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3156 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3053 insert remove inv nrof name archname title slaying race 3157 insert remove inv nrof name archname title slaying race
3054 decrease split destroy change_exp)], 3158 decrease split destroy change_exp value msg lore send_msg)],
3055 ["cf::object::player" => qw(player)], 3159 ["cf::object::player" => qw(player)],
3056 ["cf::player" => qw(peaceful)], 3160 ["cf::player" => qw(peaceful send_msg)],
3057 ["cf::map" => qw(trigger)], 3161 ["cf::map" => qw(trigger)],
3058) { 3162) {
3059 no strict 'refs'; 3163 no strict 'refs';
3060 my ($pkg, @funs) = @$_; 3164 my ($pkg, @funs) = @$_;
3061 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3165 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3078 my ($code, %vars) = @_; 3182 my ($code, %vars) = @_;
3079 3183
3080 my $qcode = $code; 3184 my $qcode = $code;
3081 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3185 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3082 $qcode =~ s/\n/\\n/g; 3186 $qcode =~ s/\n/\\n/g;
3187
3188 %vars = (_dummy => 0) unless %vars;
3083 3189
3084 local $_; 3190 local $_;
3085 local @safe::cf::_safe_eval_args = values %vars; 3191 local @safe::cf::_safe_eval_args = values %vars;
3086 3192
3087 my $eval = 3193 my $eval =
… …
3318 3424
3319 warn "finished reloading resource files\n"; 3425 warn "finished reloading resource files\n";
3320} 3426}
3321 3427
3322sub reload_config { 3428sub reload_config {
3429 warn "reloading config file...\n";
3430
3323 open my $fh, "<:utf8", "$CONFDIR/config" 3431 open my $fh, "<:utf8", "$CONFDIR/config"
3324 or return; 3432 or return;
3325 3433
3326 local $/; 3434 local $/;
3327 *CFG = YAML::Load <$fh>; 3435 *CFG = YAML::XS::Load scalar <$fh>;
3328 3436
3329 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3437 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3330 3438
3331 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3439 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3332 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3440 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3336 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3444 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3337 and die "WARNING: m(un)lockall failed: $!\n"; 3445 and die "WARNING: m(un)lockall failed: $!\n";
3338 }; 3446 };
3339 warn $@ if $@; 3447 warn $@ if $@;
3340 } 3448 }
3449
3450 warn "finished reloading resource files\n";
3341} 3451}
3342 3452
3343sub pidfile() { 3453sub pidfile() {
3344 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3454 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3345 or die "$PIDFILE: $!"; 3455 or die "$PIDFILE: $!";
… …
3355 my $pid = <$fh>; 3465 my $pid = <$fh>;
3356 kill 9, $pid if $pid > 0; 3466 kill 9, $pid if $pid > 0;
3357 3467
3358 seek $fh, 0, 0; 3468 seek $fh, 0, 0;
3359 print $fh $$; 3469 print $fh $$;
3470}
3471
3472sub main_loop {
3473 warn "EV::loop starting\n";
3474 if (1) {
3475 EV::loop;
3476 }
3477 warn "EV::loop returned\n";
3478 goto &main_loop unless $REALLY_UNLOOP;
3360} 3479}
3361 3480
3362sub main { 3481sub main {
3363 cf::init_globals; # initialise logging 3482 cf::init_globals; # initialise logging
3364 3483
… …
3404 load_extensions; 3523 load_extensions;
3405 3524
3406 utime time, time, $RUNTIMEFILE; 3525 utime time, time, $RUNTIMEFILE;
3407 3526
3408 # no (long-running) fork's whatsoever before this point(!) 3527 # no (long-running) fork's whatsoever before this point(!)
3528 use POSIX ();
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3529 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410 3530
3411 (pop @POST_INIT)->(0) while @POST_INIT; 3531 (pop @POST_INIT)->(0) while @POST_INIT;
3412 }; 3532 };
3413 3533
3414 EV::loop; 3534 main_loop;
3415} 3535}
3416 3536
3417############################################################################# 3537#############################################################################
3418# initialisation and cleanup 3538# initialisation and cleanup
3419 3539
… …
3675 clear_package "safe::$_" 3795 clear_package "safe::$_"
3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3796 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3677 3797
3678 warn "unloading cf.pm \"a bit\""; 3798 warn "unloading cf.pm \"a bit\"";
3679 delete $INC{"cf.pm"}; 3799 delete $INC{"cf.pm"};
3680 delete $INC{"cf/pod.pm"}; 3800 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3681 3801
3682 # don't, removes xs symbols, too, 3802 # don't, removes xs symbols, too,
3683 # and global variables created in xs 3803 # and global variables created in xs
3684 #clear_package __PACKAGE__; 3804 #clear_package __PACKAGE__;
3685 3805
3686 warn "unload completed, starting to reload now"; 3806 warn "unload completed, starting to reload now";
3687 3807
3688 warn "reloading cf.pm"; 3808 warn "reloading cf.pm";
3689 require cf; 3809 require cf;
3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3810 cf::_connect_to_perl_1;
3691 3811
3692 warn "loading config and database again"; 3812 warn "loading config and database again";
3693 cf::reload_config; 3813 cf::reload_config;
3694 3814
3695 warn "loading extensions"; 3815 warn "loading extensions";
… …
3902 LOG llevInfo, "[ABT] [suppressed]\n"; 4022 LOG llevInfo, "[ABT] [suppressed]\n";
3903 } 4023 }
3904} 4024}
3905 4025
3906# load additional modules 4026# load additional modules
3907use cf::pod; 4027require "cf/$_.pm" for @EXTRA_MODULES;
4028cf::_connect_to_perl_2;
3908 4029
3909END { cf::emergency_save } 4030END { cf::emergency_save }
3910 4031
39111 40321
3912 4033

Diff Legend

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