Changeset 23530 for trunk/Ohana/src/opihi/pantasks/InputQueue.c

Timestamp:

Mar 25, 2009, 11:56:09 AM (17 years ago)

Author:

eugene

Message:

upgrade threading/locking model for pantasks: changes merged from eam_branch_20090322

File:

• trunk/Ohana/src/opihi/pantasks/InputQueue.c (modified) (6 diffs)

trunk/Ohana/src/opihi/pantasks/InputQueue.c

@@ -1 +1 @@
 # include "pantasks.h"
+// we use fprintf for DEBUG statements to avoid deadlocking issues
 
 static int Ninputs = 0;
@@ -23 +24 @@
 void AddNewInput (char *input) {
 
+  // XXX define the InputMutex
   SerialThreadLock ();
-  if (DEBUG) gprint (GP_LOG, "adding a new input (%s)\n", input);
+
+  if (DEBUG) fprintf (stderr, "adding a new input (%s)\n", input);
   inputs[Ninputs] = input;
   Ninputs ++;
@@ -31 +34 @@
     REALLOCATE (inputs, char *, NINPUTS);
   }
-  if (DEBUG) gprint (GP_LOG, "done new input (%s)\n", input);
+  if (DEBUG) fprintf (stderr, "done new input (%s)\n", input);
   SerialThreadUnlock ();
 }
@@ -40 +43 @@
   int i, j;
 
-  if (DEBUG) gprint (GP_LOG, "deleting an input (%s)\n", input);
+  if (DEBUG) fprintf (stderr, "deleting an input (%s)\n", input);
+
+  // XXX lock here
   for (i = 0; i < Ninputs; i++) {
     if (inputs[i] == input) {
@@ -52 +57 @@
         REALLOCATE (inputs, char *, NINPUTS);
       }
-      if (DEBUG) gprint (GP_LOG, "deleted an input\n");
+      // XXX unlock here
+      if (DEBUG) fprintf (stderr, "deleted an input\n");
       return TRUE;
     }
   }
   // did not find the input
+  // XXX unlock here
   return FALSE;
 }
@@ -66 +73 @@
   char *input, *line, *outline, tmp;
 
-  if (Ninputs < 1) return;
+  // XXX lock here
+  if (Ninputs < 1) {
+    // XXX unlock here
+    return;
+  }
 
   input = inputs[0];
-  if (DEBUG) gprint (GP_LOG, "got an input (%s)\n", input);
+  if (DEBUG) fprintf (stderr, "got an input (%s)\n", input);
   
   Nbytes = snprintf (&tmp, 0, "input %s", input);
   ALLOCATE (line, char, Nbytes + 1);
   snprintf (line, Nbytes + 1, "input %s", input);
+  // XXX unlock here
 
   status = command (line, &outline, TRUE);