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.330 by elmex, Fri Aug 10 10:35:07 2007 UTC vs.
Revision 1.336 by root, Tue Aug 21 00:31:18 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.
… …
1542=cut 1505=cut
1543 1506
1544sub ext_reply($$@) { 1507sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1508 my ($self, $id, @msg) = @_;
1546 1509
1547 if ($self->ns->extcmd == 2) { 1510 $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} 1511}
1555 1512
1556=item $player->ext_msg ($type, @msg) 1513=item $player->ext_msg ($type, @msg)
1557 1514
1558Sends an ext event to the client. 1515Sends an ext event to the client.
… …
1953 1910
1954 $self 1911 $self
1955} 1912}
1956 1913
1957# find and load all maps in the 3x3 area around a map 1914# find and load all maps in the 3x3 area around a map
1958sub load_diag { 1915sub load_neighbours {
1959 my ($map) = @_; 1916 my ($map) = @_;
1960 1917
1961 my @diag; # diagonal neighbours 1918 my @neigh; # diagonal neighbours
1962 1919
1963 for (0 .. 3) { 1920 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1921 my $neigh = $map->tile_path ($_)
1965 or next; 1922 or next;
1966 $neigh = find $neigh, $map 1923 $neigh = find $neigh, $map
1967 or next; 1924 or next;
1968 $neigh->load; 1925 $neigh->load;
1969 1926
1927 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1928 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1929 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 1930 }
1973 1931
1974 for (@diag) { 1932 for (grep defined $_->[0], @neigh) {
1933 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 1934 my $neigh = find $path, $origin
1976 or next; 1935 or next;
1977 $neigh->load; 1936 $neigh->load;
1978 } 1937 }
1979} 1938}
1980 1939
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2308 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2309 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2310 if $x <=0 && $y <= 0;
2352 2311
2353 $map->load; 2312 $map->load;
2354 $map->load_diag; 2313 $map->load_neighbours;
2355 2314
2356 return unless $self->contr->active; 2315 return unless $self->contr->active;
2357 $self->activate_recursive; 2316 $self->activate_recursive;
2358 2317
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2573 $color &= cf::NDI_COLOR_MASK; 2532 $color &= cf::NDI_COLOR_MASK;
2574 2533
2575 utf8::encode $msg; 2534 utf8::encode $msg;
2576 2535
2577 if (0 && $msg =~ /\[/) { 2536 if (0 && $msg =~ /\[/) {
2537 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2539 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2541 $self->send_packet ("drawinfo $color $msg")
2582 } 2542 }
2583 } 2543 }
… …
2597 2557
2598 if ($extcmd == 2) { 2558 if ($extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2560 } elsif ($extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2561 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 }
2564}
2565
2566=item $client->ext_reply ($msgid, @msg)
2567
2568Sends an ext reply to the client.
2569
2570=cut
2571
2572sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_;
2574
2575 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) {
2578 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2581 }
2604} 2582}
2605 2583
2606=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
… …
2845# the server's init and main functions 2823# the server's init and main functions
2846 2824
2847sub load_facedata($) { 2825sub load_facedata($) {
2848 my ($path) = @_; 2826 my ($path) = @_;
2849 2827
2828 my $enc = JSON::XS->new->utf8->canonical;
2829
2850 warn "loading facedata from $path\n"; 2830 warn "loading facedata from $path\n";
2851 2831
2852 my $facedata; 2832 my $facedata;
2853 0 < aio_load $path, $facedata 2833 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 2834 or die "$path: $!";
2855 2835
2856 $facedata = Coro::Storable::thaw $facedata; 2836 $facedata = Coro::Storable::thaw $facedata;
2857 2837
2858 $facedata->{version} == 2 2838 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 2839 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840
2841 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2845 };
2846 cf::cede_to_tick;
2860 2847
2861 { 2848 {
2862 my $faces = $facedata->{faceinfo}; 2849 my $faces = $facedata->{faceinfo};
2863 2850
2864 while (my ($face, $info) = each %$faces) { 2851 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2852 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2866 cf::face::set_visibility $idx, $info->{visibility}; 2853 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 2854 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 2857
2871 cf::cede_to_tick; 2858 cf::cede_to_tick;
2872 } 2859 }
2873 2860
2874 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
… …
2899 2886
2900 { 2887 {
2901 # TODO: for gcfclient pleasure, we should give resources 2888 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 2889 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 2890 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905 2891
2906 my $soundconf = delete $res->{"res/sound.conf"}; 2892 my $soundconf = delete $res->{"res/sound.conf"};
2907 2893
2908 while (my ($name, $info) = each %$res) { 2894 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2895 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data;
2915 2897
2916 if ($info->{type} & 1) { 2898 if ($info->{type} & 1) {
2917 # prepend meta info 2899 # prepend meta info
2918 2900
2901 my $meta = $enc->encode ({
2902 name => $name,
2903 %{ $info->{meta} || {} },
2904 });
2905
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 2906 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2921
2922 cf::face::set_data $idx, 0, $data, $chk;
2923 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2925 } 2907 }
2926 2908
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2927 cf::face::set_type $idx, $info->{type}; 2910 cf::face::set_type $idx, $info->{type};
2928 2911
2929 cf::cede_to_tick; 2912 cf::cede_to_tick;
2930 } 2913 }
2931 2914

Diff Legend

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