コミット: 6ae376854290841d7968f9ddbfca848bca0df77e - UltraMonkeyL7_nakano (git)

コミットメタ情報

• リビジョン: 6ae376854290841d7968f9ddbfca848bca0df77e (tree)
• 日時: 2013-07-05 13:05:03
• 作者: Hiroaki Nakano <nakano.hiroaki@nttc...>
• コミッター: Hiroaki Nakano

ログメッセージ

gettidをdebugログ出力時のみcallするようにした

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

変更サマリ

• modified: l7vsd/src/l7vsd.cpp
• modified: l7vsd/src/session_thread_control.cpp
• modified: l7vsd/src/virtualservice_tcp.cpp

差分

--- a/l7vsd/src/l7vsd.cpp
+++ b/l7vsd/src/l7vsd.cpp
@@ -192,9 +192,6 @@ void    l7vsd::list_virtual_service_verbose(l7vsd_response *response, error_code
 //! @param[out]    error_code
 void    l7vsd::add_virtual_service(const virtualservice_element *in_vselement, error_code &err)
 {
-        pid_t tid;
-        tid = get_tid::gettid();
-
         Logger    logger(LOG_CAT_L7VSD_MAINTHREAD, 7, "l7vsd::add_virtual_service", __FILE__, __LINE__);
 
         boost::mutex::scoped_lock command_lock(command_mutex);
@@ -209,6 +206,9 @@ void    l7vsd::add_virtual_service(const virtualservice_element *in_vselement, e
 
         /*-------- DEBUG LOG --------*/
         if (LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_MAINTHREAD)) {
+                pid_t tid;
+                tid = get_tid::gettid();
+
                 std::stringstream    debugstr;
                 debugstr << "l7vsd::add_virtual_service arguments:";
                 debugstr << boost::format("tid=%d") % tid;
@@ -328,9 +328,6 @@ void    l7vsd::add_virtual_service(const virtualservice_element *in_vselement, e
 //! @param[out]    error_code
 void    l7vsd::del_virtual_service(const virtualservice_element *in_vselement, error_code &err)
 {
-        pid_t tid;
-        tid = get_tid::gettid();
-
         Logger    logger(LOG_CAT_L7VSD_MAINTHREAD, 9, "l7vsd::del_virtual_service", __FILE__, __LINE__);
 
         boost::mutex::scoped_lock command_lock(command_mutex);
@@ -345,6 +342,9 @@ void    l7vsd::del_virtual_service(const virtualservice_element *in_vselement, e
 
         /*-------- DEBUG LOG --------*/
         if (LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_MAINTHREAD)) {
+                pid_t tid;
+                tid = get_tid::gettid();
+
                 std::stringstream    debugstr;
                 debugstr << "l7vsd::del_virtual_service arguments:";
                 debugstr << boost::format("tid=%d") % tid;

--- a/l7vsd/src/session_thread_control.cpp
+++ b/l7vsd/src/session_thread_control.cpp
@@ -70,10 +70,10 @@ int    session_thread_control::start_thread()
 //
 void    session_thread_control::upstream_run()
 {
-        pid_t tid;
-        tid = get_tid::gettid();
-
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
+                pid_t tid;
+                tid = get_tid::gettid();
+
                 boost::format fmt("in_function[%d] : void session_thread_control::upstream_run()");
                 fmt % tid;
                 Logger::putLogDebug(LOG_CAT_L7VSD_VIRTUALSERVICE, 1, fmt.str(), __FILE__, __LINE__);
@@ -143,10 +143,10 @@ void    session_thread_control::upstream_run()
 //
 void    session_thread_control::downstream_run()
 {
-        pid_t tid;
-        tid = get_tid::gettid();
-
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
+                pid_t tid;
+                tid = get_tid::gettid();
+
                 boost::format fmt("in_function[%d] : void session_thread_control::downstream_run()");
                 fmt % tid;
                 Logger::putLogDebug(LOG_CAT_L7VSD_VIRTUALSERVICE, 4, fmt.str(), __FILE__, __LINE__);

--- a/l7vsd/src/virtualservice_tcp.cpp
+++ b/l7vsd/src/virtualservice_tcp.cpp
@@ -1561,9 +1561,6 @@ void l7vs::virtualservice_tcp::del_realserver(const l7vs::virtualservice_element
  */
 void l7vs::virtualservice_tcp::run()
 {
-        pid_t tid;
-        tid = get_tid::gettid();
-
         Logger funcLog(LOG_CAT_L7VSD_VIRTUALSERVICE, 80, "function: void virtualservice_tcp::run()",
                        __FILE__, __LINE__);
 
@@ -1643,6 +1640,9 @@ void l7vs::virtualservice_tcp::run()
                                        this, boost::asio::placeholders::error));
 
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
+                pid_t tid;
+                tid = get_tid::gettid();
+
                 boost::format formatter("function: void virtualservice_tcp::run() "
                                         "thread id = %d");
                 formatter % tid;