lockfree_queue,lockfree_hashmap対応のUTコード

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

diff --git a/unit_tests/virtualservice_test/stub.cpp b/unit_tests/virtualservice_test/stub.cpp
index 9e97180..1687b14 100644 (file)
--- a/unit_tests/virtualservice_test/stub.cpp
+++ b/unit_tests/virtualservice_test/stub.cpp
@@ -441,7 +441,7 @@ void        l7vs::tcp_session::up_thread_run(void){
                        break;
        }
        std::cout << "release session";
-       parent_service.release_session( boost::this_thread::get_id() );
+       parent_service.release_session( this );
 }
 
 void   l7vs::tcp_session::down_thread_run(void){}

diff --git a/unit_tests/virtualservice_test/virtualservice.cpp b/unit_tests/virtualservice_test/virtualservice.cpp
index b2fb2f5..4a95e0c 100644 (file)
--- a/unit_tests/virtualservice_test/virtualservice.cpp
+++ b/unit_tests/virtualservice_test/virtualservice.cpp
@@ -87,8 +87,8 @@ void          l7vs::virtual_service::connection_active( const boost::asio::ip::tcp::endp
 void           l7vs::virtual_service::connection_inactive( const boost::asio::ip::tcp::endpoint& in ){
        vs->connection_inactive( in );
 }
-void           l7vs::virtual_service::release_session( const boost::thread::id thread_id ){
-       vs->release_session( thread_id );
+void           l7vs::virtual_service::release_session( const tcp_session* session_ptr ){
+       vs->release_session( session_ptr );
 }
 
 unsigned long long             l7vs::virtual_service::get_qos_upstream(){

diff --git a/unit_tests/virtualservice_test/virtualservice_tcp.cpp b/unit_tests/virtualservice_test/virtualservice_tcp.cpp
index 558a9e5..f1eecef 100644 (file)
--- a/unit_tests/virtualservice_test/virtualservice_tcp.cpp
+++ b/unit_tests/virtualservice_test/virtualservice_tcp.cpp
@@ -90,6 +90,6 @@ void  l7vs::virtualservice_tcp::connection_active( const boost::asio::ip::tcp::en
 void   l7vs::virtualservice_tcp::connection_inactive( const boost::asio::ip::tcp::endpoint& in ){
 }
 
-void   l7vs::virtualservice_tcp::release_session( const boost::thread::id thread_id ){
+void   l7vs::virtualservice_tcp::release_session( const tcp_session* session_ptr ){
 }
 

diff --git a/unit_tests/virtualservice_test/virtualservice_udp.cpp b/unit_tests/virtualservice_test/virtualservice_udp.cpp
index 368ead8..45c89ec 100644 (file)
--- a/unit_tests/virtualservice_test/virtualservice_udp.cpp
+++ b/unit_tests/virtualservice_test/virtualservice_udp.cpp
@@ -72,4 +72,4 @@ void  l7vs::virtualservice_udp::del_realserver( const l7vs::virtualservice_elemen
 void   l7vs::virtualservice_udp::run(){}
 void   l7vs::virtualservice_udp::stop(){}
 
-void   l7vs::virtualservice_udp::release_session( const boost::thread::id thread_id ){}
+void   l7vs::virtualservice_udp::release_session( const tcp_session* session_ptr ){}

diff --git a/unit_tests/virtualservice_test/vs_tcp.h b/unit_tests/virtualservice_test/vs_tcp.h
index 228b580..deb8679 100644 (file)
--- a/unit_tests/virtualservice_test/vs_tcp.h
+++ b/unit_tests/virtualservice_test/vs_tcp.h
@@ -44,9 +44,9 @@ public:
        std::list<realserver>&  get_rs_list(){
                return rs_list;
        }
-       void    release_session( const boost::thread::id in_id ){
+       void    release_session( const tcp_session* session_ptr ){
                std::cout << "release_session called." << std::endl;
-               virtualservice_tcp::release_session( in_id );
+               virtualservice_tcp::release_session( session_ptr );
        }
        unsigned long long      get_ref_count(){
                return rs_list_ref_count.get();

diff --git a/unit_tests/virtualservice_test/vs_tcp_thread_test.cpp b/unit_tests/virtualservice_test/vs_tcp_thread_test.cpp
index 9ca7289..a7ffdca 100644 (file)
--- a/unit_tests/virtualservice_test/vs_tcp_thread_test.cpp
+++ b/unit_tests/virtualservice_test/vs_tcp_thread_test.cpp
@@ -348,13 +348,12 @@ public:
                vs->connection_inactive( ep );
 
        }
-       void            release_session( const boost::thread::id id ){
+       void            release_session( const l7vs::tcp_session* session_ptr ){
                boost::mutex    mtx;
                boost::mutex::scoped_lock       lk( mtx );
                cond.wait( lk );
 
-               vs->release_session( id );
-
+               vs->release_session( session_ptr );
        }
 };
 

diff --git a/unit_tests/virtualservice_test/vs_tcp_thread_test2.cpp b/unit_tests/virtualservice_test/vs_tcp_thread_test2.cpp
index 3130361..34b9303 100644 (file)
--- a/unit_tests/virtualservice_test/vs_tcp_thread_test2.cpp
+++ b/unit_tests/virtualservice_test/vs_tcp_thread_test2.cpp
@@ -348,13 +348,12 @@ public:
                vs->connection_inactive( ep );
 
        }
-       void            release_session( const boost::thread::id id ){
+       void            release_session( const l7vs::tcp_session* session_ptr ){
                boost::mutex    mtx;
                boost::mutex::scoped_lock       lk( mtx );
                cond.wait( lk );
 
-               vs->release_session( id );
-
+               vs->release_session( session_ptr );
        }
 };
 

diff --git a/unit_tests/virtualservice_test/vs_test.h b/unit_tests/virtualservice_test/vs_test.h
index ce5e93e..96c77b7 100644 (file)
--- a/unit_tests/virtualservice_test/vs_test.h
+++ b/unit_tests/virtualservice_test/vs_test.h
@@ -58,7 +58,7 @@ public:
        }
        void    connection_inactive( const boost::asio::ip::tcp::endpoint& ep ){
        }
-       void    release_session( const boost::thread::id in_id ){
+       void    release_session( const tcp_session* session_ptr ){
        }
 
        //imprement for unit_test