X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FFileHandle.ih;h=b13f2feac59ebd4913ed69055232388e8c8128cd;hb=532240d72e09e19e57fac9bb55c2560b9c9e5b97;hp=cdc775debde9ff512edad6add84ad132f6ee781e;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git

diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index cdc775d..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>
@@ -85,6 +85,10 @@ namespace senf {
                                            resulting body/handle is not valid() */
         virtual ~FileBody();
 
+        // 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
 
@@ -98,11 +102,14 @@ namespace senf {
 
         void close();
         void terminate();
+        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);
@@ -135,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_;
     };