| 88 |
|
* ray_psend(&myRay); |
| 89 |
|
* } |
| 90 |
|
* |
| 91 |
< |
* Note that it is a fatal error to call ra_psend() when |
| 92 |
< |
* ray_pnidle is zero. The ray_presult() and/or ray_pqueue() |
| 93 |
< |
* functions may be called subsequently to read back the results. |
| 91 |
> |
* Note that it is a mistake to call ra_psend() when |
| 92 |
> |
* ray_pnidle is zero, and nothing will be sent in |
| 93 |
> |
* this case. Otherwise, the ray_presult() and/or ray_pqueue() |
| 94 |
> |
* functions may be called subsequently to read back the results |
| 95 |
> |
* of rays queued by ray_psend(). |
| 96 |
|
* |
| 97 |
|
* When you are done, you may call ray_pdone(1) to close |
| 98 |
|
* all child processes and clean up memory used by Radiance. |
| 226 |
|
ray_pnidle--; /* now she's busy */ |
| 227 |
|
} |
| 228 |
|
if (sfirst != r_send_next) |
| 229 |
< |
error(CONSISTENCY, "code screwup in ray_pflush"); |
| 229 |
> |
error(CONSISTENCY, "code screwup in ray_pflush()"); |
| 230 |
|
r_send_next = 0; |
| 231 |
|
return(sfirst); /* return total # sent */ |
| 232 |
|
} |
| 233 |
|
|
| 234 |
|
|
| 235 |
< |
void |
| 235 |
> |
int |
| 236 |
|
ray_psend( /* add a ray to our send queue */ |
| 237 |
|
RAY *r |
| 238 |
|
) |
| 239 |
|
{ |
| 240 |
< |
if (r == NULL) |
| 241 |
< |
return; |
| 240 |
> |
int rv; |
| 241 |
> |
|
| 242 |
> |
if ((r == NULL) | (ray_pnidle <= 0)) |
| 243 |
> |
return(0); |
| 244 |
|
/* flush output if necessary */ |
| 245 |
< |
if (sendq_full() && ray_pflush() <= 0) |
| 246 |
< |
error(INTERNAL, "ray_pflush failed in ray_psend"); |
| 245 |
> |
if (sendq_full() && (rv = ray_pflush()) <= 0) |
| 246 |
> |
return(rv); |
| 247 |
|
|
| 248 |
|
r_queue[r_send_next++] = *r; |
| 249 |
+ |
return(1); |
| 250 |
|
} |
| 251 |
|
|
| 252 |
|
|
| 265 |
|
return(-1); |
| 266 |
|
/* put new ray in queue */ |
| 267 |
|
r_queue[r_send_next++] = mySend; |
| 268 |
< |
/* XXX r_send_next may now be > RAYQLEN */ |
| 268 |
> |
|
| 269 |
|
return(1); |
| 270 |
|
} |
| 271 |
|
/* else add ray to send queue */ |
| 334 |
|
poll ? &tpoll : (struct timeval *)NULL)) < 0) |
| 335 |
|
if (errno != EINTR) { |
| 336 |
|
error(WARNING, |
| 337 |
< |
"select call failed in ray_presult"); |
| 337 |
> |
"select call failed in ray_presult()"); |
| 338 |
|
ray_pclose(0); |
| 339 |
|
return(-1); |
| 340 |
|
} |
| 413 |
|
/* get smuggled set length */ |
| 414 |
|
n2 = sizeof(RAY)*r_queue[0].crtype - n; |
| 415 |
|
if (n2 < 0) |
| 416 |
< |
error(INTERNAL, "buffer over-read in ray_pchild"); |
| 416 |
> |
error(INTERNAL, "buffer over-read in ray_pchild()"); |
| 417 |
|
if (n2 > 0) { /* read the rest of the set */ |
| 418 |
|
i = readbuf(fd_in, (char *)r_queue + n, n2); |
| 419 |
|
if (i != n2) |
| 435 |
|
/* write back our results */ |
| 436 |
|
i = writebuf(fd_out, (char *)r_queue, sizeof(RAY)*n); |
| 437 |
|
if (i != sizeof(RAY)*n) |
| 438 |
< |
error(SYSTEM, "write error in ray_pchild"); |
| 438 |
> |
error(SYSTEM, "write error in ray_pchild()"); |
| 439 |
|
} |
| 440 |
|
if (n) |
| 441 |
< |
error(SYSTEM, "read error in ray_pchild"); |
| 441 |
> |
error(SYSTEM, "read error in ray_pchild()"); |
| 442 |
|
ambsync(); |
| 443 |
|
quit(0); /* normal exit */ |
| 444 |
|
} |
| 473 |
|
close(r_proc[pn].fd_recv); |
| 474 |
|
} |
| 475 |
|
close(p0[0]); close(p1[1]); |
| 476 |
+ |
close(0); /* don't share stdin */ |
| 477 |
|
/* following call never returns */ |
| 478 |
|
ray_pchild(p1[0], p0[1]); |
| 479 |
|
} |
| 518 |
|
while (nsub--) { |
| 519 |
|
int status; |
| 520 |
|
ray_pnprocs--; |
| 515 |
– |
close(r_proc[ray_pnprocs].fd_recv); |
| 521 |
|
close(r_proc[ray_pnprocs].fd_send); |
| 522 |
|
if (waitpid(r_proc[ray_pnprocs].pid, &status, 0) < 0) |
| 523 |
|
status = 127<<8; |
| 524 |
+ |
close(r_proc[ray_pnprocs].fd_recv); |
| 525 |
|
if (status) { |
| 526 |
|
sprintf(errmsg, |
| 527 |
|
"rendering process %d exited with code %d", |
