コミット: 9c96ee0f61e10e97d6a8a96bdaebf35afc2ed685 - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

コミットメタ情報

• リビジョン: 9c96ee0f61e10e97d6a8a96bdaebf35afc2ed685 (tree)
• 日時: 2013-06-13 16:29:18
• 作者: Hiroaki Nakano <nakano.hiroaki@nttc...>
• コミッター: Hiroaki Nakano

ログメッセージ

Merge branch 'TIME_UTC_fix' into v3.1.0-devel

変更サマリ

• modified: l7vsd/src/l7vsadm.cpp
• modified: l7vsd/src/session_thread_control.cpp
• modified: l7vsd/src/tcp_session.cpp

差分

--- a/l7vsd/src/l7vsadm.cpp
+++ b/l7vsd/src/l7vsadm.cpp
@@ -3038,7 +3038,12 @@ bool l7vs::l7vsadm::execute(int argc, char *argv[])
 
                         // Lock retrying.
                         boost::xtime xt;
+#if BOOST_VERSION >= 105000
+                        xtime_get(&xt, boost::TIME_UTC_);
+#else
                         xtime_get(&xt, boost::TIME_UTC);
+#endif
+
                         xt.sec += command_wait_interval;
                         boost::thread::sleep(xt);
                 }

--- a/l7vsd/src/session_thread_control.cpp
+++ b/l7vsd/src/session_thread_control.cpp
@@ -106,7 +106,12 @@ void    session_thread_control::upstream_run()
                 if (state == WAIT) {    // after create or session end. this thread is pooling mode
                         boost::mutex::scoped_lock    lock(upthread_condition_mutex);
                         boost::xtime    wait;
+#if BOOST_VERSION >= 105000
+                        boost::xtime_get(&wait, boost::TIME_UTC_);
+#else
                         boost::xtime_get(&wait, boost::TIME_UTC);
+#endif
+
                         wait.sec += 1;
                         upthread_running_mutex.unlock();
                         upthread_condition.timed_wait(lock, wait);   // thread is condition wait( start at notify_all() )
@@ -169,7 +174,12 @@ void    session_thread_control::downstream_run()
                         boost::mutex::scoped_lock    lock(downthread_condition_mutex);
 //             downthread_condition.wait( lock ); // thread is condition wait( start at notify_all() )
                         boost::xtime    wait;
+#if BOOST_VERSION >= 105000
+                        boost::xtime_get(&wait, boost::TIME_UTC_);
+#else
                         boost::xtime_get(&wait, boost::TIME_UTC);
+#endif
+
                         wait.sec += 1;
                         downthread_running_mutex.unlock();
                         downthread_condition.timed_wait(lock, wait);   // thread is condition wait( start at notify_all() )

--- a/l7vsd/src/tcp_session.cpp
+++ b/l7vsd/src/tcp_session.cpp
@@ -822,7 +822,12 @@ void tcp_session::up_thread_run()
                                 }       //message alive end.
                                 if (ssl_flag && up_thread_next_call_function.first == UP_FUNC_CLIENT_ACCEPT_EVENT) {     //handshake timeout check
                                         boost::xtime    now_time;
+#if BOOST_VERSION >= 105000
+                                        boost::xtime_get(&now_time, boost::TIME_UTC_);
+#else
                                         boost::xtime_get(&now_time, boost::TIME_UTC);
+#endif
+
                                         if ((now_time.sec - start_handshake_time.sec) > ssl_handshake_time_out) {        // timeout detect.
                                                 boost::system::error_code error_code;
                                                 client_ssl_socket.close(error_code);
@@ -1123,7 +1128,12 @@ void tcp_session::up_thread_client_accept(const TCP_PROCESS_TYPE_TAG process_typ
         if (ssl_flag) {
                 upthread_status = UPTHREAD_LOCK;
                 // try ssl handshake
+#if BOOST_VERSION >= 105000
+                boost::xtime_get(&start_handshake_time, boost::TIME_UTC_);
+#else
                 boost::xtime_get(&start_handshake_time, boost::TIME_UTC);
+#endif
+
                 client_ssl_socket.setoption(error_code);
                 client_ssl_socket.async_handshake(boost::bind(&tcp_session::up_thread_client_handshake_handle,
                                                   this,
@@ -4192,7 +4202,12 @@ void tcp_session::down_thread_sorryserver_handle_async_read_some(tcp_session::TC
 //! milliseconds to boost::xtime converter
 void tcp_session::to_time(int in, boost::xtime &xt)
 {
+#if BOOST_VERSION >= 105000
+        boost::xtime_get(&xt, boost::TIME_UTC_);
+#else
         boost::xtime_get(&xt, boost::TIME_UTC);
+#endif
+
         xt.sec += (in / 1000);
         xt.nsec += (in % 1000) * 1000000;
         if (xt.nsec >= 1000000000) {