Commit: 044fa25a81913ff0c62ee26f6a8ed68a38090055 - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• Revisión: 044fa25a81913ff0c62ee26f6a8ed68a38090055 (tree)
• Tiempo: 2014-02-24 15:01:20
• Autor: Michiro Hibari <l05102@shib...>
• Commiter: Michiro Hibari

Log Message

fix ticket #33102 (fix memory reak).

Cambiar Resumen

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

Diferencia incremental

--- 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);