Removed unused functions

Removed unused Thread and Socket functions
- These functions also cause problems with Solaris compilations
Remove unused client connector functionality


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@680833 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 5 insertions, 100 deletions

diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
index e094e13fff..5e8596cacb 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -48,7 +48,6 @@ ConnectionImpl::ConnectionImpl(framing::ProtocolVersion v, const ConnectionSetti
     handler.onClose = boost::bind(&ConnectionImpl::closed, this,
                                   NORMAL, std::string());
     connector->setInputHandler(&handler);
-    connector->setTimeoutHandler(this);
     connector->setShutdownHandler(this);
 
     //only set error handler once  open
diff --git a/cpp/src/qpid/client/Connector.cpp b/cpp/src/qpid/client/Connector.cpp
index 793809fc7c..b6fc42a74a 100644
--- a/cpp/src/qpid/client/Connector.cpp
+++ b/cpp/src/qpid/client/Connector.cpp
@@ -133,55 +133,6 @@ void Connector::handleClosed() {
         shutdownHandler->shutdown();
 }
 
-// TODO: astitcher 20070908: This version of the code can never time out, so the idle processing
-// can never be called. The timeut processing needs to be added into the underlying Dispatcher code
-//
-// TODO: astitcher 20070908: EOF is dealt with separately now via a callback to eof
-void Connector::checkIdle(ssize_t status){
-    if(timeoutHandler){
-        AbsTime t = now();
-        if(status == Socket::SOCKET_TIMEOUT) {
-            if(idleIn && (Duration(lastIn, t) > idleIn)){
-                timeoutHandler->idleIn();
-            }
-        }
-        else if(status == 0 || status == Socket::SOCKET_EOF) {
-            handleClosed();
-        }
-        else {
-            lastIn = t;
-        }
-        if(idleOut && (Duration(lastOut, t) > idleOut)){
-            timeoutHandler->idleOut();
-        }
-    }
-}
-
-void Connector::setReadTimeout(uint16_t t){
-    idleIn = t * TIME_SEC;//t is in secs
-    if(idleIn && (!timeout || idleIn < timeout)){
-        timeout = idleIn;
-        setSocketTimeout();
-    }
-
-}
-
-void Connector::setWriteTimeout(uint16_t t){
-    idleOut = t * TIME_SEC;//t is in secs
-    if(idleOut && (!timeout || idleOut < timeout)){
-        timeout = idleOut;
-        setSocketTimeout();
-    }
-}
-
-void Connector::setSocketTimeout(){
-    socket.setTimeout(timeout);
-}
-
-void Connector::setTimeoutHandler(TimeoutHandler* handler){
-    timeoutHandler = handler;
-}
-
 struct Connector::Buff : public AsynchIO::BufferBase {
     Buff(size_t size) : AsynchIO::BufferBase(new char[size], size) {}    
     ~Buff() { delete [] bytes;}
diff --git a/cpp/src/qpid/client/Connector.h b/cpp/src/qpid/client/Connector.h
index c7f5be0936..cde12f7b5b 100644
--- a/cpp/src/qpid/client/Connector.h
+++ b/cpp/src/qpid/client/Connector.h
@@ -116,9 +116,6 @@ class Connector : public framing::OutputHandler,
     sys::AsynchIO* aio;
     boost::shared_ptr<sys::Poller> poller;
 
-    void checkIdle(ssize_t status);
-    void setSocketTimeout();
-
     void run();
     void handleClosed();
     bool closeInternal();
@@ -141,13 +138,10 @@ class Connector : public framing::OutputHandler,
     virtual void init();
     virtual void close();
     virtual void setInputHandler(framing::InputHandler* handler);
-    virtual void setTimeoutHandler(sys::TimeoutHandler* handler);
     virtual void setShutdownHandler(sys::ShutdownHandler* handler);
     virtual sys::ShutdownHandler* getShutdownHandler() { return shutdownHandler; }
     virtual framing::OutputHandler* getOutputHandler();
     virtual void send(framing::AMQFrame& frame);
-    virtual void setReadTimeout(uint16_t timeout);
-    virtual void setWriteTimeout(uint16_t timeout);
     const std::string& getIdentifier() const { return identifier; }
 };
 
diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/src/qpid/sys/Socket.h
index 9a1e0afc77..45a8bb588e 100644
--- a/cpp/src/qpid/sys/Socket.h
+++ b/cpp/src/qpid/sys/Socket.h
@@ -21,6 +21,7 @@
  * under the License.
  *
  */
+
 #include "IOHandle.h"
 
 #include <string>
@@ -51,17 +52,6 @@ public:
 
     void close() const;
 
-    enum { SOCKET_TIMEOUT=-2, SOCKET_EOF=-3 } ErrorCode;
-
-    /** Returns bytes sent or an ErrorCode value < 0. */
-    ssize_t send(const void* data, size_t size) const;
-
-    /**
-     * Returns bytes received, an ErrorCode value < 0 or 0
-     * if the connection closed in an orderly manner.
-     */
-    ssize_t recv(void* data, size_t size) const;
-
     /** Bind to a port and start listening.
      *@param port 0 means choose an available port.
      *@param backlog maximum number of pending connections.
diff --git a/cpp/src/qpid/sys/posix/Socket.cpp b/cpp/src/qpid/sys/posix/Socket.cpp
index c742b08c64..65345219f0 100644
--- a/cpp/src/qpid/sys/posix/Socket.cpp
+++ b/cpp/src/qpid/sys/posix/Socket.cpp
@@ -167,31 +167,6 @@ Socket::close() const
     socket = -1;
 }
 
-ssize_t
-Socket::send(const void* data, size_t size) const
-{
-    const int& socket = impl->fd;
-    ssize_t sent = ::send(socket, data, size, 0);
-    if (sent < 0) {
-        if (errno == ECONNRESET) return SOCKET_EOF;
-        if (errno == ETIMEDOUT) return SOCKET_TIMEOUT;
-        throw QPID_POSIX_ERROR(errno);
-    }
-    return sent;
-}
-
-ssize_t
-Socket::recv(void* data, size_t size) const
-{
-    const int& socket = impl->fd;
-    ssize_t received = ::recv(socket, data, size, 0);
-    if (received < 0) {
-        if (errno == ETIMEDOUT) return SOCKET_TIMEOUT;
-        throw QPID_POSIX_ERROR(errno);
-    }
-    return received;
-}
-
 int Socket::listen(uint16_t port, int backlog) const
 {
     const int& socket = impl->fd;
diff --git a/cpp/src/qpid/sys/posix/Thread.h b/cpp/src/qpid/sys/posix/Thread.h
index 7d51ec73aa..dae2b5ca11 100644
--- a/cpp/src/qpid/sys/posix/Thread.h
+++ b/cpp/src/qpid/sys/posix/Thread.h
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "check.h"
 #include <pthread.h>
 
@@ -40,8 +44,6 @@ class Thread
      */
     static unsigned long logId() { return current().id(); }
 
-    inline static void yield();
-
     inline Thread();
     inline explicit Thread(qpid::sys::Runnable*);
     inline explicit Thread(qpid::sys::Runnable&);
@@ -82,11 +84,5 @@ Thread Thread::current() {
     return Thread(pthread_self());
 }
 
-void Thread::yield() 
-{
-    QPID_POSIX_ASSERT_THROW_IF(pthread_yield());
-}
-
-
 }}
 #endif  /*!_sys_posix_Thread_h*/