Changeset 38425

Timestamp:

Jun 7, 2015, 11:42:53 AM (11 years ago)

Author:

eugene

Message:

add some more error checking and a timing test

Location:

branches/eam_branches/ohana.20150429/src/libfits

Files:

• Makefile (modified) (1 diff)
• matrix/F_matrix.c (modified) (4 diffs)
• table/F_table_varlength.c (modified) (2 diffs)
• table/F_uncompress_T.c (modified) (1 diff)
• table/F_write_T.c (modified) (8 diffs)
• table/F_write_TH.c (modified) (2 diffs)
• test/compress.sh (modified) (3 diffs)
• test/tcomptiming.c (added)

branches/eam_branches/ohana.20150429/src/libfits/Makefile

@@ -27 +27 @@
 
 # zlib
-TESTPROG = imagecomp tablecomp ricetest
+TESTPROG = imagecomp tablecomp tcomptiming ricetest 
 $(TESTPROG) : % : $(TESTBIN)/%
 test: $(TESTPROG)

branches/eam_branches/ohana.20150429/src/libfits/matrix/F_matrix.c

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
-
-off_t gfits_data_size (Header *header) {
-  
-  int i;
-  off_t Nrec, size;
-
-  if (header[0].Naxes == 0) return (0);
-
-  size = abs(header[0].bitpix / 8);
-
-  for (i = 0; i < header[0].Naxes; i++)
-    size *= header[0].Naxis[i];
-
-  // XXX do I multiply this times gcount?
-  size += header[0].pcount;
-
-  /* round up to next complete block */
-  if (size % FT_RECORD_SIZE) {
-    Nrec = 1 + (int) (size / FT_RECORD_SIZE);
-    size = FT_RECORD_SIZE * Nrec;
-  }
-
-  return (size);
-}
 
 off_t gfits_heap_start (Header *header) {
@@ -43 +19 @@
 off_t gfits_data_min_size (Header *header) {
   
-  int i;
-  off_t size;
+  off_t size = gfits_heap_start (header);
+  size += header[0].pcount;
 
-  if (header[0].Naxes == 0) return (0);
-
-  size = abs(header[0].bitpix / 8);
-
-  for (i = 0; i < header[0].Naxes; i++)
-    size *= header[0].Naxis[i];
-
-  // XXX do I multiply this times gcount?
-  size += header[0].pcount;
+  // XXX what do I do with gcount?
 
   return (size);
@@ -61 +29 @@
 off_t gfits_data_pad_size (off_t rawsize) {
   
-  off_t Nrec, size;
-
-  size = rawsize;
+  off_t size = rawsize;
 
   /* round up to next complete block */
   if (rawsize % FT_RECORD_SIZE) {
-    Nrec = 1 + (int) (rawsize / FT_RECORD_SIZE);
+    off_t Nrec = 1 + (int) (rawsize / FT_RECORD_SIZE);
     size = FT_RECORD_SIZE * Nrec;
   }
@@ -73 +39 @@
   return (size);
 }
+
+off_t gfits_data_size (Header *header) {
+  off_t rawsize = gfits_data_min_size(header);
+  off_t size = gfits_data_pad_size (rawsize);
+
+  return (size);
+}
+

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

@@ -157 +157 @@
 
   // extend the buffer size to add the new data
-  off_t Nbytes = heap_offset + Ndata;
+  off_t Nbytes = gfits_data_pad_size (heap_offset + Ndata);
   REALLOCATE (table->buffer, char, Nbytes);
 
@@ -198 +198 @@
   table->header->pcount = pcount;
   table->datasize = gfits_data_size (table->header);
+  myAssert (table->datasize == Nbytes, "inconsistent header and data");
 
   return TRUE;

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

@@ -179 +179 @@
 
   // allocate the intermediate storage buffers
-  int Nraw_alloc = max_width*ztilelen + 100;
+  int Nraw_alloc = max_width*ztilelen + 1000;
   ALLOCATE (raw,   char, Nraw_alloc);
   ALLOCATE (zdata, char, max_width*ztilelen);

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

@@ -14 +14 @@
   
   status = fseeko (f, 0LL, SEEK_END);  /* write table to end of file! */
+  if (status) { perror ("fseeko: "); return (FALSE);  }
   status = gfits_fwrite_table (f, table);
 
@@ -26 +27 @@
   
   Nbytes = fwrite (table[0].buffer, sizeof(char), table[0].datasize, f);
-  
-  if (Nbytes != table[0].datasize) return (FALSE);
+  if (Nbytes != table[0].datasize) { perror ("fwrite: "); return (FALSE);  }
   return (TRUE);
 }       
@@ -45 +45 @@
   /* file pointer is at beginning of desired table data */
   start = ftello (f);
+  if (start < 0) { perror ("ftello: "); return FALSE; }
   
   for (i = 0; i < Nrow; i++) {
@@ -50 +51 @@
     fseeko (f, offset, SEEK_SET);
     Nbytes = fwrite (table[0].buffer[i], sizeof (char), Nx, f);
-    if (Nbytes != Nx) { return (FALSE); }
+    if (Nbytes != Nx) { perror ("fwrite: "); return (FALSE); }
   }
   
@@ -58 +59 @@
 
   offset = start + Nx*Ny;
-  fseeko (f, offset, SEEK_SET);
+  int status = fseeko (f, offset, SEEK_SET);
+  if (status) { perror ("fseeko: "); return FALSE; }
+
   Nbytes = fwrite (pad, sizeof (char), Npad, f);
-  if (Nbytes != Npad) { return (FALSE); }
+  if (Nbytes != Npad) { perror ("fwrite: "); return (FALSE); }
   free (pad);
 
@@ -97 +100 @@
   // cursor must be at start of the table (after table header)
   if (fseeko (f, Nskip, SEEK_CUR)) {
+    perror ("fseeko: ");
     fprintf (stderr, "can't seek table start\n");
     return (FALSE);
@@ -102 +106 @@
 
   Nwrite = fwrite (ftable[0].buffer, sizeof (char), Nbytes, f);
-  if (Nwrite != Nbytes) {
-    return (FALSE);
-  }
+  if (Nwrite != Nbytes) { perror ("fwrite: "); return (FALSE); }
 
   if (Ntotal >= Ndisk) {
@@ -113 +115 @@
     free (pad);
 
-    if (Nbytes != Npad) return (FALSE); 
+    if (Nbytes != Npad) { perror ("fwrite: "); return (FALSE);  }
   }
 

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

@@ -14 +14 @@
   
   status = fseeko (f, 0LL, SEEK_END);  /* write header to end of file! */
+  if (status) { perror ("fseeko: "); return (FALSE);  }
   status = gfits_fwrite_Theader (f, header);
 
@@ -26 +27 @@
   
   Nbytes = fwrite (header[0].buffer, sizeof(char), header[0].datasize, f);
+  if (Nbytes != header[0].datasize) { perror ("fwrite: "); return (FALSE);  }
 
-  if (Nbytes != header[0].datasize) return (FALSE);
   return (TRUE);
 }       

branches/eam_branches/ohana.20150429/src/libfits/test/compress.sh

@@ -1 +1 @@
 input tap.dvo
+
+macro tests
+  test_image_all
+  test_table_all_rnd
+end
 
 macro test_image_all 
@@ -308 +313 @@
 end
 
-
 macro test_table_all_rnd
 
@@ -334 +338 @@
  # lrnd generates rnd int between 0 and 0x7fffff (2^31 - 1 inclusive)
 
- $NPT = 1000
+ $NPT = 1000000
  # $NPT = 30
  create ni 0 $NPT -int