ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rc3.c
(Generate patch)

Comparing ray/src/rt/rc3.c (file contents):
Revision 2.10 by greg, Sat Jun 16 17:09:49 2012 UTC vs.
Revision 2.16 by greg, Fri Jun 22 21:58:45 2012 UTC

# Line 6 | Line 6 | static const char RCSid[] = "$Id$";
6   * Controlling process for multiple children
7   */
8  
9 + #include <signal.h>
10   #include "rcontrib.h"
10 #include "platform.h"
11 #include "rtprocess.h"
11   #include "selcall.h"
12  
13   #define MAXIQ           (int)(PIPE_BUF/(sizeof(FVECT)*2))
# Line 315 | Line 314 | in_rchild()
314  
315   /* Close child processes */
316   void
317 < end_children()
317 > end_children(int immed)
318   {
319          int     status;
320          
321          while (nchild > 0) {
322                  nchild--;
323 <                if ((status = close_process(&kida[nchild].pr)) > 0) {
323 > #ifdef SIGKILL
324 >                if (immed)              /* error mode -- quick exit */
325 >                        kill(kida[nchild].pr.pid, SIGKILL);
326 > #endif
327 >                if ((status = close_process(&kida[nchild].pr)) > 0 && !immed) {
328                          sprintf(errmsg,
329                                  "rendering process returned bad status (%d)",
330                                          status);
# Line 462 | Line 465 | static int
465   next_child_ready()
466   {
467          fd_set                  writeset, errset;
468 <        int                     i, n, nqr;
468 >        int                     i, n;
469  
470          for (i = nchild; i--; )         /* see if there's one free first */
471                  if (!kida[i].nr)
# Line 537 | Line 540 | feeder_loop()
540                  lastray += kida[i].nr = ninq;
541                  ninq = 0;
542          }
543 <        for (i = nchild; i--; ) {               /* get results */
544 <                close(kida[i].pr.w);
543 >        memset(orgdir, 0, sizeof(FVECT)*2);     /* get results */
544 >        for (i = nchild; i--; ) {
545 >                writebuf(kida[i].pr.w, (char *)orgdir, sizeof(FVECT)*2);
546                  queue_results(i);
547          }
548          if (recover)                            /* and from before? */
549                  queue_modifiers();
550 <        end_children();                         /* free up file descriptors */
550 >        end_children(0);                        /* free up file descriptors */
551          for (i = 0; i < nmods; i++)
552                  mod_output(out_bq->mca[i]);     /* output accumulated record */
553          end_record();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines