| 456 |
|
nadd = MAX_NPROCS - ray_pnprocs; |
| 457 |
|
if (nadd <= 0) |
| 458 |
|
return; |
| 459 |
+ |
if (nobjects <= 0) |
| 460 |
+ |
error(CONSISTENCY, "ray_popen() called before scene loaded"); |
| 461 |
|
ambsync(); /* load any new ambient values */ |
| 462 |
|
if (shm_boundary == NULL) { /* first child process? */ |
| 463 |
|
preload_objs(); /* preload auxiliary data */ |
| 522 |
|
/* check argument */ |
| 523 |
|
if ((nsub <= 0) | (nsub > ray_pnprocs)) |
| 524 |
|
nsub = ray_pnprocs; |
| 525 |
< |
i = 0; /* clear our ray queue */ |
| 525 |
> |
/* clear our ray queue */ |
| 526 |
> |
i = r_send_next; |
| 527 |
> |
r_send_next = 0; |
| 528 |
|
while (ray_presult(&res,0) > 0) |
| 529 |
|
++i; |
| 530 |
|
if (i) { |
| 531 |
< |
sprintf(errmsg, "dropped %d ray results in ray_pclose()", i); |
| 531 |
> |
sprintf(errmsg, "dropped %d rays in ray_pclose()", i); |
| 532 |
|
error(WARNING, errmsg); |
| 533 |
|
} |
| 530 |
– |
r_send_next = 0; /* hard reset in case of error */ |
| 534 |
|
r_recv_first = r_recv_next = RAYQLEN; |
| 535 |
|
/* close send pipes */ |
| 536 |
|
for (i = ray_pnprocs-nsub; i < ray_pnprocs; i++) |
| 544 |
|
for (i = 0; i < nsub; ) { |
| 545 |
|
int j, mystatus; |
| 546 |
|
RT_PID pid = wait(&mystatus); |
| 547 |
+ |
if (pid < 0) { |
| 548 |
+ |
status = 127<<8; |
| 549 |
+ |
break; |
| 550 |
+ |
} |
| 551 |
|
for (j = ray_pnprocs-nsub; j < ray_pnprocs; j++) |
| 552 |
|
if (r_proc[j].pid == pid) { |
| 553 |
|
if (mystatus) |
