提交: 6f7e6a6e25fd0d38aa80ac888a56c1ef7af7bc5b - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• 修訂: 6f7e6a6e25fd0d38aa80ac888a56c1ef7af7bc5b (tree)
• 時間: 2012-09-08 13:19:30
• 作者: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: hibari

Log Message

#29144 でclose messageをpostするまえに、message queueをclearしておく。

Signed-off-by: Hiroaki Nakano <[e-mail]>

Change Summary

• modified: l7vsd/src/tcp_session.cpp

差異

--- a/l7vsd/src/tcp_session.cpp
+++ b/l7vsd/src/tcp_session.cpp
@@ -897,11 +897,20 @@ void tcp_session::up_thread_run()
 
         if (ssl_flag) {
                 client_ssl_socket.wait_async_event_all_end();
+
+                // clear messages
+
+                tcp_thread_message *msg = up_thread_message_que.pop();
+                while (msg) {
+                        delete msg;
+                        msg = up_thread_message_que.pop();
+                }
+
                 upthread_status = UPTHREAD_LOCK;
                 parent_dispatcher.post(boost::bind(&tcp_session::up_thread_client_ssl_socket_clear_socket_handler,this));
                 boost::mutex::scoped_lock lock(upthread_status_mutex);
                 while (unlikely(upthread_status == UPTHREAD_LOCK)) {
-                        tcp_thread_message *msg = up_thread_message_que.pop();
+                        msg = up_thread_message_que.pop();
                         if (msg) {      // message is alive.
                                 msg->message(MESSAGE_PROC);
                                 delete msg;