Commit: 0de3e723bbe29a5e4818053c35af8f6fdef503a4 - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• Révision: 0de3e723bbe29a5e4818053c35af8f6fdef503a4 (tree)
• l'heure: 2013-06-10 16:49:51
• Auteur: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Message de Log

#31545: boost 1.50 以上でビルドできない

事象

boost 1.50 以上を用いてビルドしようとすると，boost::TIME_UTC が未定義である旨のエラーが発生し，ビルドできない．

原因

C11 で TIME_UTC が入って名前がかぶったため，boost 側が名前を変更（TIME_UTC → TIME_UTC_）した．
https://svn.boost.org/trac/boost/ticket/6940

対処

boost 1.50 以上（BOOST_VERSION > 105000）の場合は boost::TIME_UTC_ を使うようにする．
（boost 1.49 以下は boost::TIME_UTC のまま．TIME_UTC_ は未定義）

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

Change Summary

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

Modification

--- a/l7vsd/src/l7vsadm.cpp
+++ b/l7vsd/src/l7vsadm.cpp
@@ -3002,7 +3002,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
@@ -103,7 +103,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() )
@@ -166,7 +171,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
@@ -813,7 +813,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);
@@ -1101,7 +1106,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,
@@ -4140,7 +4150,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) {