• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

UltraMonkey-L7 V3(multi-thread implementation)


Commit MetaInfo

Revisão8891521c7c454c1e99d45577f70fd6e199feffd2 (tree)
Hora2014-06-20 17:34:47
AutorHiroaki Nakano <nakano.hiroaki@nttc...>
CommiterHiroaki Nakano

Mensagem de Log

#32547 fedora, RHEL7コンパイルエラー対処

fedora19で出たエラーの対処。
TIME_UTC以外に、pthread.soがリンクできずにリンカがエラーにもなる。
現在、configure実行時にLIBS="-lpthread"をつけて暫定対処中。

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

Mudança Sumário

Diff

--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
11 AC_PREREQ(2.59)
2-AC_INIT(l7vsd)
2+AC_INIT(l7vsd, 3.1.1, ultramonkey-l7-develop@lists.sourceforge.jp)
33 PACKAGENAME=l7vsd
44 VERSION=3.1.1
55
6-AM_INIT_AUTOMAKE($PACKAGENAME, $VERSION, no-define )
6+AM_INIT_AUTOMAKE
77 AC_CONFIG_SRCDIR([config.h.in])
88 AC_CONFIG_HEADER([config.h])
99
--- a/l7vsd/src/Makefile.am
+++ b/l7vsd/src/Makefile.am
@@ -173,6 +173,7 @@ l7vsd_LDADD = \
173173 -lboost_system-mt \
174174 -lboost_serialization-mt \
175175 -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp \
176+ -lpthread \
176177 @external_agent_libs@
177178
178179 l7vsadm_CPPFLAGS = \
@@ -197,6 +198,7 @@ l7vsadm_LDADD = \
197198 libl7vsadm_parameter.a \
198199 -llog4cxx \
199200 -lrt \
201+ -lpthread \
200202 -lboost_thread-mt \
201203 -lboost_system-mt \
202204 -lboost_serialization-mt \
--- a/l7vsd/src/tcp_session.cpp
+++ b/l7vsd/src/tcp_session.cpp
@@ -840,7 +840,11 @@ void tcp_session::up_thread_run()
840840 }
841841 if (!server_connected_flag && server_connect_time_out != 0) {
842842 boost::xtime now_time;
843+#if BOOST_VERSION >= 105000
844+ boost::xtime_get(&now_time, boost::TIME_UTC_);
845+#else
843846 boost::xtime_get(&now_time, boost::TIME_UTC);
847+#endif
844848 if ((now_time.sec - client_connected_time.sec) > server_connect_time_out) { // timeout detect.
845849 boost::system::error_code error_code;
846850 client_socket.close(error_code);
@@ -1139,7 +1143,11 @@ void tcp_session::up_thread_client_accept(const TCP_PROCESS_TYPE_TAG process_typ
11391143 this,
11401144 boost::asio::placeholders::error));
11411145 } else {
1142- boost::xtime_get(&client_connected_time, boost::TIME_UTC);
1146+#if BOOST_VERSION >= 105000
1147+ boost::xtime_get(&start_handshake_time, boost::TIME_UTC_);
1148+#else
1149+ boost::xtime_get(&start_handshake_time, boost::TIME_UTC);
1150+#endif
11431151 upthread_status = UPTHREAD_ACTIVE;
11441152 }
11451153 up_thread_next_call_function = up_thread_function_array[func_tag];