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.479 by root, Thu Oct 8 05:04:27 2009 UTC vs.
Revision 1.507 by root, Sat Mar 20 02:24:38 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,2009,2010 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
… …
117our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 121our $DB_ENV;
121 122
122our @EXTRA_MODULES = qw(pod mapscript); 123our @EXTRA_MODULES = qw(pod match mapscript);
123 124
124our %CFG; 125our %CFG;
125 126
126our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 128our $RUNTIME;
… …
169for (@REFLECT) { 170for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 171 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 172 $REFLECT{$reflect->{class}} = $reflect;
172} 173}
173 174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
177
174############################################################################# 178#############################################################################
175 179
176=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
177 181
178=over 4 182=over 4
… …
224returns 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
225per 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.
226 230
227=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
228 232
229This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
230C<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
231that call. 235that call.
232 236
233=item %cf::REFLECT 237=item %cf::REFLECT
234 238
235Contains, for each (C++) class name, a hash reference with information 239Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata, 240about object members (methods, scalars, arrays and flags) and other
237which is useful for introspection. 241metadata, which is useful for introspection.
238 242
239=back 243=back
240 244
241=cut 245=cut
242 246
… …
285)) { 289)) {
286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
287} 291}
288 292
289$EV::DIED = sub { 293$EV::DIED = sub {
290 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
291}; 295};
292 296
293############################################################################# 297#############################################################################
294 298
295=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
419 423
420=cut 424=cut
421 425
422our @SLOT_QUEUE; 426our @SLOT_QUEUE;
423our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
424 429
425$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
426$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
427 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
428 433
429 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
430 436
431 while () { 437 while () {
432 next_job: 438 next_job:
439
433 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
434 if ($avail > 0.01) { 441
435 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
436 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
437 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
438 $job->[2]->send; 446 $job->[2]->send;
439 Coro::cede; 447 Coro::cede;
440 goto next_job; 448 goto next_job;
441 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
442 } 451 }
443 } 452 }
444 453
445 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
446 # 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
447 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
448 $signal->wait; 457 $signal->wait;
449 } else { 458 } else {
459 $busy = 0;
450 Coro::schedule; 460 Coro::schedule;
451 } 461 }
452 } 462 }
453}; 463};
454 464
455sub get_slot($;$$) { 465sub get_slot($;$$) {
456 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
457 467
458 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
459 469
460 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
461 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
462 473
463 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
464 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
465 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1388 . "\n};\n1"; 1399 . "\n};\n1";
1389 1400
1390 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1391 } 1402 }
1392 1403
1404 my $pass = 0;
1393 my %done; 1405 my %done;
1394 while (%todo) { 1406 while (%todo) {
1395 my $progress; 1407 my $progress;
1396 1408
1409 ++$pass;
1410
1411 ext:
1397 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1398 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1399 goto skip 1414 next ext
1400 unless exists $done{$_}; 1415 unless exists $done{$_};
1401 } 1416 }
1402 1417
1403 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1404 1419
1405 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1406 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1407 : "$v->{base}: extension inactive.\n";
1408 1424
1409 if (exists $v->{meta}{mandatory}) {
1410 warn $msg;
1411 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1412 } 1426 if exists $v->{meta}{mandatory};
1413 1427 } else {
1414 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1415 } 1434 }
1416
1417 $done{$k} = delete $todo{$k};
1418 push @EXTS, $v->{pkg};
1419 $progress = 1;
1420 } 1435 }
1421 1436
1422 skip: 1437 unless ($progress) {
1423 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1424 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1425 } 1445 }
1426 }; 1446 };
1427} 1447}
1428 1448
1429############################################################################# 1449#############################################################################
… …
2005 2025
2006 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2007 } 2027 }
2008} 2028}
2009 2029
2010sub pre_load { } 2030sub pre_load { }
2011sub post_load { } 2031#sub post_load { } # XS
2012 2032
2013sub load { 2033sub load {
2014 my ($self) = @_; 2034 my ($self) = @_;
2015 2035
2016 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2073 } 2093 }
2074 2094
2075 $self->post_load; 2095 $self->post_load;
2076} 2096}
2077 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
2078sub customise_for { 2101sub customise_for {
2079 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2080 2103
2081 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2082 if $self->per_player; 2105 if $self->per_player;
… …
2337 : normalise $_ 2360 : normalise $_
2338 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2339 ] 2362 ]
2340} 2363}
2341 2364
2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2396
2342=back 2397=back
2343 2398
2344=head3 cf::object 2399=head3 cf::object
2345 2400
2346=cut 2401=cut
… …
2541 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2542 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2543 2598
2544 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2545 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2546 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2547 2602
2548 $map->load; 2603 $map->load;
2549 $map->load_neighbours; 2604 $map->load_neighbours;
2550 2605
2551 return unless $self->contr->active; 2606 return unless $self->contr->active;
… …
2750 2805
2751 utf8::encode $text; 2806 utf8::encode $text;
2752 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2753} 2808}
2754 2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2833}
2834
2755=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2756 2836
2757Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2758client if neccessary. C<$type> should be a string identifying the type of 2838client if neccessary. C<$type> should be a string identifying the type of
2759the message, with C<log> being the default. If C<$color> is negative, suppress 2839the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2761 2841
2762=cut 2842=cut
2763 2843
2764# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2765our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2766 "c/identify" => { 2852 "c/identify" => {
2767 id => "infobox", 2853 id => "infobox",
2768 title => "Identify", 2854 title => "Identify",
2769 reply => undef, 2855 reply => undef,
2770 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
… …
2772 "c/examine" => { 2858 "c/examine" => {
2773 id => "infobox", 2859 id => "infobox",
2774 title => "Examine", 2860 title => "Examine",
2775 reply => undef, 2861 reply => undef,
2776 tooltip => "Signs and other items you examined", 2862 tooltip => "Signs and other items you examined",
2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2777 }, 2869 },
2778 "c/book" => { 2870 "c/book" => {
2779 id => "infobox", 2871 id => "infobox",
2780 title => "Book", 2872 title => "Book",
2781 reply => undef, 2873 reply => undef,
… …
2897 my $pkt = "msg " 2989 my $pkt = "msg "
2898 . $self->{json_coder}->encode ( 2990 . $self->{json_coder}->encode (
2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2900 ); 2992 );
2901 2993
2902 # try lzf for large packets
2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2904 if 1024 <= length $pkt and $self->{can_lzf};
2905
2906 # split very large packets
2907 if (8192 < length $pkt and $self->{can_lzf}) {
2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2909 $pkt = "frag";
2910 }
2911
2912 $self->send_packet ($pkt); 2994 $self->send_big_packet ($pkt);
2913} 2995}
2914 2996
2915=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2916 2998
2917Sends an ext event to the client. 2999Sends an ext event to the client.
… …
2920 3002
2921sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2922 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2923 3005
2924 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2926 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2927 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3011 }
2930} 3012}
2931 3013
2932=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2933 3015
… …
2937 3019
2938sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2939 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2940 3022
2941 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2943 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2944 #TODO: version 1, remove 3026 #TODO: version 1, remove
2945 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3029 }
2948} 3030}
2949 3031
2950=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2951 3033
… …
3078our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3079 3161
3080$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3081 3163
3082$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3083 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3084 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3085 sort time 3167 sort time
3086)); 3168));
3087 3169
3088# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
… …
3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3141 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3142 3224
3143 %vars = (_dummy => 0) unless %vars; 3225 %vars = (_dummy => 0) unless %vars;
3144 3226
3227 my @res;
3145 local $_; 3228 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3229
3148 my $eval = 3230 my $eval =
3149 "do {\n" 3231 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3234 . $code
3153 . "\n}" 3235 . "\n}"
3154 ; 3236 ;
3155 3237
3238 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
3159 3247
3160 if ($@) { 3248 if ($@) {
3161 warn "$@"; 3249 warn "$@";
3162 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
… …
3182=cut 3270=cut
3183 3271
3184sub register_script_function { 3272sub register_script_function {
3185 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3186 3274
3187 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3189} 3277}
3190 3278
3191=back 3279=back
3192 3280
3193=cut 3281=cut
… …
3214 3302
3215 $facedata->{version} == 2 3303 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3217 3305
3218 # patch in the exptable 3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3219 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC, 3309 type => FT_RSRC,
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3222 }; 3312 };
3223 cf::cede_to_tick; 3313 cf::cede_to_tick;
3224 3314
3225 { 3315 {
3226 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
… …
3228 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3320
3231 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3235 3325
3236 cf::cede_to_tick; 3326 cf::cede_to_tick;
3237 } 3327 }
3238 3328
3239 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
… …
3263 3353
3264 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3265 } 3355 }
3266 3356
3267 { 3357 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3271 3359
3272 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3361 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3363
3277 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type}; 3365 cf::face::set_type $idx, $info->{type};
3292 } else { 3366 } else {
3293 $RESOURCE{$name} = $info; 3367 $RESOURCE{$name} = $info;
3294 } 3368 }
3295 3369
… …
3379 3453
3380 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3381} 3455}
3382 3456
3383sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3385 or return; 3461 or return;
3386 3462
3387 local $/; 3463 local $/;
3388 *CFG = YAML::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3389 3465
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3391 3467
3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3393 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3397 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3398 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3399 }; 3475 };
3400 warn $@ if $@; 3476 warn $@ if $@;
3401 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3402} 3480}
3403 3481
3404sub pidfile() { 3482sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!"; 3484 or die "$PIDFILE: $!";
… …
3454 }; 3532 };
3455 3533
3456 evthread_start IO::AIO::poll_fileno; 3534 evthread_start IO::AIO::poll_fileno;
3457 3535
3458 cf::sync_job { 3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3459 reload_resources; 3540 reload_resources;
3460 reload_config; 3541 reload_config;
3461 db_init; 3542 db_init;
3462 3543
3463 cf::load_settings;
3464 cf::load_materials;
3465 cf::init_uuid; 3544 cf::init_uuid;
3466 cf::init_signals; 3545 cf::init_signals;
3467 cf::init_commands; 3546 cf::init_commands;
3468 cf::init_skills; 3547 cf::init_skills;
3469 3548
… …
3497 }; 3576 };
3498 } 3577 }
3499} 3578}
3500 3579
3501sub write_runtime_sync { 3580sub write_runtime_sync {
3581 my $t0 = EV::time;
3582
3502 # first touch the runtime file to show we are still running: 3583 # first touch the runtime file to show we are still running:
3503 # the fsync below can take a very very long time. 3584 # the fsync below can take a very very long time.
3504 3585
3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3506 3587
3507 my $guard = cf::lock_acquire "write_runtime"; 3588 my $guard = cf::lock_acquire "write_runtime";
3508 3589
3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3590 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3510 or return; 3591 or return;
3511 3592
3512 my $value = $cf::RUNTIME + 90 + 10; 3593 my $value = $cf::RUNTIME + 90 + 10;
3513 # 10 is the runtime save interval, for a monotonic clock 3594 # 10 is the runtime save interval, for a monotonic clock
3514 # 60 allows for the watchdog to kill the server. 3595 # 60 allows for the watchdog to kill the server.
… …
3527 or return; 3608 or return;
3528 3609
3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3530 and return; 3611 and return;
3531 3612
3532 warn "runtime file written.\n"; 3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3533 3614
3534 1 3615 1
3535} 3616}
3536 3617
3537our $uuid_lock; 3618our $uuid_lock;
… …
3756 3837
3757 warn "unload completed, starting to reload now"; 3838 warn "unload completed, starting to reload now";
3758 3839
3759 warn "reloading cf.pm"; 3840 warn "reloading cf.pm";
3760 require cf; 3841 require cf;
3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3842 cf::_connect_to_perl_1;
3762 3843
3763 warn "loading config and database again"; 3844 warn "loading config and database again";
3764 cf::reload_config; 3845 cf::reload_config;
3765 3846
3766 warn "loading extensions"; 3847 warn "loading extensions";
… …
3828 3909
3829our @WAIT_FOR_TICK; 3910our @WAIT_FOR_TICK;
3830our @WAIT_FOR_TICK_BEGIN; 3911our @WAIT_FOR_TICK_BEGIN;
3831 3912
3832sub wait_for_tick { 3913sub wait_for_tick {
3833 return if tick_inhibit || $Coro::current == $Coro::main; 3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3834 3915
3835 my $signal = new Coro::Signal; 3916 my $signal = new Coro::Signal;
3836 push @WAIT_FOR_TICK, $signal; 3917 push @WAIT_FOR_TICK, $signal;
3837 $signal->wait; 3918 $signal->wait;
3838} 3919}
3839 3920
3840sub wait_for_tick_begin { 3921sub wait_for_tick_begin {
3841 return if tick_inhibit || $Coro::current == $Coro::main; 3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3842 3923
3843 my $signal = new Coro::Signal; 3924 my $signal = new Coro::Signal;
3844 push @WAIT_FOR_TICK_BEGIN, $signal; 3925 push @WAIT_FOR_TICK_BEGIN, $signal;
3845 $signal->wait; 3926 $signal->wait;
3846} 3927}
… …
3851 unless ++$bug_warning > 10; 3932 unless ++$bug_warning > 10;
3852 return; 3933 return;
3853 } 3934 }
3854 3935
3855 cf::server_tick; # one server iteration 3936 cf::server_tick; # one server iteration
3937
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3856 3939
3857 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3940 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3858 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3859 Coro::async_pool { 3942 Coro::async_pool {
3860 $Coro::current->{desc} = "runtime saver"; 3943 $Coro::current->{desc} = "runtime saver";
… …
3883} 3966}
3884 3967
3885{ 3968{
3886 # configure BDB 3969 # configure BDB
3887 3970
3888 BDB::min_parallel 8; 3971 BDB::min_parallel 16;
3889 BDB::max_poll_reqs $TICK * 0.1; 3972 BDB::max_poll_reqs $TICK * 0.1;
3890 $AnyEvent::BDB::WATCHER->priority (1); 3973 $AnyEvent::BDB::WATCHER->priority (1);
3891 3974
3892 unless ($DB_ENV) { 3975 unless ($DB_ENV) {
3893 $DB_ENV = BDB::db_env_create; 3976 $DB_ENV = BDB::db_env_create;
… …
3974 } 4057 }
3975} 4058}
3976 4059
3977# load additional modules 4060# load additional modules
3978require "cf/$_.pm" for @EXTRA_MODULES; 4061require "cf/$_.pm" for @EXTRA_MODULES;
4062cf::_connect_to_perl_2;
3979 4063
3980END { cf::emergency_save } 4064END { cf::emergency_save }
3981 4065
39821 40661
3983 4067

Diff Legend

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