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.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.342 by root, Sun Aug 26 15:31:02 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS 1.4 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
474 475
475=cut 476=cut
476 477
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 478sub fork_call(&@) {
487 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
488 480
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
492 or die "pipe: $!";
493 484
494 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 486 reset_signals;
508 local $SIG{__WARN__}; 487 &$cb
509 local $SIG{__DIE__}; 488 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 489
516 eval { 490 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 491}
529 492
530=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
531 494
532Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
1186 my ($type, $reply, @payload) = 1149 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1150 "ARRAY" eq ref $msg
1188 ? @$msg 1151 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1153
1154 my @reply;
1155
1191 if (my $cb = $EXTCMD{$type}) { 1156 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1157 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1197 } else { 1163 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1165 }
1200 1166
1201 cf::override; 1167 cf::override;
… …
1542=cut 1508=cut
1543 1509
1544sub ext_reply($$@) { 1510sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1511 my ($self, $id, @msg) = @_;
1546 1512
1547 if ($self->ns->extcmd == 2) { 1513 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1514}
1555 1515
1556=item $player->ext_msg ($type, @msg) 1516=item $player->ext_msg ($type, @msg)
1557 1517
1558Sends an ext event to the client. 1518Sends an ext event to the client.
… …
1953 1913
1954 $self 1914 $self
1955} 1915}
1956 1916
1957# find and load all maps in the 3x3 area around a map 1917# find and load all maps in the 3x3 area around a map
1958sub load_diag { 1918sub load_neighbours {
1959 my ($map) = @_; 1919 my ($map) = @_;
1960 1920
1961 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1962 1922
1963 for (0 .. 3) { 1923 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1965 or next; 1925 or next;
1966 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1967 or next; 1927 or next;
1968 $neigh->load; 1928 $neigh->load;
1969 1929
1930 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 1933 }
1973 1934
1974 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1976 or next; 1938 or next;
1977 $neigh->load; 1939 $neigh->load;
1978 } 1940 }
1979} 1941}
1980 1942
… …
1985} 1947}
1986 1948
1987sub do_load_sync { 1949sub do_load_sync {
1988 my ($map) = @_; 1950 my ($map) = @_;
1989 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1990 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1991} 1956}
1992 1957
1993our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1995 1960
1996sub find_async { 1961sub find_async {
1997 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1998 1963
1999 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
2000 1965
2001 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 1968 }
2004 1969
2005 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
2006 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
2007 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 1975 if (my $map = find $k) {
2010 $map->load; 1976 $map->load if $v;
2011 } 1977 }
2012 1978
2013 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
2014 } 1980 }
2015 } 1981 }
2016 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
2017 }; 1983 };
2018 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2315 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2316 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2317 if $x <=0 && $y <= 0;
2352 2318
2353 $map->load; 2319 $map->load;
2354 $map->load_diag; 2320 $map->load_neighbours;
2355 2321
2356 return unless $self->contr->active; 2322 return unless $self->contr->active;
2357 $self->activate_recursive; 2323 $self->activate_recursive;
2358 2324
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2602 push @msg, msgtype => "event_$type"; 2568 push @msg, msgtype => "event_$type";
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2570 }
2605} 2571}
2606 2572
2573=item $client->ext_reply ($msgid, @msg)
2574
2575Sends an ext reply to the client.
2576
2577=cut
2578
2579sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_;
2581
2582 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) {
2585 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 }
2589}
2590
2607=item $success = $client->query ($flags, "text", \&cb) 2591=item $success = $client->query ($flags, "text", \&cb)
2608 2592
2609Queues a query to the client, calling the given callback with 2593Queues a query to the client, calling the given callback with
2610the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2594the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2611C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2595C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
… …
2669 my ($type, $reply, @payload) = 2653 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2654 "ARRAY" eq ref $msg
2671 ? @$msg 2655 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2656 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2657
2658 my @reply;
2659
2674 if (my $cb = $EXTICMD{$type}) { 2660 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2661 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2662 }
2663
2664 $ns->ext_reply ($reply, @reply)
2665 if $reply;
2666
2680 } else { 2667 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2668 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 2669 }
2683 2670
2684 cf::override; 2671 cf::override;
… …
2745 2732
2746The following functions and methods are available within a safe environment: 2733The following functions and methods are available within a safe environment:
2747 2734
2748 cf::object 2735 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 2736 contr pay_amount pay_player map x y force_find force_add
2750 insert remove name archname title slaying race 2737 insert remove name archname title slaying race decrease_ob_nr
2751 2738
2752 cf::object::player 2739 cf::object::player
2753 player 2740 player
2754 2741
2755 cf::player 2742 cf::player
… …
2760 2747
2761=cut 2748=cut
2762 2749
2763for ( 2750for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 2752 insert remove inv name archname title slaying race
2753 decrease_ob_nr)],
2766 ["cf::object::player" => qw(player)], 2754 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 2755 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 2756 ["cf::map" => qw(trigger)],
2769) { 2757) {
2770 no strict 'refs'; 2758 no strict 'refs';
… …
2846# the server's init and main functions 2834# the server's init and main functions
2847 2835
2848sub load_facedata($) { 2836sub load_facedata($) {
2849 my ($path) = @_; 2837 my ($path) = @_;
2850 2838
2839 my $enc = JSON::XS->new->utf8->canonical;
2840
2851 warn "loading facedata from $path\n"; 2841 warn "loading facedata from $path\n";
2852 2842
2853 my $facedata; 2843 my $facedata;
2854 0 < aio_load $path, $facedata 2844 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 2845 or die "$path: $!";
2856 2846
2857 $facedata = Coro::Storable::thaw $facedata; 2847 $facedata = Coro::Storable::thaw $facedata;
2858 2848
2859 $facedata->{version} == 2 2849 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 2850 or cf::cleanup "$path: version mismatch, cannot proceed.";
2851
2852 # patch in the exptable
2853 $facedata->{resource}{"res/exp_table"} = {
2854 type => FT_RSRC,
2855 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2856 };
2857 cf::cede_to_tick;
2861 2858
2862 { 2859 {
2863 my $faces = $facedata->{faceinfo}; 2860 my $faces = $facedata->{faceinfo};
2864 2861
2865 while (my ($face, $info) = each %$faces) { 2862 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2863 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2867 cf::face::set_visibility $idx, $info->{visibility}; 2864 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 2865 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2866 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2867 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 2868
2872 cf::cede_to_tick; 2869 cf::cede_to_tick;
2873 } 2870 }
2874 2871
2875 while (my ($face, $info) = each %$faces) { 2872 while (my ($face, $info) = each %$faces) {
… …
2900 2897
2901 { 2898 {
2902 # TODO: for gcfclient pleasure, we should give resources 2899 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 2900 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 2901 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906 2902
2907 my $soundconf = delete $res->{"res/sound.conf"}; 2903 my $soundconf = delete $res->{"res/sound.conf"};
2908 2904
2909 while (my ($name, $info) = each %$res) { 2905 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2906 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2907 my $data;
2916 2908
2917 if ($info->{type} & 1) { 2909 if ($info->{type} & 1) {
2918 # prepend meta info 2910 # prepend meta info
2919 2911
2912 my $meta = $enc->encode ({
2913 name => $name,
2914 %{ $info->{meta} || {} },
2915 });
2916
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 2917 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else { 2918 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2919 $data = $info->{data};
2926 } 2920 }
2927 2921
2922 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2928 cf::face::set_type $idx, $info->{type}; 2923 cf::face::set_type $idx, $info->{type};
2929 2924
2930 cf::cede_to_tick; 2925 cf::cede_to_tick;
2931 } 2926 }
2932 2927

Diff Legend

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