Changeset 37307

Timestamp:

Aug 25, 2014, 10:47:37 AM (12 years ago)

Author:

eugene

Message:

add some verbosity re: timing

File:

• branches/eam_branches/ipp-20140813/Ohana/src/addstar/src/addstar.c (modified) (8 diffs)

branches/eam_branches/ipp-20140813/Ohana/src/addstar/src/addstar.c

@@ -1 +1 @@
 # include "addstar.h"
+
+# define RESETTIME { gettimeofday (&startTimer, (void *) NULL); }
 
 // LARGEFILES: this program currently limits Nstars (input file) to < 2^31
@@ -18 +20 @@
   SkyList *newlist = NULL;
 
-  double dtime;
-  struct timeval start, stop;
-
-  gettimeofday (&start, NULL);
+  struct timeval startAddstar, stopAddstar;
+  gettimeofday (&startAddstar, (void *) NULL);
+
+  INITTIME;
 
   SetSignals ();
@@ -44 +46 @@
   }
 
+  MARKTIME ("init and config: %f sec\n", dtime); RESETTIME; 
+
   stars = NULL;
 
@@ -50 +54 @@
     case ADDSTAR_MODE_IMAGE:
       stars = LoadStars (argv[1], &Nstars, &images, &Nimages, &options);
+      MARKTIME ("load smf: %f sec\n", dtime); RESETTIME; 
 
       // set and update the imageID sequence
@@ -127 +132 @@
       }
     }
+    MARKTIME ("load cpt: %f sec\n", dtime); RESETTIME; 
 
     // Naves_disk == 0 implies an empty catalog file
@@ -157 +163 @@
         break;
     }
+    MARKTIME ("match stars: %f sec\n", dtime); RESETTIME; 
+
     /* report total updated values */
     Naverage += catalog.Naverage;
@@ -175 +183 @@
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
+    MARKTIME ("save cpt: %f sec\n", dtime); RESETTIME; 
 
     if (options.mode == ADDSTAR_MODE_REFCAT) free (stars);
@@ -208 +217 @@
   dvo_image_unlock (&db); /* unlock? */
 
-  gettimeofday (&stop, NULL);
-  dtime = DTIME (stop, start);
+  gettimeofday (&stopAddstar, (void *) NULL);
+  float dtime = DTIME (stopAddstar, startAddstar);
   fprintf (stderr, "SUCCESS: elapsed time %9.4f sec for %5d stars (%5d matches), "OFF_T_FMT" average, "OFF_T_FMT" measure, "OFF_T_FMT" lensing\n", dtime, Nstars, Nmatch,  Naverage,  Nmeasure, Nlensing);