Changeset 11921 for trunk

Timestamp:

08/31/11 15:13:49 (13 years ago)

Author:

tbretz

Message:

Added a second argument to AsyncRead to be able to propagate a counter; for the moment switched DEBUG_TX on; only try to close the connection if it is not open

Location:

trunk/FACT++/src

Files:

• ConnectionUSB.cc (modified) (3 diffs)
• ConnectionUSB.h (modified) (2 diffs)

trunk/FACT++/src/ConnectionUSB.cc

@@ -18 +18 @@
 using ba::serial_port_base;
 
-//#define DEBUG_TX
+#define DEBUG_TX
 
     // -------- Abbreviations for starting async tasks ---------
@@ -30 +30 @@
 }
 
-void ConnectionUSB::AsyncRead(const ba::mutable_buffers_1 buffers, int type)
+void ConnectionUSB::AsyncRead(const ba::mutable_buffers_1 buffers, int type, int counter)
 {
     ba::async_read(*this, buffers,
                    boost::bind(&ConnectionUSB::HandleReceivedData, this,
-                               dummy::error, dummy::bytes_transferred, type));
+                               dummy::error, dummy::bytes_transferred, type, counter));
 }
 
@@ -77 +77 @@
         Error("Cancel async requests on "+URL()+": "+ec.message());
 
-    close(ec);
-    if (!ec)
-        Error("Closing "+URL()+": "+ec.message());
+    if (IsConnected())
+    {
+        close(ec);
+        if (!ec)
+            Error("Closing "+URL()+": "+ec.message());
+    }
 
     // Reset the connection status

trunk/FACT++/src/ConnectionUSB.h

@@ -46 +46 @@
     // -------- Abbreviations for starting async tasks ---------
 
-    void AsyncRead(const boost::asio::mutable_buffers_1 buffers, int type=0);
+    void AsyncRead(const boost::asio::mutable_buffers_1 buffers, int type=0, int counter=0);
     void AsyncWrite(const boost::asio::const_buffers_1 &buffers);
     void AsyncWait(boost::asio::deadline_timer &timer, int millisec,
@@ -95 +95 @@
     // ------------------------ others --------------------------
 
-    virtual void HandleReceivedData(const boost::system::error_code&, size_t, int = 0) { }
+    virtual void HandleReceivedData(const boost::system::error_code&, size_t, int = 0, int = 0) { }
     virtual void HandleTransmittedData(size_t) { }
     virtual void HandleReadTimeout(const boost::system::error_code&) { }