Changeset 40259 for branches/eam_branches/ohana.20170822

Timestamp:

Dec 7, 2017, 10:29:25 PM (9 years ago)

Author:

eugene

Message:

update image header format when changing format; avoid double-free for image table

Location:

branches/eam_branches/ohana.20170822/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/ImageOps.c (modified) (1 diff)
• src/relphot_images.c (modified) (2 diffs)
• src/relphot_parallel_images.c (modified) (1 diff)
• src/relphot_parallel_regions.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/relphot/include/relphot.h

@@ -407 +407 @@
 int           findMosaics         PROTO((Catalog *catalog, int Ncatalog, int doMosaicList));
 
+void clearImages (void);
 void checkImages (char *name);
 int dumpMags (FILE *fout, Catalog *catalog, int Ncatalog);

branches/eam_branches/ohana.20170822/src/relphot/src/ImageOps.c

@@ -1161 +1161 @@
 }
 
+void clearImages (void) {
+  image = NULL;
+}
+
 void checkImages (char *name) {
 
   off_t i;
   fprintf (stderr, "--- %s ---\n", name);
+  
+  OhanaMemblock *ref = (OhanaMemblock *) image - 1;
+  fprintf (stderr, "file: %s\n", ref->file);
+
+  fprintf (stderr, "0x%08llx \n", (unsigned long long) image);
+
   for (i = 0; i < Nimage; i++) {
     fprintf (stderr, "%s : 0x%08x : %6.3f  %6.3f\n", image[i].name, image[i].flags, image[i].McalPSF, image[i].McalAPER);

branches/eam_branches/ohana.20170822/src/relphot/src/relphot_images.c

@@ -228 +228 @@
         // ensure the db format is updated
         dbX.format = dvo_catalog_catformat (UPDATE_CATFORMAT);
+        gfits_modify (&dbX.header, "FORMAT", "%s", 1, UPDATE_CATFORMAT);
+
         char photcodeFile[1024];
         sprintf (photcodeFile, "%s/Photcodes.dat", CATDIR);
@@ -272 +274 @@
     // ensure the db format is updated
     db.format = dvo_catalog_catformat (UPDATE_CATFORMAT);
+    gfits_modify (&db.header, "FORMAT", "%s", 1, UPDATE_CATFORMAT);
   }
   if (CALIBRATE_STACKS_AND_WARPS || (NLOOP > 0)) {

branches/eam_branches/ohana.20170822/src/relphot/src/relphot_parallel_images.c

@@ -170 +170 @@
   freeGridBins (Ncatalog);
   freeImages((char *)image);
+  free (image);
 
   SkyListFree(skylist);

branches/eam_branches/ohana.20170822/src/relphot/src/relphot_parallel_regions.c

@@ -84 +84 @@
 
   // save the changes to the image parameters
-  dvo_image_save (&db, VERBOSE); // this function modifies the db.ftable.buffer: do not free stored Image table
+  dvo_image_save (&db, VERBOSE);
+
+  // dvo_image_save frees db.ftable.buffer (== image) and replaces it: do not free stored Image table
+  clearImages ();
+
   dvo_image_unlock (&db); 
   MARKTIME ("finished relphot -parallel-regions: %f sec total\n", dtime);