X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.hpp;h=96cff283ca798bd68a712ac0fbb51eafcc094381;hb=637a685d61a9ff0e3f398a59da426979815c4d68;hp=b4d8916b62adcee27300330921d4509ed7963a83;hpb=b3a5a3535ff97f71581c9b496f95e0820120f743;p=metaproxy-moved-to-github.git

diff --git a/src/session.hpp b/src/session.hpp
index b4d8916..96cff28 100644
--- a/src/session.hpp
+++ b/src/session.hpp
@@ -1,7 +1,22 @@
-/* $Id: session.hpp,v 1.10 2005-10-25 21:32:01 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: session.hpp,v 1.15 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #ifndef SESSION_HPP
@@ -11,7 +26,7 @@
 #include <map>
 #include <boost/thread/mutex.hpp>
 
-namespace yp2 {
+namespace metaproxy_1 {
     
     class Session
     {
@@ -73,23 +88,52 @@ namespace yp2 {
 
     template <class T> class session_map {
     public:
-        void create(T &t, const yp2::Session &s) { 
-            boost::mutex::scoped_lock lock(m_mutex);
-            m_map[s] = t;
+        void create(T &t, const metaproxy_1::Session &s) { 
+            boost::mutex::scoped_lock lock(m_map_mutex);
+            m_map[s] = SessionItem(t);
         };
-        void release(const yp2::Session &s) {
-            boost::mutex::scoped_lock lock(m_mutex);
+        void release(const metaproxy_1::Session &s) {
+            boost::mutex::scoped_lock lock(m_map_mutex);
 
             m_map.erase(s);
         };
-        bool active(const yp2::Session &s) {
-            typename std::map<yp2::Session,T>::const_iterator it;
+#if 0
+        T &get_session_data(const metaproxy_1::Session &s) {
+            boost::mutex::scoped_lock lock(m_map_mutex);
+
+            typename std::map<metaproxy_1::Session,SessionItem>::const_iterator it;
+            it = m_map.find(s);
+            if (it == m_map.end())
+                return 0;
+            boost::mutx::scoped_lock *scoped_ptr =
+                new boost::mutex::scoped_lock(it->second->m_item_mutex);
+        };
+#endif
+        bool exist(const metaproxy_1::Session &s) {
+            typename std::map<metaproxy_1::Session,SessionItem>::const_iterator it;
             it = m_map.find(s);
             return it == m_map.end() ? false : true;
         }
     private:
-        boost::mutex m_mutex;
-        std::map<yp2::Session,T>m_map;
+        class SessionItem {
+        public:
+            SessionItem() {};
+            SessionItem(T &t) : m_t(t) {};
+            SessionItem &operator =(const SessionItem &s) {
+                if (this != &s) {
+                    m_t = s.m_t;
+                }
+                return *this;
+            };
+            SessionItem(const SessionItem &s) {
+                m_t = s.m_t;
+            };
+            T m_t;
+            boost::mutex m_item_mutex;
+        };
+    private:
+        boost::mutex m_map_mutex;
+        std::map<metaproxy_1::Session,SessionItem>m_map;
     };
     
 }