X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fsession.hpp;h=52c2d3efe6326025074ed9508565756d7fd00ff2;hb=a27375762602ee41a01282b59aae617c0764b38b;hp=c157ffd9647a60f4ca7181f44aa3f26c27cbfdb2;hpb=7969e482bd427717e116917116e52958432a9c16;p=metaproxy-moved-to-github.git

diff --git a/src/session.hpp b/src/session.hpp
index c157ffd..52c2d3e 100644
--- a/src/session.hpp
+++ b/src/session.hpp
@@ -2,37 +2,63 @@
 #ifndef SESSION_HPP
 #define SESSION_HPP
 
-#include <stdexcept>
-
+//#include <stdexcept>
 
 #include <boost/thread/mutex.hpp>
 
 namespace yp2 {
-
-  class Session 
+    
+    class Session
     {
+        //typedef unsigned long type;
     public:
-      Session() : m_id(0){};
-      /// returns next id, global state of id protected by boost::mutex
-      long unsigned int id() {
-          boost::mutex::scoped_lock scoped_lock(m_mutex);
-          ++m_id;
-        return m_id;
-      };
+        
+        /// create new session with new unique id
+        Session() {
+            boost::mutex::scoped_lock scoped_lock(m_mutex);
+            ++m_global_id;
+            m_id =  m_global_id;
+            m_close = false;
+        };
+        
+        /// copy session including old id
+        Session(const Session &s) : m_id(s.m_id), m_close(s.m_close) {};
+        
+        Session& operator=(const Session &s) {
+            if (this != &s)
+            {
+                m_id = s.m_id;
+                m_close = s.m_close;
+            }
+            return *this;
+        }
+        
+        unsigned long id() const {
+            return m_id;
+        };
+        
+        bool is_closed() const {
+            return m_close;
+        };
+        
+        /// mark session closed, can not be unset
+        void close() {
+            m_close = true;
+        };
+        
     private:
-      /// disabled because class is singleton
-      Session(const Session &);
-
-      /// disabled because class is singleton
-      Session& operator=(const Session &);
-
-      boost::mutex m_mutex;
-      unsigned long int m_id;
-      
+        
+        unsigned long int m_id;
+        bool m_close;
+        
+        /// static mutex to lock static m_id
+        static boost::mutex m_mutex;
+        
+        /// static m_id to make sure that there is only one id counter
+        static unsigned long int m_global_id;
+        
     };
-
-
-  
+    
 }
 
 #endif