Adjust Session class and include close state in it.

diff --git a/src/session.hpp b/src/session.hpp
index d357463..08301a7 100644 (file)
--- a/src/session.hpp
+++ b/src/session.hpp
@@ -8,37 +8,55 @@
 
 namespace yp2 {
 
-  class Session 
+    class Session
     {
+        //typedef unsigned long type;
     public:
-      //Session() {};
-
-      /// 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;
-      };
-    private:
-      // disabled because class is singleton
-      // Session(const Session &);
-
-      // disabled because class is singleton
-      // Session& operator=(const Session &);
-
-      /// 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_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 &);
+        
+        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:
+
+        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;
+        
     };
-  
+    
 }
 
 // defining and initializing static members
 boost::mutex yp2::Session::m_mutex;
-unsigned long int yp2::Session::m_id = 0;
+unsigned long int yp2::Session::m_global_id = 0;
 
 
 #endif

diff --git a/src/test_session1.cpp b/src/test_session1.cpp
index 14d6cf0..f2ba77e 100644 (file)
--- a/src/test_session1.cpp
+++ b/src/test_session1.cpp
@@ -13,20 +13,15 @@ BOOST_AUTO_TEST_CASE( testsession1 )
 
     // test session 
     try {
-        yp2::Session session;
+        yp2::Session session1;
+        yp2::Session session2;
+        yp2::Session session3;
+        yp2::Session session4;
+        yp2::Session session5;
         unsigned long int id;
-        id = session.id();
-        id = session.id();
-        id = session.id();
-        id = session.id();
-        id = session.id();
-        id = session.id();
-        id = session.id();
-        id = session.id();
-        id = session.id();
-        id = session.id();
+        id = session5.id();
 
-        BOOST_CHECK (id == 10);
+        BOOST_CHECK (id == 5);
         
     }
     catch (std::exception &e) {

diff --git a/src/test_session2.cpp b/src/test_session2.cpp
index 876aac6..6e96266 100644 (file)
--- a/src/test_session2.cpp
+++ b/src/test_session2.cpp
@@ -23,7 +23,8 @@ class Worker
         void operator() (void) {
             for (int i=0; i < 100; ++i)
             {
-                m_id = m_session.id();   
+                yp2::Session session;
+                m_id = session.id();   
                 //print();
             }
         }
@@ -36,7 +37,6 @@ class Worker
         }
         
     private: 
-        yp2::Session m_session;
         int m_nr;
         int m_id;
 };
@@ -52,7 +52,6 @@ BOOST_AUTO_TEST_CASE( testsession2 )
         const int num_threads = 100;
         boost::thread_group thrds;
         
-        yp2::Session session;
 
         for (int i=0; i < num_threads; ++i)
         {
@@ -62,6 +61,7 @@ BOOST_AUTO_TEST_CASE( testsession2 )
         }
         thrds.join_all();
 
+        yp2::Session session;
         BOOST_CHECK (session.id() == 10001);
         
     }