Changeset 38415 for branches/eam_branches/ohana.20150429/src/libfits/table/F_uncompress_T.c

Timestamp:

Jun 6, 2015, 2:28:50 PM (11 years ago)

Author:

eugene

Message:

add timing test; handle empty table

File:

• branches/eam_branches/ohana.20150429/src/libfits/table/F_uncompress_T.c (modified) (14 diffs)

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

@@ -47 +47 @@
 }
 
+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 timeSum2f = 0.0;
+static float timeSum3 = 0.0;
+
+void gfits_uncompress_timing () {
+  fprintf (stderr, "times: %f %f %f\n", timeSum1, timeSum2, timeSum3);
+  fprintf (stderr, "times: %f %f %f %f %f %f\n", timeSum2a, timeSum2b, timeSum2c, timeSum2d, timeSum2e, timeSum2f);
+}
+
 int gfits_uncompress_table (FTable *srctable, FTable *tgttable) {
 
@@ -58 +73 @@
   Header *srcheader = srctable->header;
   Header *tgtheader = tgttable->header;
+
+  // XXX EAM:
+  struct timeval startTimer, stopTimer;
+  float dtime;
+  gettimeofday (&startTimer, (void *) NULL);
 
   int ztilelen;
@@ -126 +146 @@
   myAssert (Nx == tgtheader->Naxis[0], "table definition error?");
 
+  // XXX TIMER 1
+  gettimeofday (&stopTimer, (void *) NULL); 
+  dtime = DTIME (stopTimer, startTimer);
+  timeSum1 += dtime;
+  gettimeofday (&startTimer, (void *) NULL);
+
   // this allocates the pointer data array for the full set of tiles (NOT the heap)
   char *tmpbuffer = NULL;
@@ -135 +161 @@
     
   int Ntile = srcheader->Naxis[1];
-  int ztilelast = (tgtheader->Naxis[1] % ztilelen) ? tgtheader->Naxis[1] % ztilelen : ztilelen;
+  int ztilelast;
+  if (Ntile == 0) {
+    ztilelast = 0;
+  } else {
+    ztilelast = (tgtheader->Naxis[1] % ztilelen) ? tgtheader->Naxis[1] % ztilelen : ztilelen;
+  }
 
   // allocate the intermediate storage buffers
@@ -147 +178 @@
   gfits_dump_cmp_table (srctable, "unc");
 
+  // XXX TIMER 2
+  gettimeofday (&stopTimer, (void *) NULL); 
+  dtime = DTIME (stopTimer, startTimer);
+  timeSum2 += dtime;
+  gettimeofday (&startTimer, (void *) NULL);
+
   off_t row;
   for (row = 0; row < srcheader->Naxis[1]; row++) {
@@ -157 +194 @@
       // XXX note that this function currently byteswaps.  I should redo the code to make
       // byteswap of the varlength data segment a separate function
+
+      gettimeofday (&startTimer, (void *) NULL);
 
       off_t Nzdata;
@@ -173 +212 @@
       }
 
-      if (strcasecmp(fields[i].zctype, "NONE") && 
-          strcasecmp(fields[i].zctype, "NONE_2") && 
+      // XXX TIMER 2a
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2a += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
+  
+      if (strcasecmp(fields[i].zctype, "NONE_2") && 
           strcasecmp(fields[i].zctype, "GZIP_1") && 
           strcasecmp(fields[i].zctype, "GZIP_2") && 
@@ -183 +227 @@
       }
 
+      // XXX TIMER 2b
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2b += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
+  
       if (VERBOSE_DUMP) {
         int k;
@@ -194 +244 @@
       }
 
+      // XXX TIMER 2c
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2c += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
+  
       int Nrows = (row == Ntile - 1) ? ztilelast : ztilelen;
       int Nraw = Nrows*fields[i].Nvalues*fields[i].pixsize; // expected number of bytes
@@ -209 +265 @@
       }
 
+      // XXX TIMER 2d
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2d += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
+  
       if (!strcasecmp(fields[i].zctype, "GZIP_1")) {
         myAssert ((fields[i].zdef.format != 'C') && (fields[i].zdef.format != 'M'), "swap is probably wrong for C or M columns");
@@ -214 +276 @@
       }
 
+      // XXX TIMER 2e
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2e += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
+  
       if (VERBOSE_DUMP) {
         int k;
@@ -237 +305 @@
         if (!gfits_distribute_table_data (tgttable, &fields[i], raw, row_start, Nrows)) ESCAPE;
       }      
+
+      // XXX TIMER 2f
+      gettimeofday (&stopTimer, (void *) NULL); 
+      dtime = DTIME (stopTimer, startTimer);
+      timeSum2f += dtime;
+      gettimeofday (&startTimer, (void *) NULL);
     }
   }
+
+  // XXX TIMER 3
+  gettimeofday (&stopTimer, (void *) NULL); 
+  dtime = DTIME (stopTimer, startTimer);
+  timeSum3 += dtime;
+  gettimeofday (&startTimer, (void *) NULL);
 
   gfits_dump_raw_table (tgttable, "unc");
@@ -264 +344 @@
   off_t Nx = table->header->Naxis[0];
 
+  char *tblbuffer = &table->buffer[Nx*row_start + field->offset];
+
   if (VERBOSE) fprintf (stderr, "distribute: ");
-  for (i = 0; i < Nrows; i++) {
-    int row = row_start + i;
-    memcpy (&table->buffer[Nx*row + field->offset], &raw[i*field->rowsize], field->rowsize);
+  for (i = 0; i < Nrows; i++, tblbuffer += Nx) {
+    // int row = row_start + i;
+    memcpy (tblbuffer, &raw[i*field->rowsize], field->rowsize);
 # if (VERBOSE)
     int j; for (j = 0; j < field->rowsize; j++) fprintf (stderr, "0x%02hhx ", table->buffer[Nx*row + field->offset + j]);
@@ -284 +366 @@
 
   off_t Nx = table->header->Naxis[0];
-
+  int Nvalues = field->Nvalues;
+  int pixsize = field->pixsize;
+  int offset = field->offset;
+
+  char *rawptr = raw;
+
+  for (k = 0; k < field->pixsize; k++) {
+# ifdef BYTE_SWAP      
+    char *tblptr_start = &table->buffer[Nx*row_start + offset + (pixsize - k - 1)];
+# else
+    char *tblptr_start = &table->buffer[Nx*row_start + offset + k];
+# endif
+    for (i = 0; i < Nrows; i++, tblptr_start += Nx) {
+      char *tblptr = tblptr_start;
+      for (j = 0; j < Nvalues; j++, tblptr += pixsize, rawptr++) {
+        *tblptr = *rawptr;
+      }
+    }
+  }
+  return (TRUE);
+}
+
+int gfits_distribute_table_gzp2_alt (FTable *table, TableField *field, char *raw, int row_start, int Nrows) {
+  
+  off_t i, j, k;
+  
+  // we are copying NN rows into the column which starts at XX and has MM bytes per row
+  
+  off_t Nx = table->header->Naxis[0];
+  
   for (k = 0; k < field->pixsize; k++) {
     for (i = 0; i < Nrows; i++) {
       int row = row_start + i;
       char *rawptr = &raw[i*field->Nvalues + k*Nrows*field->Nvalues];
-# ifdef BYTE_SWAP      
+# ifdef BYTE_SWAP     
       char *tblptr = &table->buffer[Nx*row + field->offset + (field->pixsize - k - 1)];
 # else