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.470 by root, Sun Apr 26 19:42:45 2009 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 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";
… …
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
… …
2726 2787
2727 utf8::encode $text; 2788 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2729} 2790}
2730 2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2815}
2816
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2818
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2734client if neccessary. C<$type> should be a string identifying the type of 2820client if neccessary. C<$type> should be a string identifying the type of
2735the message, with C<log> being the default. If C<$color> is negative, suppress 2821the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2737 2823
2738=cut 2824=cut
2739 2825
2740# non-persistent channels (usually the info channel) 2826# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2742 "c/identify" => { 2834 "c/identify" => {
2743 id => "infobox", 2835 id => "infobox",
2744 title => "Identify", 2836 title => "Identify",
2745 reply => undef, 2837 reply => undef,
2746 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2840 "c/examine" => {
2749 id => "infobox", 2841 id => "infobox",
2750 title => "Examine", 2842 title => "Examine",
2751 reply => undef, 2843 reply => undef,
2752 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2851 },
2754 "c/book" => { 2852 "c/book" => {
2755 id => "infobox", 2853 id => "infobox",
2756 title => "Book", 2854 title => "Book",
2757 reply => undef, 2855 reply => undef,
… …
2803 id => "infobox", 2901 id => "infobox",
2804 title => "Pets", 2902 title => "Pets",
2805 reply => undef, 2903 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet", 2904 tooltip => "Shows information abotu your pets/a specific pet",
2807 }, 2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2911 },
2808 "c/uptime" => { 2912 "c/uptime" => {
2809 id => "infobox", 2913 id => "infobox",
2810 title => "Uptime", 2914 title => "Uptime",
2811 reply => undef, 2915 reply => undef,
2812 tooltip => "How long the server has been running since last restart", 2916 tooltip => "How long the server has been running since last restart",
… …
2867 my $pkt = "msg " 2971 my $pkt = "msg "
2868 . $self->{json_coder}->encode ( 2972 . $self->{json_coder}->encode (
2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2870 ); 2974 );
2871 2975
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if (8192 < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt); 2976 $self->send_big_packet ($pkt);
2883} 2977}
2884 2978
2885=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2886 2980
2887Sends an ext event to the client. 2981Sends an ext event to the client.
… …
2890 2984
2891sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2892 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2893 2987
2894 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2896 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2897 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 2993 }
2900} 2994}
2901 2995
2902=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2903 2997
… …
2907 3001
2908sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2909 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2910 3004
2911 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2913 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2914 #TODO: version 1, remove 3008 #TODO: version 1, remove
2915 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2916 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2917 } 3011 }
2918} 3012}
2919 3013
2920=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2921 3015
… …
3349 3443
3350 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3351} 3445}
3352 3446
3353sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3451 or return;
3356 3452
3357 local $/; 3453 local $/;
3358 *CFG = YAML::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3359 3455
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3361 3457
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3367 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3369 }; 3465 };
3370 warn $@ if $@; 3466 warn $@ if $@;
3371 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3372} 3470}
3373 3471
3374sub pidfile() { 3472sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!"; 3474 or die "$PIDFILE: $!";
… …
3386 my $pid = <$fh>; 3484 my $pid = <$fh>;
3387 kill 9, $pid if $pid > 0; 3485 kill 9, $pid if $pid > 0;
3388 3486
3389 seek $fh, 0, 0; 3487 seek $fh, 0, 0;
3390 print $fh $$; 3488 print $fh $$;
3489}
3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3391} 3498}
3392 3499
3393sub main { 3500sub main {
3394 cf::init_globals; # initialise logging 3501 cf::init_globals; # initialise logging
3395 3502
… …
3435 load_extensions; 3542 load_extensions;
3436 3543
3437 utime time, time, $RUNTIMEFILE; 3544 utime time, time, $RUNTIMEFILE;
3438 3545
3439 # no (long-running) fork's whatsoever before this point(!) 3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3440 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441 3549
3442 (pop @POST_INIT)->(0) while @POST_INIT; 3550 (pop @POST_INIT)->(0) while @POST_INIT;
3443 }; 3551 };
3444 3552
3445 EV::loop; 3553 main_loop;
3446} 3554}
3447 3555
3448############################################################################# 3556#############################################################################
3449# initialisation and cleanup 3557# initialisation and cleanup
3450 3558
… …
3716 3824
3717 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3718 3826
3719 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3720 require cf; 3828 require cf;
3721 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3722 3830
3723 warn "loading config and database again"; 3831 warn "loading config and database again";
3724 cf::reload_config; 3832 cf::reload_config;
3725 3833
3726 warn "loading extensions"; 3834 warn "loading extensions";
… …
3934 } 4042 }
3935} 4043}
3936 4044
3937# load additional modules 4045# load additional modules
3938require "cf/$_.pm" for @EXTRA_MODULES; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3939 4048
3940END { cf::emergency_save } 4049END { cf::emergency_save }
3941 4050
39421 40511
3943 4052

Diff Legend

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