[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.337 by root, Tue Aug 21 00:54:01 2007 UTC

 use Event;
 use Opcode;
 use Safe;
 use Safe::Hole;
-use Coro 3.61 ();
+use Coro 3.64 ();
 use Coro::State;
 use Coro::Handle;
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
 use Coro::Semaphore;
 use Coro::AIO;
 use Coro::Storable;
+use Coro::Util ();
 use JSON::XS 1.4 ();
 use BDB ();
 use Data::Dumper;
 use Digest::MD5;
 Coro::Storable. May, of course, block. Note that the executed sub may
 never block itself or use any form of Event handling.
 =cut
-sub _store_scalar {
-   open my $fh, ">", \my $buf
-         or die "fork_call: cannot open fh-to-buf in child : $!";
-      Storable::store_fd $_[0], $fh;
-   close $fh;
-   $buf
-}
 sub fork_call(&@) {
    my ($cb, @args) = @_;
-#   socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
+   # we seemingly have to make a local copy of the whole thing,
-#      or die "socketpair: $!";
+   # otherwise perl prematurely frees the stuff :/
-   pipe my $fh1, my $fh2
+   # TODO: investigate and fix (liekly this will be rather laborious)
-      or die "pipe: $!";
-   if (my $pid = fork) {
+   my @res = Coro::Util::fork_eval {
-      close $fh2;
-      my $res = (Coro::Handle::unblock $fh1)->readline (undef);
-      warn "pst<$res>" unless $res =~ /^pst/;
-      $res = Coro::Storable::thaw $res;
-      waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
-      Carp::confess $$res unless "ARRAY" eq ref $res;
-      return wantarray ? @$res : $res->[-1];
-   } else {
       reset_signals;
-      local $SIG{__WARN__};
+      &$cb
-      local $SIG{__DIE__};
+   }, @args;
-      # just in case, this hack effectively disables event
-      # in the child. cleaner and slower would be canceling all watchers,
-      # but this works for the time being.
-      local $Coro::idle;
-      $Coro::current->prio (Coro::PRIO_MAX);
-      eval {
+   wantarray ? @res : $res[-1]
-         close $fh1;
-         my @res = eval { $cb->(@args) };
-         syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
-         close $fh2;
-      };
-      warn $@ if $@;
-      _exit 0;
-   }
 }
 =item $value = cf::db_get $family => $key
 Returns a single value from the environment database.
 =cut
 sub ext_reply($$@) {
    my ($self, $id, @msg) = @_;
-   if ($self->ns->extcmd == 2) {
+   $self->ns->ext_reply ($id, @msg)
-      $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
-   } elsif ($self->ns->extcmd == 1) {
-      #TODO: version 1, remove
-      unshift @msg, msgtype => "reply", msgid => $id;
-      $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
-   }
 }
 =item $player->ext_msg ($type, @msg)
 Sends an ext event to the client.
    $self
 }
 # find and load all maps in the 3x3 area around a map
-sub load_diag {
+sub load_neighbours {
    my ($map) = @_;
-   my @diag; # diagonal neighbours
+   my @neigh; # diagonal neighbours
    for (0 .. 3) {
       my $neigh = $map->tile_path ($_)
          or next;
       $neigh = find $neigh, $map
          or next;
       $neigh->load;
+      push @neigh,
-      push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
+         [$neigh->tile_path (($_ + 3) % 4), $neigh],
-                  [$neigh->tile_path (($_ + 1) % 4), $neigh];
+         [$neigh->tile_path (($_ + 1) % 4), $neigh];
    }
-   for (@diag) {
+   for (grep defined $_->[0], @neigh) {
+      my ($path, $origin) = @$_;
-      my $neigh = find @$_
+      my $neigh = find $path, $origin
          or next;
       $neigh->load;
    }
 }
    # use -1 or undef as default coordinates, not 0, 0
    ($x, $y) = ($map->enter_x, $map->enter_y)
       if $x <=0 && $y <= 0;
    $map->load;
-   $map->load_diag;
+   $map->load_neighbours;
    return unless $self->contr->active;
    $self->activate_recursive;
    local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
       push @msg, msgtype => "event_$type";
       $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
    }
 }
+=item $client->ext_reply ($msgid, @msg)
+Sends an ext reply to the client.
+=cut
+sub cf::client::ext_reply($$@) {
+   my ($self, $id, @msg) = @_;
+   if ($self->extcmd == 2) {
+      $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
+   } elsif ($self->ns->extcmd == 1) {
+      #TODO: version 1, remove
+      unshift @msg, msgtype => "reply", msgid => $id;
+      $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
+   }
+}
 =item $success = $client->query ($flags, "text", \&cb)
 Queues a query to the client, calling the given callback with
 the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
 C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
 # the server's init and main functions
 sub load_facedata($) {
    my ($path) = @_;
+   my $enc = JSON::XS->new->utf8->canonical;
    warn "loading facedata from $path\n";
    my $facedata;
    0 < aio_load $path, $facedata
       or die "$path: $!";
    $facedata = Coro::Storable::thaw $facedata;
    $facedata->{version} == 2
       or cf::cleanup "$path: version mismatch, cannot proceed.";
+   # patch in the exptable
+   $facedata->{resource}{"res/exp_table"} = {
+      type => FT_RSRC,
+      data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
+   };
+   cf::cede_to_tick;
    {
       my $faces = $facedata->{faceinfo};
       while (my ($face, $info) = each %$faces) {
          my $idx = (cf::face::find $face) || cf::face::alloc $face;
          cf::face::set_visibility $idx, $info->{visibility};
          cf::face::set_magicmap   $idx, $info->{magicmap};
-         cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
+         cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
-         cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
+         cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
          cf::cede_to_tick;
       }
       while (my ($face, $info) = each %$faces) {
    {
       # TODO: for gcfclient pleasure, we should give resources
       # that gcfclient doesn't grok a >10000 face index.
       my $res = $facedata->{resource};
-      my $enc = JSON::XS->new->utf8->canonical;
       my $soundconf = delete $res->{"res/sound.conf"};
       while (my ($name, $info) = each %$res) {
-         my $meta = $enc->encode ({
-            name => $name,
-            %{ $info->{meta} || {} },
-         });
          my $idx = (cf::face::find $name) || cf::face::alloc $name;
+         my $data;
          if ($info->{type} & 1) {
             # prepend meta info
+            my $meta = $enc->encode ({
+               name => $name,
+               %{ $info->{meta} || {} },
+            });
-            my $data = pack "(w/a*)*", $meta, $info->{data};
+            $data = pack "(w/a*)*", $meta, $info->{data};
-            my $chk  = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
-            cf::face::set_data $idx, 0, $data, $chk;
          } else {
-            cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
+            $data = $info->{data};
          }
+         cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
          cf::face::set_type $idx, $info->{type};
          cf::cede_to_tick;
       }

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.331 by root, Mon Aug 13 13:10:01 2007 UTC vs. Revision 1.337 by root, Tue Aug 21 00:54:01 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.337 by root, Tue Aug 21 00:54:01 2007 UTC