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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.502 by root, Sat Jan 23 20:24:50 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
… …
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
115our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 121our $DB_ENV;
119 122
120our @EXTRA_MODULES = qw(pod mapscript); 123our @EXTRA_MODULES = qw(pod match mapscript);
121 124
122our %CFG; 125our %CFG;
123 126
124our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 128our $RUNTIME;
… …
161 164
162sub cf::map::normalise; 165sub cf::map::normalise;
163 166
164############################################################################# 167#############################################################################
165 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
166=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
167 181
168=over 4 182=over 4
169 183
170=item $cf::UPTIME 184=item $cf::UPTIME
… …
214returns 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
215per 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.
216 230
217=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
218 232
219This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
220C<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
221that call. 235that call.
222 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
223=back 243=back
224 244
225=cut 245=cut
226 246
227BEGIN { 247$Coro::State::WARNHOOK = sub {
228 *CORE::GLOBAL::warn = sub {
229 my $msg = join "", @_; 248 my $msg = join "", @_;
230 249
231 $msg .= "\n" 250 $msg .= "\n"
232 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
233 252
234 $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;
235 254
236 LOG llevError, $msg; 255 LOG llevError, $msg;
237 }; 256};
238}
239 257
240$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
242 262
243 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 265 return;#d#
246 }#d# 266 }#d#
247 267
248 # kill coroutine otherwise 268 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 269 Coro::terminate
251}; 270};
252
253$SIG{__DIE__} = sub { }; #d#?
254 271
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
272)) { 289)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 291}
275 292
276$EV::DIED = sub { 293$EV::DIED = sub {
277 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
278}; 295};
279 296
280############################################################################# 297#############################################################################
281 298
282=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
406 423
407=cut 424=cut
408 425
409our @SLOT_QUEUE; 426our @SLOT_QUEUE;
410our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
411 429
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
415 433
416 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
417 436
418 while () { 437 while () {
419 next_job: 438 next_job:
439
420 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 441
422 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 446 $job->[2]->send;
426 Coro::cede; 447 Coro::cede;
427 goto next_job; 448 goto next_job;
428 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 451 }
430 } 452 }
431 453
432 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait; 457 $signal->wait;
436 } else { 458 } else {
459 $busy = 0;
437 Coro::schedule; 460 Coro::schedule;
438 } 461 }
439 } 462 }
440}; 463};
441 464
442sub get_slot($;$$) { 465sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
444 467
445 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
446 469
447 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
448 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
449 473
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1992 2016
1993 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
1994 } 2018 }
1995} 2019}
1996 2020
1997sub pre_load { } 2021sub pre_load { }
1998sub post_load { } 2022#sub post_load { } # XS
1999 2023
2000sub load { 2024sub load {
2001 my ($self) = @_; 2025 my ($self) = @_;
2002 2026
2003 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
… …
2223 2247
2224 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2249
2226 return if $self->players; 2250 return if $self->players;
2227 2251
2228 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
2229 2253
2230 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2231 2255
2232 # need to save uniques path 2256 # need to save uniques path
2233 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
… …
2324 : normalise $_ 2348 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2350 ]
2327} 2351}
2328 2352
2353=item cf::map::static_maps
2354
2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2358
2359=cut
2360
2361sub static_maps() {
2362 my @dirs = "";
2363 my @maps;
2364
2365 while (@dirs) {
2366 my $dir = shift @dirs;
2367
2368 next if $dir eq "/styles" || $dir eq "/editor";
2369
2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2371 or return;
2372
2373 for (@$files) {
2374 s/\.map$// or next;
2375 utf8::decode $_;
2376 push @maps, "$dir/$_";
2377 }
2378
2379 push @dirs, map "$dir/$_", @$dirs;
2380 }
2381
2382 \@maps
2383}
2384
2329=back 2385=back
2330 2386
2331=head3 cf::object 2387=head3 cf::object
2332 2388
2333=cut 2389=cut
… …
2528 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2530 2586
2531 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2534 2590
2535 $map->load; 2591 $map->load;
2536 $map->load_neighbours; 2592 $map->load_neighbours;
2537 2593
2538 return unless $self->contr->active; 2594 return unless $self->contr->active;
… …
2737 2793
2738 utf8::encode $text; 2794 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2796}
2741 2797
2798=item $client->send_big_packet ($pkt)
2799
2800Like C<send_packet>, but tries to compress large packets, and fragments
2801them as required.
2802
2803=cut
2804
2805our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2806
2807sub cf::client::send_big_packet {
2808 my ($self, $pkt) = @_;
2809
2810 # try lzf for large packets
2811 $pkt = "lzf " . Compress::LZF::compress $pkt
2812 if 1024 <= length $pkt and $self->{can_lzf};
2813
2814 # split very large packets
2815 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2816 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2817 $pkt = "frag";
2818 }
2819
2820 $self->send_packet ($pkt);
2821}
2822
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2824
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2825Send a drawinfo or msg packet to the client, formatting the msg for the
2745client if neccessary. C<$type> should be a string identifying the type of 2826client if neccessary. C<$type> should be a string identifying the type of
2746the message, with C<log> being the default. If C<$color> is negative, suppress 2827the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2748 2829
2749=cut 2830=cut
2750 2831
2751# non-persistent channels (usually the info channel) 2832# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2753 "c/identify" => { 2840 "c/identify" => {
2754 id => "infobox", 2841 id => "infobox",
2755 title => "Identify", 2842 title => "Identify",
2756 reply => undef, 2843 reply => undef,
2757 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
… …
2759 "c/examine" => { 2846 "c/examine" => {
2760 id => "infobox", 2847 id => "infobox",
2761 title => "Examine", 2848 title => "Examine",
2762 reply => undef, 2849 reply => undef,
2763 tooltip => "Signs and other items you examined", 2850 tooltip => "Signs and other items you examined",
2851 },
2852 "c/shopinfo" => {
2853 id => "infobox",
2854 title => "Shop Info",
2855 reply => undef,
2856 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2857 },
2765 "c/book" => { 2858 "c/book" => {
2766 id => "infobox", 2859 id => "infobox",
2767 title => "Book", 2860 title => "Book",
2768 reply => undef, 2861 reply => undef,
… …
2884 my $pkt = "msg " 2977 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 2978 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 2980 );
2888 2981
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if (8192 < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt); 2982 $self->send_big_packet ($pkt);
2900} 2983}
2901 2984
2902=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2903 2986
2904Sends an ext event to the client. 2987Sends an ext event to the client.
… …
2907 2990
2908sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2910 2993
2911 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 2999 }
2917} 3000}
2918 3001
2919=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2920 3003
… …
2924 3007
2925sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2927 3010
2928 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3014 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3017 }
2935} 3018}
2936 3019
2937=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2938 3021
… …
3065our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
3066 3149
3067$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
3068 3151
3069$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
3072 sort time 3155 sort time
3073)); 3156));
3074 3157
3075# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
… …
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
3129 3212
3130 %vars = (_dummy => 0) unless %vars; 3213 %vars = (_dummy => 0) unless %vars;
3131 3214
3215 my @res;
3132 local $_; 3216 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3217
3135 my $eval = 3218 my $eval =
3136 "do {\n" 3219 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3222 . $code
3140 . "\n}" 3223 . "\n}"
3141 ; 3224 ;
3142 3225
3226 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 sub_generation_inc; 3230 sub_generation_inc;
3231 } else {
3232 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval;
3234 }
3146 3235
3147 if ($@) { 3236 if ($@) {
3148 warn "$@"; 3237 warn "$@";
3149 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
3169=cut 3258=cut
3170 3259
3171sub register_script_function { 3260sub register_script_function {
3172 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
3173 3262
3174 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
3176} 3265}
3177 3266
3178=back 3267=back
3179 3268
3180=cut 3269=cut
… …
3201 3290
3202 $facedata->{version} == 2 3291 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3293
3205 # patch in the exptable 3294 # patch in the exptable
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3206 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC, 3297 type => FT_RSRC,
3208 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3298 data => $exp_table,
3299 hash => (Digest::MD5::md5 $exp_table),
3209 }; 3300 };
3210 cf::cede_to_tick; 3301 cf::cede_to_tick;
3211 3302
3212 { 3303 {
3213 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
… …
3215 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3308
3218 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3222 3313
3223 cf::cede_to_tick; 3314 cf::cede_to_tick;
3224 } 3315 }
3225 3316
3226 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
… …
3250 3341
3251 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3252 } 3343 }
3253 3344
3254 { 3345 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3258 3347
3259 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3349 if (defined $info->{type}) {
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3351
3264 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3265 # prepend meta info
3266
3267 my $meta = $enc->encode ({
3268 name => $name,
3269 %{ $info->{meta} || {} },
3270 });
3271
3272 $data = pack "(w/a*)*", $meta, $info->{data};
3273 } else {
3274 $data = $info->{data};
3275 }
3276
3277 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278 cf::face::set_type $idx, $info->{type}; 3353 cf::face::set_type $idx, $info->{type};
3279 } else { 3354 } else {
3280 $RESOURCE{$name} = $info; 3355 $RESOURCE{$name} = $info;
3281 } 3356 }
3282 3357
… …
3366 3441
3367 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3368} 3443}
3369 3444
3370sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3372 or return; 3449 or return;
3373 3450
3374 local $/; 3451 local $/;
3375 *CFG = YAML::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3376 3453
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3378 3455
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3384 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3385 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3386 }; 3463 };
3387 warn $@ if $@; 3464 warn $@ if $@;
3388 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3389} 3468}
3390 3469
3391sub pidfile() { 3470sub pidfile() {
3392 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3393 or die "$PIDFILE: $!"; 3472 or die "$PIDFILE: $!";
… …
3441 }; 3520 };
3442 3521
3443 evthread_start IO::AIO::poll_fileno; 3522 evthread_start IO::AIO::poll_fileno;
3444 3523
3445 cf::sync_job { 3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3446 reload_resources; 3528 reload_resources;
3447 reload_config; 3529 reload_config;
3448 db_init; 3530 db_init;
3449 3531
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3532 cf::init_uuid;
3453 cf::init_signals; 3533 cf::init_signals;
3454 cf::init_commands; 3534 cf::init_commands;
3455 cf::init_skills; 3535 cf::init_skills;
3456 3536
… …
3743 3823
3744 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3745 3825
3746 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3747 require cf; 3827 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3749 3829
3750 warn "loading config and database again"; 3830 warn "loading config and database again";
3751 cf::reload_config; 3831 cf::reload_config;
3752 3832
3753 warn "loading extensions"; 3833 warn "loading extensions";
… …
3815 3895
3816our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3818 3898
3819sub wait_for_tick { 3899sub wait_for_tick {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3821 3901
3822 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3823 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait; 3904 $signal->wait;
3825} 3905}
3826 3906
3827sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3829 3909
3830 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 3912 $signal->wait;
3833} 3913}
… …
3838 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3839 return; 3919 return;
3840 } 3920 }
3841 3921
3842 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3923
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3843 3925
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 3928 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";
… …
3961 } 4043 }
3962} 4044}
3963 4045
3964# load additional modules 4046# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3966 4049
3967END { cf::emergency_save } 4050END { cf::emergency_save }
3968 4051
39691 40521
3970 4053

Diff Legend

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