From 7f8c73faa22aaf2a381193d9f460857785e45023 Mon Sep 17 00:00:00 2001
From: Thomas Tsou <ttsou@vt.edu>
Date: Fri, 27 Aug 2010 15:59:05 -0700
Subject: usrp1: Handle degenerate managed send buffer cases

Handle degenerate usage of send buffer commits. If the buffer
is destroyed without ever being submitted, submit a zero byte
transfer to return control to the underlying structure. If a
committed buffer is re-committed, then report an error message
and return 0 bytes back.
---
 host/lib/transport/libusb1_zero_copy.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'host/lib')

diff --git a/host/lib/transport/libusb1_zero_copy.cpp b/host/lib/transport/libusb1_zero_copy.cpp
index 2149625f9..4469991b8 100644
--- a/host/lib/transport/libusb1_zero_copy.cpp
+++ b/host/lib/transport/libusb1_zero_copy.cpp
@@ -555,7 +555,7 @@ public:
     libusb_managed_send_buffer_impl(libusb_transfer *lut,
                                     usb_endpoint *endpoint,
                                     size_t buff_size)
-        : _buff(lut->buffer, buff_size)
+        : _buff(lut->buffer, buff_size), _committed(false)
     {
         _lut = lut;
         _endpoint = endpoint;
@@ -563,18 +563,32 @@ public:
 
     ~libusb_managed_send_buffer_impl()
     {
-        /* NOP */
+        if (!_committed) {
+            _lut->length = 0;
+            _lut->actual_length = 0;
+            _endpoint->submit(_lut);
+        }
     }
 
     ssize_t commit(size_t num_bytes)
     {
+        if (_committed) {
+            std::cerr << "UHD: send buffer already committed" << std::endl;
+            return 0;
+        }
+        
+        UHD_ASSERT_THROW(num_bytes <= boost::asio::buffer_size(_buff));
+
         _lut->length = num_bytes;
         _lut->actual_length = 0;
 
-        if (_endpoint->submit(_lut))
+        if (_endpoint->submit(_lut)) {
+            _committed = true;
             return num_bytes;
-        else
+        }
+        else {
             return 0;
+        }
     }
 
 private:
@@ -586,6 +600,7 @@ private:
     libusb_transfer *_lut;
     usb_endpoint *_endpoint;
     const boost::asio::mutable_buffer _buff;
+    bool _committed;
 };
 
 
-- 
cgit v1.2.3