Changeset 16887

Timestamp:

Mar 8, 2008, 11:25:11 AM (18 years ago)

Author:

eugene

Message:

add thread safety to create/delete of vectors

File:

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

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

@@ -4 +4 @@
 static int     Nvectors;
   
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
+// this function is NOT thread protected : it is only used in startup and/or shutdown
 void InitVectors () {
   Nvectors = 0;
@@ -9 +12 @@
 }
 
+// this function is NOT thread protected : it is only used in startup and/or shutdown
 void FreeVectors () {
 
@@ -64 +68 @@
   if (i == Nvectors) { 
     if (mode == OLDVECTOR) goto error;
-    Nvectors += 1;
+    pthread_mutex_lock (&mutex);
+    Nvectors ++;
     REALLOCATE (vectors, Vector *, Nvectors);
     vectors[i] = InitVector ();
     strcpy (vectors[i][0].name, name);
+    pthread_mutex_unlock (&mutex);
     return (vectors[i]);
   } 
@@ -91 +97 @@
   free (vectors[i][0].elements);
   free (vectors[i]);
+
+  pthread_mutex_lock (&mutex);
   for (j = i; j < Nvectors - 1; j++) vectors[j] = vectors[j + 1];
-
-  Nvectors -= 1;
+  Nvectors --;
   REALLOCATE (vectors, Vector *, MAX (Nvectors, 1));
+  pthread_mutex_unlock (&mutex);
   return (TRUE);
 }
@@ -109 +117 @@
   free (vectors[i][0].elements);
   free (vectors[i]);
+
+  pthread_mutex_lock (&mutex);
   for (j = i; j < Nvectors - 1; j++) vectors[j] = vectors[j + 1];
-
-  Nvectors -= 1;
+  Nvectors --;
   REALLOCATE (vectors, Vector *, MAX (Nvectors, 1));
+  pthread_mutex_unlock (&mutex);
   return (TRUE);
 }
@@ -154 +164 @@
   }
 
+  pthread_mutex_lock (&mutex);
   for (j = i; j < Nvectors - 1; j++) vectors[j] = vectors[j + 1];
-  Nvectors -= 1;
+  Nvectors --;
   REALLOCATE (vectors, Vector *, MAX (Nvectors, 1));
   free (in);
+  pthread_mutex_unlock (&mutex);
   return (TRUE);
 }