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.471 by root, Mon Apr 27 01:38:48 2009 UTC vs.
Revision 1.501 by root, Sat Jan 16 23:27:21 2010 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";
… …
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
… …
1982 2009
1983 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1984 } 2011 }
1985} 2012}
1986 2013
1987sub pre_load { } 2014sub pre_load { }
1988sub post_load { } 2015#sub post_load { } # XS
1989 2016
1990sub load { 2017sub load {
1991 my ($self) = @_; 2018 my ($self) = @_;
1992 2019
1993 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
… …
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,
… …
2873 my $pkt = "msg " 2970 my $pkt = "msg "
2874 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2876 ); 2973 );
2877 2974
2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2881
2882 # split very large packets
2883 if (8192 < length $pkt and $self->{can_lzf}) {
2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2885 $pkt = "frag";
2886 }
2887
2888 $self->send_packet ($pkt); 2975 $self->send_big_packet ($pkt);
2889} 2976}
2890 2977
2891=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2892 2979
2893Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2896 2983
2897sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2899 2986
2900 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 2992 }
2906} 2993}
2907 2994
2908=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2909 2996
… …
2913 3000
2914sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2916 3003
2917 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3007 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3010 }
2924} 3011}
2925 3012
2926=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2927 3014
… …
3054our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3055 3142
3056$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3057 3144
3058$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3061 sort time 3148 sort time
3062)); 3149));
3063 3150
3064# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3117 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3118 3205
3119 %vars = (_dummy => 0) unless %vars; 3206 %vars = (_dummy => 0) unless %vars;
3120 3207
3208 my @res;
3121 local $_; 3209 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3210
3124 my $eval = 3211 my $eval =
3125 "do {\n" 3212 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3215 . $code
3129 . "\n}" 3216 . "\n}"
3130 ; 3217 ;
3131 3218
3219 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3223 sub_generation_inc;
3224 } else {
3225 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval;
3227 }
3135 3228
3136 if ($@) { 3229 if ($@) {
3137 warn "$@"; 3230 warn "$@";
3138 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
… …
3158=cut 3251=cut
3159 3252
3160sub register_script_function { 3253sub register_script_function {
3161 my ($fun, $cb) = @_; 3254 my ($fun, $cb) = @_;
3162 3255
3163 no strict 'refs'; 3256 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3257 *$fun = $safe_hole->wrap ($cb);
3165} 3258}
3166 3259
3167=back 3260=back
3168 3261
3169=cut 3262=cut
… …
3190 3283
3191 $facedata->{version} == 2 3284 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3285 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3286
3194 # patch in the exptable 3287 # patch in the exptable
3288 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3289 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3290 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3291 data => $exp_table,
3292 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3293 };
3199 cf::cede_to_tick; 3294 cf::cede_to_tick;
3200 3295
3201 { 3296 {
3202 my $faces = $facedata->{faceinfo}; 3297 my $faces = $facedata->{faceinfo};
… …
3204 while (my ($face, $info) = each %$faces) { 3299 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3300 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3301
3207 cf::face::set_visibility $idx, $info->{visibility}; 3302 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3303 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3211 3306
3212 cf::cede_to_tick; 3307 cf::cede_to_tick;
3213 } 3308 }
3214 3309
3215 while (my ($face, $info) = each %$faces) { 3310 while (my ($face, $info) = each %$faces) {
… …
3239 3334
3240 cf::anim::invalidate_all; # d'oh 3335 cf::anim::invalidate_all; # d'oh
3241 } 3336 }
3242 3337
3243 { 3338 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3339 my $res = $facedata->{resource};
3247 3340
3248 while (my ($name, $info) = each %$res) { 3341 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3342 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3343 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3344
3253 if ($info->{type} & 1) { 3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3346 cf::face::set_type $idx, $info->{type};
3268 } else { 3347 } else {
3269 $RESOURCE{$name} = $info; 3348 $RESOURCE{$name} = $info;
3270 } 3349 }
3271 3350
… …
3355 3434
3356 warn "finished reloading resource files\n"; 3435 warn "finished reloading resource files\n";
3357} 3436}
3358 3437
3359sub reload_config { 3438sub reload_config {
3439 warn "reloading config file...\n";
3440
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3441 open my $fh, "<:utf8", "$CONFDIR/config"
3361 or return; 3442 or return;
3362 3443
3363 local $/; 3444 local $/;
3364 *CFG = YAML::Load <$fh>; 3445 *CFG = YAML::XS::Load scalar <$fh>;
3365 3446
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3367 3448
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3449 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3373 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3374 and die "WARNING: m(un)lockall failed: $!\n"; 3455 and die "WARNING: m(un)lockall failed: $!\n";
3375 }; 3456 };
3376 warn $@ if $@; 3457 warn $@ if $@;
3377 } 3458 }
3459
3460 warn "finished reloading resource files\n";
3378} 3461}
3379 3462
3380sub pidfile() { 3463sub pidfile() {
3381 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3382 or die "$PIDFILE: $!"; 3465 or die "$PIDFILE: $!";
… …
3392 my $pid = <$fh>; 3475 my $pid = <$fh>;
3393 kill 9, $pid if $pid > 0; 3476 kill 9, $pid if $pid > 0;
3394 3477
3395 seek $fh, 0, 0; 3478 seek $fh, 0, 0;
3396 print $fh $$; 3479 print $fh $$;
3480}
3481
3482sub main_loop {
3483 warn "EV::loop starting\n";
3484 if (1) {
3485 EV::loop;
3486 }
3487 warn "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP;
3397} 3489}
3398 3490
3399sub main { 3491sub main {
3400 cf::init_globals; # initialise logging 3492 cf::init_globals; # initialise logging
3401 3493
… …
3421 }; 3513 };
3422 3514
3423 evthread_start IO::AIO::poll_fileno; 3515 evthread_start IO::AIO::poll_fileno;
3424 3516
3425 cf::sync_job { 3517 cf::sync_job {
3518 cf::load_settings;
3519 cf::load_materials;
3520
3426 reload_resources; 3521 reload_resources;
3427 reload_config; 3522 reload_config;
3428 db_init; 3523 db_init;
3429 3524
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid; 3525 cf::init_uuid;
3433 cf::init_signals; 3526 cf::init_signals;
3434 cf::init_commands; 3527 cf::init_commands;
3435 cf::init_skills; 3528 cf::init_skills;
3436 3529
… …
3441 load_extensions; 3534 load_extensions;
3442 3535
3443 utime time, time, $RUNTIMEFILE; 3536 utime time, time, $RUNTIMEFILE;
3444 3537
3445 # no (long-running) fork's whatsoever before this point(!) 3538 # no (long-running) fork's whatsoever before this point(!)
3539 use POSIX ();
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3540 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447 3541
3448 (pop @POST_INIT)->(0) while @POST_INIT; 3542 (pop @POST_INIT)->(0) while @POST_INIT;
3449 }; 3543 };
3450 3544
3451 EV::loop; 3545 main_loop;
3452} 3546}
3453 3547
3454############################################################################# 3548#############################################################################
3455# initialisation and cleanup 3549# initialisation and cleanup
3456 3550
… …
3722 3816
3723 warn "unload completed, starting to reload now"; 3817 warn "unload completed, starting to reload now";
3724 3818
3725 warn "reloading cf.pm"; 3819 warn "reloading cf.pm";
3726 require cf; 3820 require cf;
3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3821 cf::_connect_to_perl_1;
3728 3822
3729 warn "loading config and database again"; 3823 warn "loading config and database again";
3730 cf::reload_config; 3824 cf::reload_config;
3731 3825
3732 warn "loading extensions"; 3826 warn "loading extensions";
… …
3794 3888
3795our @WAIT_FOR_TICK; 3889our @WAIT_FOR_TICK;
3796our @WAIT_FOR_TICK_BEGIN; 3890our @WAIT_FOR_TICK_BEGIN;
3797 3891
3798sub wait_for_tick { 3892sub wait_for_tick {
3799 return if tick_inhibit || $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3800 3894
3801 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3802 push @WAIT_FOR_TICK, $signal; 3896 push @WAIT_FOR_TICK, $signal;
3803 $signal->wait; 3897 $signal->wait;
3804} 3898}
3805 3899
3806sub wait_for_tick_begin { 3900sub wait_for_tick_begin {
3807 return if tick_inhibit || $Coro::current == $Coro::main; 3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3808 3902
3809 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3810 push @WAIT_FOR_TICK_BEGIN, $signal; 3904 push @WAIT_FOR_TICK_BEGIN, $signal;
3811 $signal->wait; 3905 $signal->wait;
3812} 3906}
… …
3940 } 4034 }
3941} 4035}
3942 4036
3943# load additional modules 4037# load additional modules
3944require "cf/$_.pm" for @EXTRA_MODULES; 4038require "cf/$_.pm" for @EXTRA_MODULES;
4039cf::_connect_to_perl_2;
3945 4040
3946END { cf::emergency_save } 4041END { cf::emergency_save }
3947 4042
39481 40431
3949 4044

Diff Legend

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