Attachment 648218 Details for Bug 874192 – Proposed fix

[patch] Proposed fix

bz874192.patch (text/plain), 3.59 KB, created by Andrew Stitcher on 2012-11-20 00:24:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Stitcher

Created: 2012-11-20 00:24:00 UTC

Size: 3.59 KB

patch

obsolete

>diff --git a/qpid/cpp/src/qpid/client/TCPConnector.cpp b/qpid/cpp/src/qpid/client/TCPConnector.cpp
>index b92f342..7837427 100644
>--- a/qpid/cpp/src/qpid/client/TCPConnector.cpp
>+++ b/qpid/cpp/src/qpid/client/TCPConnector.cpp
>@@ -151,6 +151,11 @@ void TCPConnector::socketClosed(AsynchIO&, const Socket&) {
>         shutdownHandler->shutdown();
> }
> 
>+void TCPConnector::connectAborted() {
>+    connector->stop();
>+    connectFailed("Connection timedout");
>+}
>+
> void TCPConnector::abort() {
>     // Can't abort a closed connection
>     if (!closed) {
>@@ -159,8 +164,7 @@ void TCPConnector::abort() {
>             aio->requestCallback(boost::bind(&TCPConnector::eof, this, _1));
>         } else if (connector) {
>             // We're still connecting
>-            connector->stop();
>-            connectFailed("Connection timedout");
>+            connector->requestCallback(boost::bind(&TCPConnector::connectAborted, this));
>         }
>     }
> }
>diff --git a/qpid/cpp/src/qpid/client/TCPConnector.h b/qpid/cpp/src/qpid/client/TCPConnector.h
>index a90dffd..63af3b8 100644
>--- a/qpid/cpp/src/qpid/client/TCPConnector.h
>+++ b/qpid/cpp/src/qpid/client/TCPConnector.h
>@@ -80,6 +80,7 @@ class TCPConnector : public Connector, public sys::Codec
>     void close();
>     void send(framing::AMQFrame& frame);
>     void abort();
>+    void connectAborted();
> 
>     void setInputHandler(framing::InputHandler* handler);
>     void setShutdownHandler(sys::ShutdownHandler* handler);
>diff --git a/qpid/cpp/src/qpid/sys/AsynchIO.h b/qpid/cpp/src/qpid/sys/AsynchIO.h
>index 8eed72d..a531ee1 100644
>--- a/qpid/cpp/src/qpid/sys/AsynchIO.h
>+++ b/qpid/cpp/src/qpid/sys/AsynchIO.h
>@@ -58,6 +58,7 @@ class AsynchConnector {
> public:
>     typedef boost::function1<void, const Socket&> ConnectedCallback;
>     typedef boost::function3<void, const Socket&, int, const std::string&> FailedCallback;
>+    typedef boost::function1<void, AsynchConnector&> RequestCallback;
> 
>     // Call create() to allocate a new AsynchConnector object with the
>     // specified poller, addressing, and callbacks.
>@@ -72,6 +73,7 @@ public:
>                                    FailedCallback failCb);
>     virtual void start(boost::shared_ptr<Poller> poller) = 0;
>     virtual void stop() {};
>+    virtual void requestCallback(RequestCallback) = 0;
> protected:
>     AsynchConnector() {}
>     virtual ~AsynchConnector() {}
>diff --git a/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
>index 7eb25fd..2c17cc0 100644
>--- a/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
>+++ b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
>@@ -143,6 +143,7 @@ class AsynchConnector : public qpid::sys::AsynchConnector,
> 
> private:
>     void connComplete(DispatchHandle& handle);
>+    void requestedCall(RequestCallback rCb);
> 
> private:
>     ConnectedCallback connCallback;
>@@ -158,6 +159,7 @@ public:
>                     FailedCallback failCb);
>     void start(Poller::shared_ptr poller);
>     void stop();
>+    void requestCallback(RequestCallback rCb);
> };
> 
> AsynchConnector::AsynchConnector(const Socket& s,
>@@ -191,6 +193,18 @@ void AsynchConnector::stop()
>     stopWatch();
> }
> 
>+void AsynchConnector::requestCallback(RequestCallback callback) {
>+    // TODO creating a function object every time isn't all that
>+    // efficient - if this becomes heavily used do something better (what?)
>+    assert(callback);
>+    DispatchHandle::call(boost::bind(&AsynchConnector::requestedCall, this, callback));
>+}
>+
>+void AsynchConnector::requestedCall(RequestCallback callback) {
>+    assert(callback);
>+    callback(*this);
>+}
>+
> void AsynchConnector::connComplete(DispatchHandle& h)
> {
>     int errCode = socket.getError();

Actions: View | Diff

Attachments on bug 874192: 640226 | 646451 | 646510 | 648218