Commit: d6f6c0e4c13e15a265702a2c97c61a0ea3ce24eb - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• Revision: d6f6c0e4c13e15a265702a2c97c61a0ea3ce24eb (tree)
• Zeit: 2014-02-26 13:36:58
• Autor: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

Merge branch 'fix_memory_leak' into v3.1.1-devel

Ändern Zusammenfassung

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

Diff

--- a/l7vsd/include/virtualservice.h
+++ b/l7vsd/include/virtualservice.h
@@ -621,6 +621,8 @@ public:
         void run();
         void stop();
 
+        boost::shared_ptr<boost::thread> vs_thread_ptr;
+
         void connection_active(const boost::asio::ip::tcp::endpoint &);
         void connection_inactive(const boost::asio::ip::tcp::endpoint &);
         void release_session(const tcp_session *session_ptr);

--- a/l7vsd/src/l7vsd.cpp
+++ b/l7vsd/src/l7vsd.cpp
@@ -249,7 +249,7 @@ void    l7vsd::add_virtual_service(const virtualservice_element *in_vselement, e
                 try {
 
                         // create thread and run
-                        vs_threads.create_thread(boost::bind(&virtual_service::run, vsptr));
+                        (*vsptr).vs_thread_ptr =  boost::shared_ptr<boost::thread>(vs_threads.create_thread(boost::bind(&virtual_service::run, vsptr)));
 
                 } catch (...) {
                         std::stringstream    buf;
@@ -348,6 +348,8 @@ void    l7vsd::del_virtual_service(const virtualservice_element *in_vselement, e
         if (vslist.end() !=  vsitr) {
                 // vs stop
                 (*vsitr)->stop();
+                (*vsitr)->vs_thread_ptr->join();
+                vs_threads.remove_thread((*vsitr)->vs_thread_ptr.get());
                 // vs finalize
                 (*vsitr)->finalize(err);
 
@@ -791,14 +793,14 @@ void    l7vsd::flush_virtual_service(error_code &err)
 
                         // vs stop
                         (*itr)->stop();
+                        // join virtualservice threads
+                        (*itr)->vs_thread_ptr->join();
+                        vs_threads.remove_thread((*itr)->vs_thread_ptr.get());
                         // vs finalize
                         (*itr)->finalize(err);
                 }
         }
 
-        // join virtualservice threads
-        vs_threads.join_all();
-
         // replication switch to slave
         rep->switch_to_slave();
 }