Changeset 7417

Timestamp:

01/13/08 13:41:11

Author:

michaelld

Message:

Merged OSX fixes for 10.5 (backwards compatible with 10.4 if not
earlier) for USRP legacy fast-usb code from r7358 branch into trunk:

Fixed DEBUG commands in all files.
Fixed flow control between originating and spawned threads.
Fixed WritePipeAsync? buffer write size.
Added in debugging comments to fusb code, to better track async flow.

NOT YET updated for MacOS X 10.5-specific IOKit code, but everything
seems to work just fine as is.

Files:

• gnuradio/trunk/usrp/host/lib/legacy/circular_buffer.h (modified) (9 diffs)
• gnuradio/trunk/usrp/host/lib/legacy/circular_linked_list.h (modified) (4 diffs)
• gnuradio/trunk/usrp/host/lib/legacy/fusb_darwin.cc (modified) (15 diffs)
• gnuradio/trunk/usrp/host/lib/legacy/mld_threads.h (modified) (4 diffs)

gnuradio/trunk/usrp/host/lib/legacy/circular_buffer.h

@@ -27 +27 @@
-#include <stdexcept>
-
+#ifndef DO_DEBUG
-#define DO_DEBUG 0
+#endif
-
-#if DO_DEBUG
@@ -83 +85 @@
-                    "doWriteBlock = %s, doFullRead = %s\n", d_bufLen_I,
-                    (d_doWriteBlock ? "true" : "false"),
-
+;
-  };
-
@@ -151 +153 @@
-    DEBUG (fprintf (stderr, "enqueue: buf = %X, bufLen = %ld, #av_wr = %ld, "
-                    "#av_rd = %ld.\n", (unsigned int)buf, bufLen_I,
-
+;
-    if (bufLen_I > d_bufLen_I) {
-      fprintf (stderr, "cannot add buffer longer (%ld"
@@ -174 +176 @@
-      if (d_doWriteBlock) {
-        while (bufLen_I > d_n_avail_write_I) {
-
+;
-          // wait will automatically unlock() the internal mutex
-          d_writeBlock->wait ();
@@ -180 +182 @@
-          if (d_doAbort) {
-            d_internal->unlock ();
-
+;
-            return (2);
-          }
-
+;
-        }
-      } else {
-        d_n_avail_read_I = d_bufLen_I - bufLen_I;
-        d_n_avail_write_I = bufLen_I;
-
+;
-        retval = -1;
-      }
@@ -234 +236 @@
-    DEBUG (fprintf (stderr, "dequeue: buf = %X, *bufLen = %ld, #av_wr = %ld, "
-                    "#av_rd = %ld.\n", (unsigned int)buf, *bufLen_I,
-
+;
-    if (!bufLen_I)
-      throw std::runtime_error ("circular_buffer::dequeue(): "
@@ -258 +260 @@
-    if (d_doFullRead) {
-      while (d_n_avail_read_I < l_bufLen_I) {
-
+;
-        // wait will automatically unlock() the internal mutex
-        d_readBlock->wait ();
@@ -264 +266 @@
-        if (d_doAbort) {
-          d_internal->unlock ();
-
+;
-          return (2);
-        }
-
+;
-     }
-    } else {
-      while (d_n_avail_read_I == 0) {
-
+;
-        // wait will automatically unlock() the internal mutex
-        d_readBlock->wait ();
@@ -277 +279 @@
-        if (d_doAbort) {
-          d_internal->unlock ();
-
+;
-          return (2);
-        }
-
+;
-      }
-    }

gnuradio/trunk/usrp/host/lib/legacy/circular_linked_list.h

@@ -28 +28 @@
-
-#define __INLINE__ inline
+
+#ifndef DO_DEBUG
-#define DO_DEBUG 0
+#endif
-
-#if DO_DEBUG
@@ -169 +172 @@
-// find an available node
-    s_node_ptr l_node = d_available; 
-
+;
-    while (! l_node) {
-
+;
-      // the ioBlock condition will automatically unlock() d_internal
-      d_ioBlock->wait ();
-      // and lock() is here
-
+;
-      l_node = d_available;
-    }
-    DEBUG (fprintf (stderr, "::f_n_a_n: #u = %ld, node = %p\n",
-
+;
-// remove this one from the current available list
-    if (num_available () == 1) {
@@ -202 +205 @@
-    d_internal->lock ();
-    DEBUG (fprintf (stderr, "::m_n_a: #u = %ld, node = %p\n",
-
+;
-// remove this node from the inUse list
-    if (num_used () == 1) {
@@ -217 +220 @@
-    d_n_used--;
-
-
+;
-// signal the condition when new data arrives
-    d_ioBlock->signal ();
-
+;
-
-// unlock the mutex for thread safety

gnuradio/trunk/usrp/host/lib/legacy/fusb_darwin.cc

@@ -28 +28 @@
-// but rather Darwin's pthreads
-#define _USE_OMNI_THREADS_
+#define DO_DEBUG 0
-
-#include <usb.h>
@@ -191 +192 @@
-             number, interval, maxPacketSize);
-
-
+  
-  d_started = true;
-
-
+
+
+
+
+
-  d_runThread = new mld_thread (run_thread, this);
-
-
+
+
-  d_runBlock->wait ();
-
@@ -211 +217 @@
-{
-  fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(arg);
+
+  // lock the run thread running mutex; if ::stop() is called, it will
+  // first abort() the pipe then wait for the run thread to finish,
+  // via a lock() on this mutex
-  mld_mutex_ptr l_runThreadRunning = This->d_runThreadRunning;
-  l_runThreadRunning->lock ();
@@ -216 +226 @@
-  mld_mutex_ptr l_readRunning = This->d_readRunning;
-  mld_condition_ptr l_readBlock = This->d_readBlock;
+  mld_mutex_ptr l_readBlock_mutex = l_readBlock->mutex ();
-
-  bool l_input_p = This->d_input_p;
@@ -238 +249 @@
-
-  if (l_input_p) {
+    // lock the readBlock mutex, before creating the read thread.
+    // this guarantees that we can control execution between these 2 threads
+    l_readBlock_mutex->lock ();
+    // create the read thread, which just issues all of the starting
+    // async read commands, then returns
-    l_rwThread = new mld_thread (read_thread, arg);
-
+
+
-    l_readBlock->wait ();
-  }
-
-
+
+
+
+
+
+
+
+
+
-  This->d_runBlock->signal ();
-
-
+
+
+
+
-  CFRunLoopRun ();
-
-  if (l_input_p) {
-
+
-    l_readRunning->lock ();
-    l_readRunning->unlock ();
-  }
-
-
+  
-  CFRunLoopRemoveSource (CFRunLoopGetCurrent (),
-                         l_cfSource, kCFRunLoopDefaultMode);
@@ -263 +291 @@
-             l_input_p ? "read" : "write");
-
+  // release the run thread running mutex
-  l_runThreadRunning->unlock ();
-}
@@ -274 +303 @@
-  fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(arg);
-
+  // before doing anything else, lock the read running mutex.  this
+  // mutex does flow control between this thread and the run_thread
-  mld_mutex_ptr l_readRunning = This->d_readRunning;
-  l_readRunning->lock ();
-
-
+
+
+
+
-  mld_condition_ptr l_readBlock = This->d_readBlock;
+  mld_mutex_ptr l_read_block_mutex = l_readBlock->mutex ();
+  l_read_block_mutex->lock ();
+
+  // now that the lock is in place, signal the parent thread that
+  // things are running here
-  l_readBlock->signal ();
-
+  // release the run_block mutex, just in case
+  l_read_block_mutex->unlock ();
+
+  // queue up all of the available read requests
-  s_queue_ptr l_queue = This->d_queue;
-  l_queue->iterate_start ();
@@ -292 +335 @@
-    fprintf (stderr, "fusb_ephandle_darwin::read_thread: finished.\n");
-
+  // release the read running mutex, to let the parent thread knows
+  // that this thread is finished
-  l_readRunning->unlock ();
-}
@@ -298 +343 @@
-fusb_ephandle_darwin::read_issue (s_both_ptr l_both)
-{
-
+
+
+
+
+
-    return;
+  }
-
-// set the node and buffer from the input "both"
@@ -329 +379 @@
-                          d_transferType == kUSBInterrupt ? "" : "TO",
-                          darwin_error_str (result));
+  else if (usb_debug > 4)
+    fprintf (stderr, "fusb_ephandle_darwin::read_issue: "
+             "Queued %X (%ld Bytes)\n", (unsigned int) l_both, bufLen);
-}
-
@@ -348 +401 @@
-             "Expected %ld bytes; read %ld.\n",
-             l_i_size, l_size);
+  else if (usb_debug > 4)
+    fprintf (stderr, "fusb_ephandle_darwin::read_completed: "
+             "Read %X (%ld bytes)\n",
+             (unsigned int) l_both, l_size);
-
-// add this read to the transfer buffer
@@ -379 +436 @@
-  UInt32 l_nbytes = (UInt32) nbytes;
-
-
+
+
+
+
+
+
-
-  while (l_nbytes != 0) {
@@ -401 +463 @@
-/* This is an interrupt pipe ... can't specify a timeout. */
-      result = d_interface->WritePipeAsync
-l
+t
-         (IOAsyncCallback1) write_completed, (void*) l_both);
-    else
-      result = d_interface->WritePipeAsyncTO
-l
+t
-         (IOAsyncCallback1) write_completed, (void*) l_both);
-
@@ -414 +476 @@
-                     d_transferType == kUSBInterrupt ? "" : "TO",
-                     darwin_error_str (result));
+    else if (usb_debug > 4) {
+      fprintf (stderr, "fusb_ephandle_darwin::write_thread: "
+               "Queued %X (%ld Bytes)\n", (unsigned int) l_both, t_nbytes);
+    }
-    l_nbytes -= t_nbytes;
-  }
@@ -437 +503 @@
-             "Expected %ld bytes written; wrote %ld.\n",
-             l_i_size, l_size);
+  else if (usb_debug > 4)
+    fprintf (stderr, "fusb_ephandle_darwin::write_completed: "
+             "Wrote %X (%ld Bytes)\n", (unsigned int) l_both, l_size);
-
-// set buffer's # data to 0

gnuradio/trunk/usrp/host/lib/legacy/mld_threads.h

@@ -38 +38 @@
-
-#define __INLINE__ inline
+
+#ifndef DO_DEBUG
-#define DO_DEBUG 0
+#endif
-
-#if DO_DEBUG
@@ -183 +186 @@
-
-  __INLINE__ void signal () {
-
+;
-
-#ifdef _USE_OMNI_THREADS_
@@ -194 +197 @@
-    }
-#endif
-
+;
-  };
-
-  __INLINE__ void wait () {
-
+;
-#ifdef _USE_OMNI_THREADS_
-    d_condition->wait ();
@@ -208 +211 @@
-    }
-#endif
-printf (stderr, "d ")
+fprintf (stderr, "d ");
-  };
-};