Changeset 8424 for trunk/Ohana/src/opihi/pcontrol/StackOps.c

Timestamp:

Aug 18, 2006, 1:44:51 PM (20 years ago)

Author:

eugene

Message:

successful implementation of the threaded version of pcontrol

File:

• trunk/Ohana/src/opihi/pcontrol/StackOps.c (modified) (8 diffs)

trunk/Ohana/src/opihi/pcontrol/StackOps.c

@@ -25 +25 @@
   ALLOCATE (stack[0].id,     int,    stack[0].NOBJECT);
 
-  // we need to use a mutex of type 
-  // stack[0].mutex = PTHREAD_MUTEX_INITIALIZER;
-
+# ifdef THREADED
+  pthread_mutex_init (&stack[0].mutex, NULL);
+# endif
   return (stack);
 }
@@ -72 +72 @@
 void *PullStackByLocation (Stack *stack, int where) {
 
-  int i;
   void *object;
   
@@ -96 +95 @@
 void *PullStackByName (Stack *stack, char *name) {
 
-  int i, j;
+  int i;
   void *object;
 
@@ -106 +105 @@
     /* here is the element of interest */
     object = stack[0].object[i];
-    RemoveStackEntry (i);
+    RemoveStackEntry (stack, i);
     UnlockStack (stack); 
     return (object);
@@ -117 +116 @@
 void *PullStackByID (Stack *stack, int id) {
 
-  int i, j;
+  int i;
   void *object;
   
@@ -137 +136 @@
 /* should only be called if you know where is a valid entry */
 int RemoveStackEntry (Stack *stack, int where) {
+
+  int i;
 
   if (where < 0) abort();
@@ -152 +153 @@
 }
 
-/* should only be called if manually lock the stack */
-int RemoveStackByID (Stack *stack, int id) {
-
-  int i, j;
+/* should only be called if you manually lock the stack */
+void *RemoveStackByID (Stack *stack, int id) {
+
+  int i;
   void *object;
   
@@ -205 +206 @@
 
 void LockStack (Stack *stack) {
+# ifdef THREADED
+  pthread_mutex_lock (&stack[0].mutex);
+# endif
   return;
 }
 
 void UnlockStack (Stack *stack) {
+# ifdef THREADED
+  pthread_mutex_unlock (&stack[0].mutex);
+# endif
   return;
 }
-
-// Safe with PTHREAD_MUTEX_INITIALIZER lock