Changeset 39320 for trunk

Timestamp:

Jan 19, 2016, 8:48:44 AM (10 years ago)

Author:

eugene

Message:

need to call the macro ohana_memcheck, not ohana_memcheck_func

File:

• trunk/Ohana/src/libdvo/src/dvo_catalog_split.c (modified) (25 diffs)

trunk/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -101 +101 @@
   }
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   // write PHU header
@@ -129 +129 @@
 # endif
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   FTable *outtable = ftable;
@@ -310 +310 @@
 int gfits_fread_uncompressed (Catalog *catalog, FTable *ftable, char *nativeOrder, char VERBOSE) {
 
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
+
   // fread_ftable_data requires the header
 
@@ -317 +319 @@
     return FALSE;
   }
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
   // NOTE: fread_ftable returns an unswapped table; uncompress swaps the bytes into native order
     
@@ -331 +334 @@
       return FALSE;
     }
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
+
     if (!gfits_uncompress_table (ftable, &rawtable)) {
       if (VERBOSE) fprintf (stderr, "failed to uncompress table\n");
@@ -336 +341 @@
       return FALSE;
     }
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     char compressMode[256];
@@ -346 +352 @@
     gfits_free_header (ftable->header);
     gfits_free_table (ftable); 
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
     
     // copies values but does not allocate new memory
@@ -866 +873 @@
   }
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   Nmeasure_disk_new = MAX (catalog[0].Nmeasure_disk, catalog[0].Nmeasure + catalog[0].Nmeasure_off);
@@ -891 +898 @@
   /* in split mode, we can save only part of the data */ 
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   /*** Average Table ***/
@@ -918 +925 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naverage_disk, Naverage_disk_new)) {
@@ -925 +932 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     gfits_free_header (&header);
@@ -954 +961 @@
     assert (catalog[0].Nmeasure_disk >= catalog[0].Nmeasure_off);
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // if we are going to compress, we need to receive unswapped data -- 
@@ -965 +972 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // write out Measure table
@@ -973 +980 @@
       goto failure;
     }
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     gfits_free_header (&header);
@@ -1023 +1030 @@
     int swapFromNative = !output_is_compressed (start, Nrows, Nsecfilt_disk_new, catalog->catcompress);
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // convert to external table format
@@ -1031 +1038 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // write out SecFilt table
@@ -1562 +1569 @@
   }
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   Nmeasure_disk_new = catalog[0].Nmeasure;
@@ -1587 +1594 @@
   /* in split mode, we can save only part of the data, but not using this function (use e.g., dvo_catalog_update_split) */ 
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   /*** Average Table ***/
@@ -1614 +1621 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naverage_disk, Naverage_disk_new)) {
@@ -1621 +1628 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     gfits_free_header (&header);
@@ -1650 +1657 @@
     assert (catalog[0].Nmeasure_disk >= catalog[0].Nmeasure_off);
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // if we are going to compress, we need to receive unswapped data -- 
@@ -1662 +1669 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // write out Measure table
@@ -1670 +1677 @@
       goto failure;
     }
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     gfits_free_header (&header);
@@ -1723 +1730 @@
     int swapFromNative = !output_is_compressed (start, Nrows, Nsecfilt_disk_new, catalog->catcompress);
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // convert to external table format
@@ -1731 +1738 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // write out SecFilt table