ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.468 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.496 by root, Sun Nov 15 18:03:59 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;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use 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
… …
157 164
158sub cf::map::normalise; 165sub cf::map::normalise;
159 166
160############################################################################# 167#############################################################################
161 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::"} };
177
178#############################################################################
179
162=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
163 181
164=over 4 182=over 4
165 183
166=item $cf::UPTIME 184=item $cf::UPTIME
… …
210returns 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
211per 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.
212 230
213=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
214 232
215This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 235that call.
218 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
219=back 243=back
220 244
221=cut 245=cut
222 246
223BEGIN { 247$Coro::State::WARNHOOK = sub {
224 *CORE::GLOBAL::warn = sub {
225 my $msg = join "", @_; 248 my $msg = join "", @_;
226 249
227 $msg .= "\n" 250 $msg .= "\n"
228 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
229 252
230 $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;
231 254
232 LOG llevError, $msg; 255 LOG llevError, $msg;
233 }; 256};
234}
235 257
236$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
238 262
239 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 265 return;#d#
242 }#d# 266 }#d#
243 267
244 # kill coroutine otherwise 268 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 269 Coro::terminate
247}; 270};
248
249$SIG{__DIE__} = sub { }; #d#?
250 271
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
268)) { 289)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 291}
271 292
272$EV::DIED = sub { 293$EV::DIED = sub {
273 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
274}; 295};
275 296
276############################################################################# 297#############################################################################
277 298
278=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
1151 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1152 1173
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 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 }
1157 aio_close $fh; 1181 aio_close $fh;
1158 1182
1159 if (@$objs) { 1183 if (@$objs) {
1160 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) {
1161 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1164 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 }
1165 aio_close $fh; 1192 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1194 }
1168 } else { 1195 } else {
1169 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
… …
1320 1347
1321# "readahead" all extensions 1348# "readahead" all extensions
1322sub cache_extensions { 1349sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1350 my $grp = IO::AIO::aio_group;
1324 1351
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1353 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1355 }
1329 }; 1356 };
1330 1357
… …
2213 2240
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2242
2216 return if $self->players; 2243 return if $self->players;
2217 2244
2218 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2219 2246
2220 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2221 2248
2222 # need to save uniques path 2249 # need to save uniques path
2223 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2314 : normalise $_ 2341 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2343 ]
2317} 2344}
2318 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
2319=back 2378=back
2320 2379
2321=head3 cf::object 2380=head3 cf::object
2322 2381
2323=cut 2382=cut
… …
2518 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2520 2579
2521 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2524 2583
2525 $map->load; 2584 $map->load;
2526 $map->load_neighbours; 2585 $map->load_neighbours;
2527 2586
2528 return unless $self->contr->active; 2587 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2588
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $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;
2534} 2594}
2535 2595
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2537 2597
2538Moves 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
… …
2726 2786
2727 utf8::encode $text; 2787 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2729} 2789}
2730 2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2814}
2815
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2817
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send 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 2819client 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 2820the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2737 2822
2738=cut 2823=cut
2739 2824
2740# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2742 "c/identify" => { 2833 "c/identify" => {
2743 id => "infobox", 2834 id => "infobox",
2744 title => "Identify", 2835 title => "Identify",
2745 reply => undef, 2836 reply => undef,
2746 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2839 "c/examine" => {
2749 id => "infobox", 2840 id => "infobox",
2750 title => "Examine", 2841 title => "Examine",
2751 reply => undef, 2842 reply => undef,
2752 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2850 },
2754 "c/book" => { 2851 "c/book" => {
2755 id => "infobox", 2852 id => "infobox",
2756 title => "Book", 2853 title => "Book",
2757 reply => undef, 2854 reply => undef,
… …
2785 id => "infobox", 2882 id => "infobox",
2786 title => "Skills", 2883 title => "Skills",
2787 reply => undef, 2884 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2885 tooltip => "Shows your experience per skill and item power",
2789 }, 2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2790 "c/resistances" => { 2893 "c/resistances" => {
2791 id => "infobox", 2894 id => "infobox",
2792 title => "Resistances", 2895 title => "Resistances",
2793 reply => undef, 2896 reply => undef,
2794 tooltip => "Shows your resistances", 2897 tooltip => "Shows your resistances",
… …
2796 "c/pets" => { 2899 "c/pets" => {
2797 id => "infobox", 2900 id => "infobox",
2798 title => "Pets", 2901 title => "Pets",
2799 reply => undef, 2902 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2910 },
2802 "c/uptime" => { 2911 "c/uptime" => {
2803 id => "infobox", 2912 id => "infobox",
2804 title => "Uptime", 2913 title => "Uptime",
2805 reply => undef, 2914 reply => undef,
… …
2861 my $pkt = "msg " 2970 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 2973 );
2865 2974
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 2975 $self->send_big_packet ($pkt);
2877} 2976}
2878 2977
2879=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2880 2979
2881Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2884 2983
2885sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2887 2986
2888 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 2992 }
2894} 2993}
2895 2994
2896=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2897 2996
… …
2901 3000
2902sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2904 3003
2905 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3007 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3010 }
2912} 3011}
2913 3012
2914=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2915 3014
… …
3192 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3293
3195 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3298
3200 cf::cede_to_tick; 3299 cf::cede_to_tick;
3201 } 3300 }
3202 3301
3203 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
… …
3227 3326
3228 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3229 } 3328 }
3230 3329
3231 { 3330 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3235 3332
3236 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3334 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3336
3241 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3338 cf::face::set_type $idx, $info->{type};
3256 } else { 3339 } else {
3257 $RESOURCE{$name} = $info; 3340 $RESOURCE{$name} = $info;
3258 } 3341 }
3259 3342
… …
3343 3426
3344 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3345} 3428}
3346 3429
3347sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3434 or return;
3350 3435
3351 local $/; 3436 local $/;
3352 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3353 3438
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3355 3440
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3448 };
3364 warn $@ if $@; 3449 warn $@ if $@;
3365 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3366} 3453}
3367 3454
3368sub pidfile() { 3455sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3457 or die "$PIDFILE: $!";
… …
3380 my $pid = <$fh>; 3467 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0; 3468 kill 9, $pid if $pid > 0;
3382 3469
3383 seek $fh, 0, 0; 3470 seek $fh, 0, 0;
3384 print $fh $$; 3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3385} 3481}
3386 3482
3387sub main { 3483sub main {
3388 cf::init_globals; # initialise logging 3484 cf::init_globals; # initialise logging
3389 3485
… …
3409 }; 3505 };
3410 3506
3411 evthread_start IO::AIO::poll_fileno; 3507 evthread_start IO::AIO::poll_fileno;
3412 3508
3413 cf::sync_job { 3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3414 reload_resources; 3513 reload_resources;
3415 reload_config; 3514 reload_config;
3416 db_init; 3515 db_init;
3417 3516
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3517 cf::init_uuid;
3421 cf::init_signals; 3518 cf::init_signals;
3422 cf::init_commands; 3519 cf::init_commands;
3423 cf::init_skills; 3520 cf::init_skills;
3424 3521
… …
3429 load_extensions; 3526 load_extensions;
3430 3527
3431 utime time, time, $RUNTIMEFILE; 3528 utime time, time, $RUNTIMEFILE;
3432 3529
3433 # no (long-running) fork's whatsoever before this point(!) 3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3434 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};
3435 3533
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3534 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3535 };
3438 3536
3439 EV::loop; 3537 main_loop;
3440} 3538}
3441 3539
3442############################################################################# 3540#############################################################################
3443# initialisation and cleanup 3541# initialisation and cleanup
3444 3542
… …
3710 3808
3711 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3712 3810
3713 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3714 require cf; 3812 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3716 3814
3717 warn "loading config and database again"; 3815 warn "loading config and database again";
3718 cf::reload_config; 3816 cf::reload_config;
3719 3817
3720 warn "loading extensions"; 3818 warn "loading extensions";
… …
3928 } 4026 }
3929} 4027}
3930 4028
3931# load additional modules 4029# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3933 4032
3934END { cf::emergency_save } 4033END { cf::emergency_save }
3935 4034
39361 40351
3937 4036

Diff Legend

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