Changeset 37706 for branches/eam_branches/ipp-20140904

Timestamp:

Dec 2, 2014, 10:05:38 AM (12 years ago)

Author:

eugene

Message:

fix a segfault, add client logger

Location:

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

Files:

• Makefile (modified) (1 diff)
• include/relastro.h (modified) (1 diff)
• src/BrightCatalog.c (modified) (2 diffs)
• src/client_logger.c (added)
• src/relastro_parallel_images.c (modified) (7 diffs)

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

@@ -89 +89 @@
 $(SRC)/indexCatalogs.$(ARCH).o \
 $(SRC)/syncfile.$(ARCH).o \
+$(SRC)/client_logger.$(ARCH).o \
 $(SRC)/relastroVisual.$(ARCH).o
 

branches/eam_branches/ipp-20140904/Ohana/src/relastro/include/relastro.h

@@ -653 +653 @@
 void lockUpdateChips ();
 void unlockUpdateChips ();
+
+int client_logger_init (char *dirname);
+int client_logger_message (char *format,...);

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

@@ -43 +43 @@
   if (!gfits_fread_header (f, &header)) {
     if (VERBOSE) fprintf (stderr, "can't read image subset header\n");
-    fclose (f);
     goto escape;
   }
   if (!gfits_fread_matrix (f, &matrix, &header)) {
     if (VERBOSE) fprintf (stderr, "can't read image subset matrix\n");
-    gfits_free_header (&header);
-    fclose (f);
     goto escape;
   }
@@ -316 +313 @@
   if (catalog) free (catalog);
 
-  fclose (f);
+  if (f) fclose (f);
   return NULL;
 }

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/relastro_parallel_images.c

@@ -17 +17 @@
   INITTIME;
 
+  client_logger_init (CATDIR);
+
   // load the RegionTable (UserRegion should not be used at this level)
   RegionHostTable *regionHosts = RegionHostTableLoad (CATDIR, REGION_FILE);
   int myHost = regionHosts->index[REGION_HOST_ID];
   RegionHostFindNeighbors (regionHosts, myHost);
+  client_logger_message ("started parallel images on %s\n", regionHosts->hosts[myHost].hostname);
 
   // load the subset images belonging to this host
@@ -44 +47 @@
   }
   put_astrom_table (table);
+  client_logger_message ("loaded images on %s\n", regionHosts->hosts[myHost].hostname);
 
   // once we have read this table, we should remove it for repeat runs
@@ -63 +67 @@
   free (syncfile);
   
+  client_logger_message ("loaded catalog data %s\n", regionHosts->hosts[myHost].hostname);
+
   // find ICRF QSOs for reference downstream (only if USE_ICRF_CORRECT)
   select_catalog_ICRF (catalog, Ncatalog);
@@ -84 +90 @@
   createStarMap (catalog, Ncatalog);
 
+  client_logger_message ("set up image indexes on %s\n", regionHosts->hosts[myHost].hostname);
+
   markObjects (catalog, Ncatalog);
 
   SAVEPLOT = FALSE;
+
+  client_logger_message ("starting the loops: %s\n", regionHosts->hosts[myHost].hostname);
 
   /* major modes */
@@ -105 +115 @@
         UpdateMeasures (catalog, Ncatalog);
         MARKTIME("reset measures, host %d: %f sec\n", REGION_HOST_ID, dtime);
+        client_logger_message ("reset measures: %s\n", regionHosts->hosts[myHost].hostname);
       }
       for (i = 0; i < NLOOP; i++) {
         UpdateObjects (catalog, Ncatalog, (i > 0));
         MARKTIME("update objects loop %d, host %d: %f sec\n", i, REGION_HOST_ID, dtime);
+        client_logger_message ("update objects loop %d: %s\n", i, regionHosts->hosts[myHost].hostname);
         if ((i > 1) || !USE_GALAXY_MODEL) {
           // if GALAXY_MODEL is selected, we want to delay the frame correction until we have 
@@ -114 +126 @@
           FrameCorrectionParallelSlave (catalog, Ncatalog, regionHosts, i); 
           MARKTIME("frame correction loop %d, host %d: %f sec\n", i, REGION_HOST_ID, dtime);
+          client_logger_message ("frame correction loop %d: %s\n", i, regionHosts->hosts[myHost].hostname);
         }
         share_mean_pos (catalog, Ncatalog, regionHosts, i);
         slurp_mean_pos (catalog, Ncatalog, regionHosts, i);
+        client_logger_message ("slurp mags loop %d: %s\n", i, regionHosts->hosts[myHost].hostname);
 
         UpdateChips (catalog, Ncatalog);
         MARKTIME("update chips loop %d, host %d: %f sec\n", i, REGION_HOST_ID, dtime);
+        client_logger_message ("update chips loop %d: %s\n", i, regionHosts->hosts[myHost].hostname);
+
         share_image_pos (regionHosts, i);
         slurp_image_pos (catalog, Ncatalog, regionHosts, i);
+        client_logger_message ("slurp image pos loop %d: %s\n", i, regionHosts->hosts[myHost].hostname);
+
         share_meas_pos (catalog, Ncatalog, regionHosts, i);
         slurp_meas_pos (catalog, Ncatalog, regionHosts, i);
         MARKTIME("done exchange loop %d, host %d: %f sec\n", i, REGION_HOST_ID, dtime);
+        client_logger_message ("slurp meas loop %d: %s\n", i, regionHosts->hosts[myHost].hostname);
       }
       // create summary plots of the process
@@ -159 +178 @@
 
   share_image_pos (regionHosts, -1);
+  client_logger_message ("share image pos loop %d: %s\n", -1, regionHosts->hosts[myHost].hostname);
 
   exit (0);