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.338 by root, Tue Aug 21 01:07:47 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
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2311 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2312 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2313 if $x <=0 && $y <= 0;
2352 2314
2353 $map->load; 2315 $map->load;
2354 $map->load_diag; 2316 $map->load_neighbours;
2355 2317
2356 return unless $self->contr->active; 2318 return unless $self->contr->active;
2357 $self->activate_recursive; 2319 $self->activate_recursive;
2358 2320
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2321 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2573 $color &= cf::NDI_COLOR_MASK; 2535 $color &= cf::NDI_COLOR_MASK;
2574 2536
2575 utf8::encode $msg; 2537 utf8::encode $msg;
2576 2538
2577 if (0 && $msg =~ /\[/) { 2539 if (0 && $msg =~ /\[/) {
2540 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2541 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2542 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2543 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2544 $self->send_packet ("drawinfo $color $msg")
2582 } 2545 }
2583 } 2546 }
… …
2597 2560
2598 if ($extcmd == 2) { 2561 if ($extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2563 } elsif ($extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2564 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 }
2567}
2568
2569=item $client->ext_reply ($msgid, @msg)
2570
2571Sends an ext reply to the client.
2572
2573=cut
2574
2575sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_;
2577
2578 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) {
2581 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2584 }
2604} 2585}
2605 2586
2606=item $success = $client->query ($flags, "text", \&cb) 2587=item $success = $client->query ($flags, "text", \&cb)
… …
2668 my ($type, $reply, @payload) = 2649 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2650 "ARRAY" eq ref $msg
2670 ? @$msg 2651 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2652 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2653
2654 my @reply;
2655
2673 if (my $cb = $EXTICMD{$type}) { 2656 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2657 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 2658 }
2659
2660 $ns->ext_reply ($reply, @reply)
2661 if $reply;
2662
2679 } else { 2663 } else {
2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2664 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681 } 2665 }
2682 2666
2683 cf::override; 2667 cf::override;
… …
2845# the server's init and main functions 2829# the server's init and main functions
2846 2830
2847sub load_facedata($) { 2831sub load_facedata($) {
2848 my ($path) = @_; 2832 my ($path) = @_;
2849 2833
2834 my $enc = JSON::XS->new->utf8->canonical;
2835
2850 warn "loading facedata from $path\n"; 2836 warn "loading facedata from $path\n";
2851 2837
2852 my $facedata; 2838 my $facedata;
2853 0 < aio_load $path, $facedata 2839 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 2840 or die "$path: $!";
2855 2841
2856 $facedata = Coro::Storable::thaw $facedata; 2842 $facedata = Coro::Storable::thaw $facedata;
2857 2843
2858 $facedata->{version} == 2 2844 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 2845 or cf::cleanup "$path: version mismatch, cannot proceed.";
2846
2847 # patch in the exptable
2848 $facedata->{resource}{"res/exp_table"} = {
2849 type => FT_RSRC,
2850 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2851 };
2852 cf::cede_to_tick;
2860 2853
2861 { 2854 {
2862 my $faces = $facedata->{faceinfo}; 2855 my $faces = $facedata->{faceinfo};
2863 2856
2864 while (my ($face, $info) = each %$faces) { 2857 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2858 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2866 cf::face::set_visibility $idx, $info->{visibility}; 2859 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 2860 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2861 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2862 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 2863
2871 cf::cede_to_tick; 2864 cf::cede_to_tick;
2872 } 2865 }
2873 2866
2874 while (my ($face, $info) = each %$faces) { 2867 while (my ($face, $info) = each %$faces) {
… …
2899 2892
2900 { 2893 {
2901 # TODO: for gcfclient pleasure, we should give resources 2894 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 2895 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 2896 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905 2897
2906 my $soundconf = delete $res->{"res/sound.conf"}; 2898 my $soundconf = delete $res->{"res/sound.conf"};
2907 2899
2908 while (my ($name, $info) = each %$res) { 2900 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; 2901 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2902 my $data;
2915 2903
2916 if ($info->{type} & 1) { 2904 if ($info->{type} & 1) {
2917 # prepend meta info 2905 # prepend meta info
2918 2906
2907 my $meta = $enc->encode ({
2908 name => $name,
2909 %{ $info->{meta} || {} },
2910 });
2911
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 2912 $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 { 2913 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2914 $data = $info->{data};
2925 } 2915 }
2926 2916
2917 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2927 cf::face::set_type $idx, $info->{type}; 2918 cf::face::set_type $idx, $info->{type};
2928 2919
2929 cf::cede_to_tick; 2920 cf::cede_to_tick;
2930 } 2921 }
2931 2922

Diff Legend

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