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

Timestamp:

Jun 6, 2015, 8:40:19 PM (11 years ago)

Author:

eugene

Message:

trying to improve the speed of the compression shuffle step; added NONE_1 for testing; added timing traces in uncompress to test speed improvements

File:

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

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

@@ -60 +60 @@
   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);
+
+  timeSum1 = 0.0;
+  timeSum2 = 0.0;
+  timeSum2a = 0.0;
+  timeSum2b = 0.0;
+  timeSum2c = 0.0;
+  timeSum2d = 0.0;
+  timeSum2e = 0.0;
+  timeSum2f = 0.0;
+  timeSum3 = 0.0;
 }
 
@@ -346 +356 @@
   char *tblbuffer = &table->buffer[Nx*row_start + field->offset];
 
+  int rowsize = field->rowsize;
+
   if (VERBOSE) fprintf (stderr, "distribute: ");
   for (i = 0; i < Nrows; i++, tblbuffer += Nx) {
-    // int row = row_start + i;
-    memcpy (tblbuffer, &raw[i*field->rowsize], field->rowsize);
+    memcpy (tblbuffer, &raw[i*rowsize], rowsize);
 # if (VERBOSE)
     int j; for (j = 0; j < field->rowsize; j++) fprintf (stderr, "0x%02hhx ", table->buffer[Nx*row + field->offset + j]);