メソッドの見直し

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-shamshel@6132 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/include/virtualservice.h b/include/virtualservice.h
index 8c7074b..d20954b 100644 (file)
--- a/include/virtualservice.h
+++ b/include/virtualservice.h
@@ -116,8 +116,8 @@ public:
        virtual bool                            operator==( const virtualservice_base& ) = 0;
        virtual bool                            operator!=( const virtualservice_base& ) = 0;
 
-       virtual void                            rs_list_lock() = 0;
-       virtual void                            rs_list_unlock() = 0;
+       void                                            rs_list_lock();
+       void                                            rs_list_unlock();
 
        virtual vs_operation_result     set_virtualservce( const virtualservice_element& ) = 0;
        virtual vs_operation_result     edit_virtualservce( const virtualservice_element& ) = 0;
@@ -153,7 +153,7 @@ public:
 
 class  virtualservice_tcp : public virtualservice_base{
 public:
-       typedef std::map<boost::thread::id,session_thread_control>      session_map_type;
+       typedef std::map<boost::thread::id,boost::shared_ptr<session_thread_control>>   session_map_type;
 protected:
        boost::asio::ip::tcp::acceptor
                                                                acceptor_;
@@ -179,9 +179,6 @@ public:
        bool                                            operator==( const virtualservice_base& );
        bool                                            operator!=( const virtualservice_base& );
 
-       void                                            rs_list_lock();
-       void                                            rs_list_unlock();
-
        vs_operation_result                     set_virtualservce( const virtualservice_element& );
        vs_operation_result                     edit_virtualservce( const virtualservice_element& );
 
@@ -217,9 +214,6 @@ public:
        bool                                            operator==( const virtualservice_base& );
        bool                                            operator!=( const virtualservice_base& );
 
-       void                                            rs_list_lock();
-       void                                            rs_list_unlock();
-
        vs_operation_result                     set_virtualservce( const virtualservice_element& );
        vs_operation_result                     edit_virtualservce( const virtualservice_element& );
 

diff --git a/src/virtualservice.cpp b/src/virtualservice.cpp
index c128628..5992696 100644 (file)
--- a/src/virtualservice.cpp
+++ b/src/virtualservice.cpp
@@ -26,6 +26,9 @@ void  virtualservice_base::handle_protomod_replication( const boost::system::erro
 void   virtualservice_base::handle_schedmod_replication( const boost::system::error_code& ){}
 void   virtualservice_base::handle_throughput_update( const boost::system::error_code& ){}
 
+void   virtualservice_base::rs_list_lock(){}
+void   virtualservice_base::rs_list_unlock(){}
+
 unsigned long long     virtualservice_base::get_qos_upstream(){ return element.qos_upstream; }
 unsigned long long     virtualservice_base::get_qos_downstream(){ return element.qos_downstream; }
 unsigned long long     virtualservice_base::get_throughput_upstream(){ return throughput_up; }
@@ -62,9 +65,6 @@ vs_operation_result           virtualservice_tcp::finalize(){ vs_operation_result ret; re
 bool   virtualservice_tcp::operator==( const virtualservice_base& in ){ return true; }
 bool   virtualservice_tcp::operator!=( const virtualservice_base& in ){ return true; }
 
-void   virtualservice_tcp::rs_list_lock(){}
-void   virtualservice_tcp::rs_list_unlock(){}
-
 vs_operation_result            virtualservice_tcp::set_virtualservce( const virtualservice_element& in ){
        vs_operation_result ret;
        return ret;
@@ -117,9 +117,6 @@ vs_operation_result         virtualservice_udp::finalize(){
 bool   virtualservice_udp::operator==( const virtualservice_base& in ){ return true; }
 bool   virtualservice_udp::operator!=( const virtualservice_base& in ){ return true; }
 
-void   virtualservice_udp::rs_list_lock(){}
-void   virtualservice_udp::rs_list_unlock(){}
-
 vs_operation_result            virtualservice_udp::set_virtualservce( const virtualservice_element& in ){
        vs_operation_result ret;
        return ret;