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

Comparing ray/src/rt/pmap.c (file contents):
Revision 2.1 by greg, Tue Feb 24 19:39:26 2015 UTC vs.
Revision 2.3 by rschregle, Wed Apr 22 20:28:16 2015 UTC

# Line 20 | Line 20
20   #include "pmapbias.h"
21   #include "pmapdiag.h"
22   #include "otypes.h"
23 – #include <signal.h>
23   #include <time.h>
24   #include <sys/stat.h>
25  
# Line 264 | Line 263 | static void preComputeGlobal (PhotonMap *pmap)
263    
264     /* Record start time, baby */
265     repStartTime = time(NULL);
266 <   signal(SIGCONT, pmapPreCompReport);
266 >   #ifdef SIGCONT
267 >      signal(SIGCONT, pmapPreCompReport);
268 >   #endif
269     repProgress = 0;
270 <   bcopy(pmap -> heap, nuHeap, nuHeapSize * sizeof(Photon));
270 >   memcpy(nuHeap, pmap -> heap, nuHeapSize * sizeof(Photon));
271    
272     for (i = 0, p = nuHeap; i < nuHeapSize; i++, p++) {
273        ray.ro = NULL;
# Line 285 | Line 286 | static void preComputeGlobal (PhotonMap *pmap)
286        
287        if (photonRepTime > 0 && time(NULL) >= repLastTime + photonRepTime)
288           pmapPreCompReport();
289 < #ifndef BSD
290 <      else signal(SIGCONT, pmapPreCompReport);
291 < #endif
289 >      #ifdef SIGCONT
290 >         else signal(SIGCONT, pmapPreCompReport);
291 >      #endif
292     }
293    
294 <   signal(SIGCONT, SIG_DFL);
294 >   #ifdef SIGCONT  
295 >      signal(SIGCONT, SIG_DFL);
296 >   #endif
297    
298     /* Replace & rebuild heap */
299     free(pmap -> heap);
# Line 401 | Line 404 | void distribPhotons (PhotonMap **pmaps)
404  
405     /* Record start time and enable progress report signal handler */
406     repStartTime = time(NULL);
407 <   signal(SIGCONT, pmapDistribReport);
407 >   #ifdef SIGCONT
408 >      signal(SIGCONT, pmapDistribReport);
409 >   #endif
410     repProgress = prePassCnt = 0;
411    
412     if (photonRepTime)
# Line 561 | Line 566 | void distribPhotons (PhotonMap **pmaps)
566                    if (photonRepTime > 0 &&
567                        time(NULL) >= repLastTime + photonRepTime)
568                       pmapDistribReport();
569 <                  #ifndef BSD
569 >                  #ifdef SIGCONT
570                       else signal(SIGCONT, pmapDistribReport);
571                    #endif
572                 }
# Line 591 | Line 596 | void distribPhotons (PhotonMap **pmaps)
596     /* ===================================================================
597      * POST-DISTRIBUTION - Set photon flux and build kd-tree, etc.
598      * =================================================================== */
599 <   signal(SIGCONT, SIG_DFL);
599 >   #ifdef SIGCONT    
600 >      signal(SIGCONT, SIG_DFL);
601 >   #endif
602     free(emap.samples);
603    
604     /* Set photon flux (repProgress is total num emitted) */

Diff Legend

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