X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FFileHandle.ih;h=b13f2feac59ebd4913ed69055232388e8c8128cd;hb=a1fdb7bb122f0b05be809a922d4b7ef5e125fa67;hp=e87e3192b829a8ea618dd5b858df95d0ebe1ce5a;hpb=31243b46fbd06bc6301acca8fbd8153829c61b0a;p=senf.git

diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index e87e319..b13f2fe 100644
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -24,8 +24,8 @@
     \brief FileHandle internal header
  */
 
-#ifndef IH_FileHandle_
-#define IH_FileHandle_ 1
+#ifndef IH_SENF_Socket_FileHandle_
+#define IH_SENF_Socket_FileHandle_ 1
 
 // Custom includes
 #include <boost/intrusive_ptr.hpp>
@@ -83,10 +83,11 @@ namespace senf {
                                            constructor not some arbitrary id even if you overload
                                            all the virtual members. If the file descriptor is -1 the
                                            resulting body/handle is not valid() */
+        virtual ~FileBody();
 
-        // NO DESTRUCTOR HERE - destructors and virtual functions don't mix. What would be in the
-        // the destructor is in 'destroyClose()' which is called from FileHandle::~FileHandle()
-        // *before* the last handle dies.
+        // NO DESTRUCTOR HERE (that is, only an empty virtual destructor) - destructors and virtual
+        // functions don't mix. What would be in the the destructor is in 'destroyClose()' which is
+        // called from FileHandle::~FileHandle() *before* the last handle dies.
 
         // no copy
         // no conversion constructors
@@ -104,9 +105,11 @@ namespace senf {
         void destroyClose();
 
         bool readable() const;
-        void waitReadable() const;
+        bool waitReadable(senf::ClockService::clock_type timeout) const;
         bool writeable() const;
-        void waitWriteable() const;
+        bool waitWriteable(senf::ClockService::clock_type timeout) const;
+        bool oobReadable() const;
+        bool waitOOBReadable(senf::ClockService::clock_type timeout) const;
 
         bool blocking() const;
         void blocking(bool status);
@@ -139,7 +142,7 @@ namespace senf {
     protected:
 
     private:
-        bool pollCheck(int fd, bool incoming, bool block=false) const;
+        bool pollCheck(int fd, bool incoming, int timeout, bool oob=false) const;
 
         int fd_;
     };