ChangeLogTag: Mon Dec 06 21:16:53 1999 Irfan Pyarali <irfan@cs.wustl.edu>

1 files changed, 75 insertions, 67 deletions

diff --git a/ace/SOCK_IO.i b/ace/SOCK_IO.i
index db41f079cd7..d46ca3c188f 100644
--- a/ace/SOCK_IO.i
+++ b/ace/SOCK_IO.i
@@ -18,87 +18,72 @@ ACE_SOCK_IO::~ACE_SOCK_IO (void)
 }
 
 ASYS_INLINE ssize_t
-ACE_SOCK_IO::send (const void *buf, size_t n, int flags) const
-{
-  ACE_TRACE ("ACE_SOCK_IO::send");
-  return ACE_OS::send (this->get_handle (), (const char *) buf, n, flags);
-}
-
-// Recv an n byte message from the connected socket.
-
-ASYS_INLINE ssize_t
-ACE_SOCK_IO::recv (void *buf, size_t n, int flags) const
+ACE_SOCK_IO::recv (void *buf,
+                   size_t len,
+                   int flags,
+                   const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_IO::recv");
-  return ACE_OS::recv (this->get_handle (), (char *) buf, n, flags);
+  return ACE::recv (this->get_handle (),
+                    buf,
+                    len,
+                    flags,
+                    timeout);
 }
 
-// Send an n byte message to the connected socket.
-
 ASYS_INLINE ssize_t
-ACE_SOCK_IO::send (const void *buf, size_t n) const
-{
-  ACE_TRACE ("ACE_SOCK_IO::send");
-#if defined (ACE_WIN32)
-  return ACE_OS::send (this->get_handle (), (const char *) buf, n, 0);
-#else
-  return ACE_OS::write (this->get_handle (), (const char *) buf, n);
-#endif /* ACE_WIN32 */
-}
-
-// Recv an n byte message from the connected socket.
-
-ASYS_INLINE ssize_t
-ACE_SOCK_IO::recv (void *buf, size_t n) const
+ACE_SOCK_IO::recv (void *buf,
+                   size_t len,
+                   const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_IO::recv");
-#if defined (ACE_WIN32)
-  return ACE_OS::recv (this->get_handle (), (char *) buf, n, 0);
-#else
-  return ACE_OS::read (this->get_handle (), (char *) buf, n);
-#endif /* ACE_WIN32 */
+  return ACE::recv (this->get_handle (),
+                    buf,
+                    len,
+                    timeout);
 }
 
-// Send a vector of n byte messages to the connected socket.
-
 ASYS_INLINE ssize_t
-ACE_SOCK_IO::sendv (const iovec iov[], size_t n) const
+ACE_SOCK_IO::recvv (iovec iov[],
+                    size_t n,
+                    const ACE_Time_Value *timeout) const
 {
-  ACE_TRACE ("ACE_SOCK_IO::sendv");
-  return ACE_OS::sendv (this->get_handle (), iov, n);
+  ACE_TRACE ("ACE_SOCK_IO::recvv");
+  return ACE::recvv (this->get_handle (),
+                     iov,
+                     n,
+                     timeout);
 }
 
 ASYS_INLINE ssize_t
-ACE_SOCK_IO::send (const iovec iov[], size_t n) const
+ACE_SOCK_IO::recv (iovec iov[],
+                   size_t n,
+                   const ACE_Time_Value *timeout) const
 {
-  ACE_TRACE ("ACE_SOCK_IO::send");
-  return this->sendv (iov, n);
+  ACE_TRACE ("ACE_SOCK_IO::recv");
+  return this->recvv (iov,
+                      n,
+                      timeout);
 }
 
 ASYS_INLINE ssize_t
 ACE_SOCK_IO::recv (iovec *io_vec,
-                   const ACE_Time_Value *timeout)
+                   const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_IO::recv");
-  return this->recvv (io_vec, timeout);
+  return this->recvv (io_vec,
+                      timeout);
 }
 
 ASYS_INLINE ssize_t
-ACE_SOCK_IO::send (const void *buf, size_t n,
-                   ACE_OVERLAPPED *overlapped) const
-{
-  ACE_TRACE ("ACE_SOCK_IO::send");
-  return ACE_OS::write (this->get_handle (),
-                        (const char *) buf, n,
-                        overlapped);
-}
-
-ASYS_INLINE ssize_t
-ACE_SOCK_IO::recv (void *buf, size_t n,
+ACE_SOCK_IO::recv (void *buf,
+                   size_t n,
                    ACE_OVERLAPPED *overlapped) const
 {
   ACE_TRACE ("ACE_SOCK_IO::recv");
-  return ACE_OS::read (this->get_handle (), (char *) buf, n,
+  return ACE_OS::read (this->get_handle (),
+                       (char *) buf,
+                       n,
                        overlapped);
 }
 
@@ -109,33 +94,56 @@ ACE_SOCK_IO::send (const void *buf,
                    const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_IO::send");
-  return ACE::send (this->get_handle (), buf, len, flags, timeout);
+  return ACE::send (this->get_handle (),
+                    buf,
+                    len,
+                    flags,
+                    timeout);
 }
 
 ASYS_INLINE ssize_t
-ACE_SOCK_IO::recv (void *buf,
+ACE_SOCK_IO::send (const void *buf,
                    size_t len,
                    const ACE_Time_Value *timeout) const
 {
-  ACE_TRACE ("ACE_SOCK_IO::recv");
-  return ACE::recv (this->get_handle (), buf, len, timeout);
+  ACE_TRACE ("ACE_SOCK_IO::send");
+  return ACE::send (this->get_handle (),
+                    buf,
+                    len,
+                    timeout);
 }
 
 ASYS_INLINE ssize_t
-ACE_SOCK_IO::send (const void *buf,
-                   size_t len,
+ACE_SOCK_IO::sendv (const iovec iov[],
+                    size_t n,
+                    const ACE_Time_Value *timeout) const
+{
+  ACE_TRACE ("ACE_SOCK_IO::sendv");
+  return ACE::sendv (this->get_handle (),
+                     iov,
+                     n,
+                     timeout);
+}
+
+ASYS_INLINE ssize_t
+ACE_SOCK_IO::send (const iovec iov[],
+                   size_t n,
                    const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_IO::send");
-  return ACE::send (this->get_handle (), buf, len, timeout);
+  return this->sendv (iov,
+                      n,
+                      timeout);
 }
 
 ASYS_INLINE ssize_t
-ACE_SOCK_IO::recv (void *buf,
-                   size_t len,
-                   int flags,
-                   const ACE_Time_Value *timeout) const
+ACE_SOCK_IO::send (const void *buf,
+                   size_t n,
+                   ACE_OVERLAPPED *overlapped) const
 {
-  ACE_TRACE ("ACE_SOCK_IO::recv");
-  return ACE::recv (this->get_handle (), buf, len, flags, timeout);
+  ACE_TRACE ("ACE_SOCK_IO::send");
+  return ACE_OS::write (this->get_handle (),
+                        (const char *) buf,
+                        n,
+                        overlapped);
 }