Commit: 3de9bf1e20c924a0d511ad7575ebf4946ecc043c - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• Révision: 3de9bf1e20c924a0d511ad7575ebf4946ecc043c (tree)
• l'heure: 2010-11-09 18:03:30
• Auteur: 0809216 <0809216@1ed6...>
• Commiter: 0809216

Message de Log

changed notify call

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10429 1ed66053-1c2d-0410-8867-f7571e6e31d3

Change Summary

• modified: l7vsd/src/tcp_session.cpp

Modification

--- a/l7vsd/src/tcp_session.cpp
+++ b/l7vsd/src/tcp_session.cpp
@@ -1050,8 +1050,8 @@ void tcp_session::down_thread_run()
         {
                 boost::mutex::scoped_lock lock(downthread_status_mutex);
                 downthread_status = DOWNTHREAD_ALIVE;
+                downthread_status_cond.notify_one();
         }
-        downthread_status_cond.notify_one();
 
         //----Debug log----------------------------------------------------------------------
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_SESSION))) {
@@ -1080,8 +1080,8 @@ void tcp_session::down_thread_run()
         {
                 boost::mutex::scoped_lock lock(downthread_status_mutex);
                 downthread_status = DOWNTHREAD_ACTIVE;
+                downthread_status_cond.notify_one();
         }
-        downthread_status_cond.notify_one();
 
         down_thread_next_call_function = down_thread_function_array[DOWN_FUNC_REALSERVER_RECEIVE];
 
@@ -1136,15 +1136,13 @@ void tcp_session::down_thread_run()
         {
                 boost::mutex::scoped_lock lock(downthread_status_mutex);
                 downthread_status = DOWNTHREAD_ALIVE;
+                downthread_status_cond.notify_one();
         }
-        downthread_status_cond.notify_one();
-        //----Debug log----------------------------------------------------------------------
-        //----Debug log----------------------------------------------------------------------
         {
                 boost::mutex::scoped_lock lock(downthread_status_mutex);
                 downthread_status = DOWNTHREAD_SLEEP;
+                downthread_status_cond.notify_one();
         }
-        downthread_status_cond.notify_one();
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_SESSION))) {
                 boost::format formatter("Thread ID[%d] FUNC OUT down_thread_run");
                 formatter % boost::this_thread::get_id();