X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FFileHandle.ih;h=e87e3192b829a8ea618dd5b858df95d0ebe1ce5a;hb=034f9bec0a66d26314fb6ebc83dedf1618a2c19d;hp=380b39f484c9d93b46db078b88175c1ebae55e0f;hpb=145f6a7d0f3a6aaa77b3625351c952d24cb0b8a1;p=senf.git

diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index 380b39f..e87e319 100644
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -29,18 +29,20 @@
 
 // Custom includes
 #include <boost/intrusive_ptr.hpp>
-#include "Utils/intrusive_refcount.hh"
+#include "../Utils/intrusive_refcount.hh"
+#include "../Utils/pool_alloc_mixin.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
 namespace senf {
 
+    class FileHandle;
 
     /** \brief FileHandle referenced body
 
         \internal
 
-        The senf::FileBody class formes the body part of the handle/body structure of the FileHandle
+        The senf::FileBody class forms the body part of the handle/body structure of the FileHandle
         interface. It manages the FileHandle data and is referenced by senf::FileHandle. It is
         automatically managed using reference counting.
 
@@ -59,9 +61,12 @@ namespace senf {
         basic functionality which is only used infrequently during the lifetime of a FileHandle
         instance.
 
+        \attention Whenever a new class is derived from FileBody which adds new members, this class
+            \e must also derive from senf::pool_alloc_mixin
       */
     class FileBody
-        : public senf::intrusive_refcount
+        : public senf::intrusive_refcount, 
+          public senf::pool_alloc_mixin<FileBody>
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
@@ -78,7 +83,10 @@ 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 copy
         // no conversion constructors
@@ -86,11 +94,14 @@ namespace senf {
         ///@}
         ///////////////////////////////////////////////////////////////////////////
 
+        FileHandle handle();
+
         int fd() const;
         void fd(int fd);
 
         void close();
         void terminate();
+        void destroyClose();
 
         bool readable() const;
         void waitReadable() const;