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

1 files changed, 31 insertions, 27 deletions

diff --git a/ace/ACE.i b/ace/ACE.i
index a7f6e541661..8d69ea3a139 100644
--- a/ace/ACE.i
+++ b/ace/ACE.i
@@ -8,33 +8,20 @@ ACE::read_n (ACE_HANDLE handle,
              void *buf,
              size_t len)
 {
-  ACE_TRACE ("ACE::read_n");
   return ACE_OS::read_n (handle, buf, len);
 }
 
 ASYS_INLINE ssize_t
-ACE::send_n (ACE_HANDLE handle, const void *buf, size_t len)
-{
-  ACE_TRACE ("ACE::send_n");
-  return ACE_OS::send_n (handle, buf, len);
-}
-
-ASYS_INLINE ssize_t
 ACE::write_n (ACE_HANDLE handle,
               const void *buf,
               size_t len)
 {
-  ACE_TRACE ("ACE::write_n");
   return ACE_OS::write_n (handle, buf, len);
 }
 
-// Miscellaneous static methods used throughout ACE.
-
 ASYS_INLINE ssize_t
-ACE::send (ACE_HANDLE handle, const void *buf, size_t len)
+ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len)
 {
-  ACE_TRACE ("ACE::send");
-
 #if defined (ACE_WIN32) || defined (ACE_PSOS)
   return ACE_OS::send (handle, (const char *) buf, len);
 #else
@@ -43,16 +30,8 @@ ACE::send (ACE_HANDLE handle, const void *buf, size_t len)
 }
 
 ASYS_INLINE ssize_t
-ACE::send (ACE_HANDLE handle, const void *buf, size_t len, int flags)
-{
-  ACE_TRACE ("ACE::send");
-  return ACE_OS::send (handle, (const char *) buf, len, flags);
-}
-
-ASYS_INLINE ssize_t
-ACE::recv (ACE_HANDLE handle, void *buf, size_t len)
+ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len)
 {
-  ACE_TRACE ("ACE::recv");
 #if defined (ACE_WIN32) || defined (ACE_PSOS)
     return ACE_OS::recv (handle, (char *) buf, len);
 #else
@@ -60,12 +39,37 @@ ACE::recv (ACE_HANDLE handle, void *buf, size_t len)
 #endif /* ACE_WIN32 */
 }
 
-ASYS_INLINE ssize_t
-ACE::recv (ACE_HANDLE handle, void *buf, size_t len, int flags)
+ASYS_INLINE int
+ACE::handle_read_ready (ACE_HANDLE handle,
+                        const ACE_Time_Value *timeout)
 {
-  ACE_TRACE ("ACE::recv");
+  return ACE::handle_ready (handle,
+                            timeout,
+                            1,
+                            0,
+                            0);
+}
 
-  return ACE_OS::recv (handle, (char *) buf, len, flags);
+ASYS_INLINE int
+ACE::handle_write_ready (ACE_HANDLE handle,
+                         const ACE_Time_Value *timeout)
+{
+  return ACE::handle_ready (handle,
+                            timeout,
+                            0,
+                            1,
+                            0);
+}
+
+ASYS_INLINE int
+ACE::handle_exception_ready (ACE_HANDLE handle,
+                             const ACE_Time_Value *timeout)
+{
+  return ACE::handle_ready (handle,
+                            timeout,
+                            0,
+                            0,
+                            1);
 }
 
 ASYS_INLINE char *