Changeset 37958

Timestamp:

Mar 5, 2015, 2:07:12 PM (11 years ago)

Author:

eugene

Message:

add some memcheck calls because of corruption problem; add client logger

Location:

branches/eam_branches/ipp-20150112/Ohana/src/relastro

Files:

• Makefile (modified) (1 diff)
• src/BrightCatalog.c (modified) (4 diffs)
• src/client_logger.c (modified) (1 diff)
• src/load_catalogs.c (modified) (3 diffs)

branches/eam_branches/ipp-20150112/Ohana/src/relastro/Makefile

@@ -138 +138 @@
 $(SRC)/relastroVisual.$(ARCH).o \
 $(SRC)/syncfile.$(ARCH).o \
+$(SRC)/client_logger.$(ARCH).o \
 $(SRC)/BrightCatalog.$(ARCH).o 
 

branches/eam_branches/ipp-20150112/Ohana/src/relastro/src/BrightCatalog.c

@@ -344 +344 @@
   /*** MeasureTiny ***/
   {
+    ohana_memcheck_func (1);
     gfits_create_table_header (&theader, "BINTABLE", "MEASURE_TINY");
 
+    ohana_memcheck_func (1);
     gfits_define_bintable_column (&theader, "D", "RA",       "ra",                         "degrees", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "D", "DEC",      "dec",                        "degrees", 1.0, 0.0);
@@ -368 +370 @@
 
     // generate the output array that carries the data
+    ohana_memcheck_func (1);
     gfits_create_table (&theader, &ftable);
+    ohana_memcheck_func (1);
 
     // create intermediate storage arrays
@@ -391 +395 @@
     int    *catID     ; ALLOCATE (catID    ,  int  ,  catalog->Nmeasure);
     short  *photcode  ; ALLOCATE (photcode ,  short,  catalog->Nmeasure);
+    ohana_memcheck_func (1);
 
     // assign the storage arrays
@@ -416 +421 @@
       photcode[i] = measure[i].photcode ;
     }
+    ohana_memcheck_func (1);
 
     // add the columns to the output array
     gfits_set_bintable_column (&theader, &ftable, "RA",         R,         catalog->Nmeasure);
+    ohana_memcheck_func (1);
     gfits_set_bintable_column (&theader, &ftable, "DEC",        D,         catalog->Nmeasure);
+    ohana_memcheck_func (1);
     gfits_set_bintable_column (&theader, &ftable, "ROFF_GAL",   RoffGAL,   catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "DOFF_GAL",   DoffGAL,   catalog->Nmeasure);

branches/eam_branches/ipp-20150112/Ohana/src/relastro/src/client_logger.c

@@ -27 +27 @@
 int client_logger_message (char *format,...) {
 
+  if (!logfile) return FALSE;
+
   va_list argp;
 

branches/eam_branches/ipp-20150112/Ohana/src/relastro/src/load_catalogs.c

@@ -17 +17 @@
 
   if (VERBOSE) fprintf (stderr, "loading catalog data\n");
+  client_logger_message ("loading catalog data\n");
 
   ALLOCATE (catalog, Catalog, skylist[0].Nregions);
@@ -255 +256 @@
 
     BrightCatalog *bcatalog = BrightCatalogLoad (table->hosts[i].results);
-    assert (bcatalog);
+    if (!bcatalog) {
+      client_logger_message ("problem loading table from %s\n", table->hosts[i].hostname);
+      exit (2);
+    }
     
     BrightCatalogSplit (catalogs, bcatalog);
@@ -277 +281 @@
 
   fprintf (stderr, "loaded %d catalogs, using a total of %d stars (%d measures)\n", catalogs->Ncatalog, Naverage, Nmeasure);
+  client_logger_message ("loaded %d catalogs, using a total of %d stars (%d measures)\n", catalogs->Ncatalog, Naverage, Nmeasure);
 
   return (catalog);