Changeset 37677

Timestamp:

Nov 26, 2014, 7:46:26 AM (12 years ago)

Author:

eugene

Message:

lock threads before updating offset map table

Location:

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

Files:

• include/relastro.h (modified) (1 diff)
• src/FitChip.c (modified) (1 diff)
• src/UpdateChips.c (modified) (2 diffs)

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

@@ -655 +655 @@
 
 int HarvestRegionHosts (RegionHostTable *regionHosts);
+
+void lockUpdateChips ();
+void unlockUpdateChips ();

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

@@ -115 +115 @@
       if (image[0].coords.offsetMap == NULL) {
         // allocate a new table and assign to this image
+        // need to lock threads here because 'table' is a static with 
+        // modifiable elements
+        lockUpdateChips ();
         AstromOffsetTable *table = get_astrom_table ();
         AstromOffsetTableNewMap(table, order_use, image);
+        unlockUpdateChips ();
       }
       fit_map (image[0].coords.offsetMap, raw, ref, Nmatch);

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

@@ -354 +354 @@
 static pthread_mutex_t UpdateChips_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+void lockUpdateChips () {
+  pthread_mutex_lock (&UpdateChips_mutex);
+}
+void unlockUpdateChips () {
+  pthread_mutex_unlock (&UpdateChips_mutex);
+}
+
 // we have an array of chips (image, Nimage).  we need to hand out images one at a time to
 // the worker threads as they need
 off_t getNextImageForThread () {
 
-  pthread_mutex_lock (&UpdateChips_mutex);
+  lockUpdateChips ();
   if (nextImage >= Nimage) {
-    pthread_mutex_unlock (&UpdateChips_mutex);
+    unlockUpdateChips ();
     return (-1);
   }
@@ -366 +373 @@
   nextImage ++;
 
-  pthread_mutex_unlock (&UpdateChips_mutex);
+  unlockUpdateChips ();
   return (thisImage);
 }