Changeset 33905 for branches/eam_branches/ipp-20120405/Ohana

Timestamp:

May 23, 2012, 9:10:42 AM (14 years ago)

Author:

eugene

Message:

going back on forth on the locking issues

File:

• branches/eam_branches/ipp-20120405/Ohana/src/dvomerge/src/dvomergeImageIDs.c (modified) (5 diffs)

branches/eam_branches/ipp-20120405/Ohana/src/dvomerge/src/dvomergeImageIDs.c

@@ -12 +12 @@
   inDB.mode   = dvo_catalog_catmode (CATMODE);
   inDB.format = dvo_catalog_catformat (CATFORMAT);
-  status       = dvo_image_lock (&inDB, ImageCat, 3600.0, LCK_XCLD);  // shorter timeout?
+  status       = dvo_image_lock (&inDB, ImageCat, 3600.0, LCK_SOFT);  // shorter timeout?
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", inDB.filename);
 
@@ -64 +64 @@
   inDB.mode   = dvo_catalog_catmode (CATMODE);
   inDB.format = dvo_catalog_catformat (CATFORMAT);
-  status       = dvo_image_lock (&inDB, ImageCat, 3600.0, LCK_XCLD);  // shorter timeout?
+  status       = dvo_image_lock (&inDB, ImageCat, 5400.0, LCK_XCLD);  // shorter timeout?
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", inDB.filename);
 
@@ -78 +78 @@
     Shutdown ("can't read input image catalog %s", inDB.filename);
   }
+  dvo_image_unlock (&inDB); // unlock input
 
   /*** load output/Images.dat ***/
@@ -83 +84 @@
   outDB.mode   = dvo_catalog_catmode (CATMODE);
   outDB.format = dvo_catalog_catformat (CATFORMAT);
-  status       = dvo_image_lock (&outDB, ImageCat, 3600.0, LCK_XCLD);  // shorter timeout?
+  status       = dvo_image_lock (&outDB, ImageCat, 5400.0, LCK_XCLD);  // shorter timeout?
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", outDB.filename);
 
@@ -93 +94 @@
     Shutdown ("can't read output image catalog %s", outDB.filename);
   }
+  dvo_image_unlock (&outDB); // unlock output
 
   // convert database table to internal structure & add to output image db
   dvo_image_match_dbs(IDmap, &outDB, &inDB);
-  dvo_image_unlock (&inDB); // unlock input
-  dvo_image_unlock (&outDB); // unlock output
 
   return TRUE;