Commit: 6f2218216860555ecf2243cdc51758a0e9a2f614 - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• Revision: 6f2218216860555ecf2243cdc51758a0e9a2f614 (tree)
• Time: 2013-06-13 15:37:58
• Author: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

Merge branch 'remain_thread_fix' into v3.1.0-devel

Change Summary

• modified: l7vsd/include/virtualservice.h
• modified: l7vsd/src/virtualservice_tcp.cpp

Incremental Difference

--- a/l7vsd/include/virtualservice.h
+++ b/l7vsd/include/virtualservice.h
@@ -451,6 +451,8 @@ protected:
         session_map_type            active_sessions;
         l7vs::atomic<unsigned long long>
         active_count;
+        session_thread_control      *waiting_stc;
+        //! session_thread_control waiting accept
 
         bool                        defer_accept_opt;
         //! is set option TCP_DEFER_ACCEPT

--- a/l7vsd/src/virtualservice_tcp.cpp
+++ b/l7vsd/src/virtualservice_tcp.cpp
@@ -432,6 +432,7 @@ void l7vs::virtualservice_tcp::handle_accept(const l7vs::session_thread_control
         stc_ptr_noconst->session_access_log_output_mode_change(access_log_flag);
 
         active_sessions.insert(tmp_session, stc_ptr_noconst);
+        waiting_stc = NULL;
 
         //check sorry flag and status
         if (unlikely(
@@ -502,6 +503,7 @@ void l7vs::virtualservice_tcp::handle_accept(const l7vs::session_thread_control
         boost::mutex::scoped_lock down_wait_lk(stc_ptr_register_accept->get_downthread_mutex());
 
         waiting_session = stc_ptr_register_accept->get_session().get();
+        waiting_stc = stc_ptr_register_accept;
 
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
                 boost::format fmt1("active session thread id = %d");
@@ -920,7 +922,7 @@ void l7vs::virtualservice_tcp::finalize(l7vs::error_code &err)
                 delete stc;
                 stc = NULL;
                 if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
-                        boost::format fmt("join pool session: pool_sessions.size = %d");
+                        boost::format fmt("join pool session: pool_session.size = %d");
                         fmt % pool_sessions.size();
                         Logger::putLogDebug(LOG_CAT_L7VSD_VIRTUALSERVICE, 55, fmt.str(),
                                             __FILE__, __LINE__);
@@ -930,6 +932,9 @@ void l7vs::virtualservice_tcp::finalize(l7vs::error_code &err)
         delete waiting_session;
         waiting_session = NULL;
 
+        //waiting thread delete
+        waiting_stc->join();
+
         //unload ProtocolModule
         if (protomod) {
                 //finalize ProtocolModule
@@ -1597,6 +1602,7 @@ void l7vs::virtualservice_tcp::run()
         } while (!stc_ptr);
 
         waiting_session  = stc_ptr->get_session().get();
+        waiting_stc = stc_ptr;
 
         if (!ssl_virtualservice_mode_flag) {
                 acceptor_->async_accept(waiting_session->get_client_socket().get_socket(),