Changeset 38429 for branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c

Timestamp:

Jun 8, 2015, 11:46:15 AM (11 years ago)

Author:

eugene

Message:

add compression timing and fix opt build issues

File:

• branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c (modified) (11 diffs)

branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c

@@ -24 +24 @@
 int gfits_collect_table_gzp2 (FTable *table, TableField *field, char *raw, int row_start, int Nrows);
 
+static float timeSum1 = 0.0;
+static float timeSum2 = 0.0;
+static float timeSum2a = 0.0;
+static float timeSum2b = 0.0;
+static float timeSum2c = 0.0;
+static float timeSum2d = 0.0;
+static float timeSum2e = 0.0;
+static float timeSum3 = 0.0;
+
+void gfits_compress_timing () {
+  fprintf (stderr, "cmp times: %f %f %f\n", timeSum1, timeSum2, timeSum3);
+  fprintf (stderr, "cmp times: %f %f %f %f %f\n", timeSum2a, timeSum2b, timeSum2c, timeSum2d, timeSum2e);
+
+  timeSum1 = 0.0;
+  timeSum2 = 0.0;
+  timeSum2a = 0.0;
+  timeSum2b = 0.0;
+  timeSum2c = 0.0;
+  timeSum2d = 0.0;
+  timeSum2e = 0.0;
+  timeSum3 = 0.0;
+}
+
 int gfits_compress_table (FTable *srctable, FTable *tgttable, int ztilelen, char *zcmptype) {
 
@@ -35 +58 @@
   Header *srcheader = srctable->header;
   Header *tgtheader = tgttable->header;
+
+  // XXX EAM:
+  struct timeval startTimer, stopTimer;
+  float dtime;
+  gettimeofday (&startTimer, (void *) NULL);
 
   int Ntile, ztilelast;
@@ -64 +92 @@
   if (!gfits_scan (srcheader, "TFIELDS", "%d", 1, &Nfields)) ESCAPE;
 
+  // XXX TIMER 1
+  gettimeofday (&stopTimer, (void *) NULL); 
+  dtime = DTIME (stopTimer, startTimer);
+  timeSum1 += dtime;
+  gettimeofday (&startTimer, (void *) NULL);
+
   TableField *fields = NULL;
   ALLOCATE_ZERO (fields, TableField, Nfields);
@@ -181 +215 @@
   gfits_dump_raw_table (srctable, "cmp");
 
+  // XXX TIMER 2
+  gettimeofday (&stopTimer, (void *) NULL); 
+  dtime = DTIME (stopTimer, startTimer);
+  timeSum2 += dtime;
+  gettimeofday (&startTimer, (void *) NULL);
+
   // compress the data : copy into a tile, compress the tile, then add to the output table
   // each tile -> 1 row of the output table
@@ -186 +226 @@
 
     for (j = 0; j < Nfields; j++) {
+
+      gettimeofday (&startTimer, (void *) NULL);
 
       int Nrows = (i == Ntile - 1) ? ztilelast : ztilelen;
@@ -199 +241 @@
       }
       
+      // XXX TIMER 2a
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2a += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
+  
       if (VERBOSE_DUMP) {
         int k;
@@ -217 +265 @@
       }
 
+      // XXX TIMER 2b
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2b += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
+  
       if (VERBOSE_DUMP) {
         int k;
@@ -231 +285 @@
       if (!gfits_compress_data (zdata, &Nzdata, fields[j].zctype, NULL, NULL, 0, raw, Nraw, fields[j].pixsize, 0, 0)) ESCAPE;
       
+      // XXX TIMER 2c
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2c += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
+  
       if (VERBOSE_DUMP) {
         int k;
@@ -250 +310 @@
       }
 
+      // XXX TIMER 2d
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2d += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
+  
       if (VERBOSE_DUMP) {
         int k;
@@ -262 +328 @@
 
       if (!gfits_varlength_column_add_data (tgttable, zdata, Nzdata, i, &fields[j].zdef)) ESCAPE;
+      // XXX TIMER 2e
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2e += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
+ 
     }
   }
@@ -268 +340 @@
     if (!gfits_varlength_column_finish (tgttable, &fields[i].zdef)) ESCAPE;
   }
+
+  // XXX TIMER 3
+  gettimeofday (&stopTimer, (void *) NULL); 
+  dtime = DTIME (stopTimer, startTimer);
+  timeSum3 += dtime;
+  gettimeofday (&startTimer, (void *) NULL);
 
   gfits_dump_cmp_table (tgttable, "cmp");