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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.299 by root, Sun Jul 8 14:56:05 2007 UTC

 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
 #      or die "socketpair: $!";
       return wantarray ? @$res : $res->[-1];
    } else {
       reset_signals;
       local $SIG{__WARN__};
       local $SIG{__DIE__};
+      # 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 {
          close $fh1;
          my @res = eval { $cb->(@args) };
-         open my $fh, ">", \my $buf
+         syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
-               or die "fork_call: cannot open fh-to-buf in child : $!";
-         Storable::store_fd +($@ ? \"$@" : \@res), $fh;
-         close $fh;
-         warn "writing ", length $buf;
-         my $x;
-         (length $buf) == ($x = syswrite $fh2, $buf)
-            or warn "error writing ".(length $buf)." != $x\n";
          close $fh2;
       };
       warn $@ if $@;
       _exit 0;

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