Changeset 18732

Timestamp:

Jul 24, 2008, 5:10:43 PM (18 years ago)

Author:

eugene

Message:

add additional mutex locks to avoid conflicts on Nvariables

File:

• trunk/Ohana/src/opihi/lib.shell/VariableOps.c (modified) (6 diffs)

trunk/Ohana/src/opihi/lib.shell/VariableOps.c

@@ -129 +129 @@
   ALLOCATE (local, char, strlen(name) + strlen(MacroName) + 2);
   sprintf (local, "%s.%s", MacroName, name);
+
+  /* need to use a mutex to prevent another thread from misleading on size of Nvariables */
+  pthread_mutex_lock (&mutex);
+
   for (i = 0; i < Nvariables; i++) { /* find the variable mentioned */
     if (!strcmp(local, variables[i].name)) {
+      pthread_mutex_unlock (&mutex);
       free (local);
       return (variables[i].value);
     }
   }
+  pthread_mutex_unlock (&mutex);
   free (local);
   return (NULL);
@@ -161 +167 @@
   if (local != NULL) return (local);
 
+  /* need to use a mutex to prevent another thread from misleading on size of Nvariables */
+  pthread_mutex_lock (&mutex);
+
   /* look for global variable */
   for (i = 0; i < Nvariables; i++) { /* find the variable mentioned */
     if (!strcmp(name, variables[i].name)) {
+      pthread_mutex_unlock (&mutex);
       return (variables[i].value);
     }
   }
+  pthread_mutex_unlock (&mutex);
   return (NULL);
 }
@@ -238 +249 @@
 
   int i, j;
+
+  /* need to use a mutex to prevent two threads from simultaneously modifying Nvariables */
+  pthread_mutex_lock (&mutex);
 
   for (i = 0; i < Nvariables; i++) {
@@ -248 +262 @@
       Nvariables --;
       REALLOCATE (variables, Variable, MAX (Nvariables, 1));
-      return (TRUE);
-    }
-  }
+      pthread_mutex_unlock (&mutex);
+      return (TRUE);
+    }
+  }
+  pthread_mutex_unlock (&mutex);
   return (FALSE);
 }
@@ -258 +274 @@
   int i;
 
-  for (i = 0; i < Nvariables; i++) {
-    if (!strcmp (name, variables[i].name)) return (TRUE);
-  }
+  /* need to use a mutex to prevent another thread from misleading on size of Nvariables */
+  pthread_mutex_lock (&mutex);
+
+  for (i = 0; i < Nvariables; i++) {
+    if (!strcmp (name, variables[i].name)) {
+      pthread_mutex_unlock (&mutex);
+      return (TRUE);
+    }
+  }
+  pthread_mutex_unlock (&mutex);
   return (FALSE);
 }
@@ -273 +296 @@
   }
 
+  /* need to use a mutex to prevent another thread from misleading on size of Nvariables */
+  pthread_mutex_lock (&mutex);
+
   for (i = 0; i < Nvariables; i++) {
     gprint (GP_ERR, "%s = %s\n", variables[i].name, variables[i].value);
   }
+
+  pthread_mutex_unlock (&mutex);
   return;
 }