X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FFileHandle.cci;h=6db39f59ebc152913baa09ce9539402dd7a0e9dd;hb=3863d46dd898b7bc35ea8c6ccd8563b18762a6b6;hp=79308aee6ee4ff85d688a4ef95ad98eb36c87393;hpb=31243b46fbd06bc6301acca8fbd8153829c61b0a;p=senf.git

diff --git a/Socket/FileHandle.cci b/Socket/FileHandle.cci
index 79308ae..6db39f5 100644
--- a/Socket/FileHandle.cci
+++ b/Socket/FileHandle.cci
@@ -72,30 +72,58 @@ prefix_ bool senf::FileBody::valid()
 prefix_ bool senf::FileBody::readable()
     const
 {
-    return pollCheck(fd(),true);
+    return pollCheck(fd(),true,0);
 }
 
-prefix_ void senf::FileBody::waitReadable()
+prefix_ bool senf::FileBody::waitReadable(senf::ClockService::clock_type timeout)
     const
 {
-    pollCheck(fd(),true,true);
+    return pollCheck(fd(), true, 
+                     (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)) );
 }
 
 prefix_ bool senf::FileBody::writeable()
     const
 {
-    return pollCheck(fd(),false);
+    return pollCheck(fd(),false,0);
 }
 
-prefix_ void senf::FileBody::waitWriteable()
+prefix_ bool senf::FileBody::waitWriteable(senf::ClockService::clock_type timeout)
     const
 {
-    pollCheck(fd(),false,true);
+    return pollCheck(fd(), false, 
+                     (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)) );
+}
+
+prefix_ bool senf::FileBody::oobReadable()
+    const
+{
+    return pollCheck(fd(),true,0,true);
+}
+
+prefix_ bool senf::FileBody::waitOOBReadable(senf::ClockService::clock_type timeout)
+    const
+{
+    return pollCheck(fd(), true, 
+                     (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)), true);
 }
 
 ///////////////////////////////////////////////////////////////////////////
 // senf::FileHandle
 
+prefix_ senf::FileBody & senf::FileHandle::body()
+{
+    SENF_ASSERT(body_);
+    return *body_;
+}
+
+prefix_ senf::FileBody const & senf::FileHandle::body()
+    const
+{
+    SENF_ASSERT(body_);
+    return *body_;
+}
+
 prefix_ void senf::FileHandle::close()
 {
     body().close();
@@ -112,10 +140,10 @@ prefix_ bool senf::FileHandle::readable()
     return body().readable();
 }
 
-prefix_ void senf::FileHandle::waitReadable()
+prefix_ bool senf::FileHandle::waitReadable(senf::ClockService::clock_type timeout)
     const
 {
-    body().waitReadable();
+    return body().waitReadable(timeout);
 }
 
 prefix_ bool senf::FileHandle::writeable()
@@ -124,10 +152,22 @@ prefix_ bool senf::FileHandle::writeable()
     return body().writeable();
 }
 
-prefix_ void senf::FileHandle::waitWriteable()
+prefix_ bool senf::FileHandle::waitWriteable(senf::ClockService::clock_type timeout)
     const
 {
-    body().waitWriteable();
+    return body().waitWriteable(timeout);
+}
+
+prefix_ bool senf::FileHandle::oobReadable()
+    const
+{
+    return body().oobReadable();
+}
+
+prefix_ bool senf::FileHandle::waitOOBReadable(senf::ClockService::clock_type timeout)
+    const
+{
+    return body().waitOOBReadable(timeout);
 }
 
 prefix_ bool senf::FileHandle::blocking()
@@ -183,19 +223,6 @@ prefix_ senf::FileHandle::FileHandle(FileBody::ptr body)
     : body_(body)
 {}
 
-prefix_ senf::FileBody & senf::FileHandle::body()
-{
-    SENF_ASSERT(body_);
-    return *body_;
-}
-
-prefix_ senf::FileBody const & senf::FileHandle::body()
-    const
-{
-    SENF_ASSERT(body_);
-    return *body_;
-}
-
 prefix_ senf::FileBody & senf::FileHandle::body(FileHandle & handle)
 {
     return handle.body();