适配libfieldstat3

5 files changed, 45 insertions, 38 deletions

diff --git a/test/src/CMakeLists.txt b/test/src/CMakeLists.txt
index 664a1ef..fa6cb21 100644
--- a/test/src/CMakeLists.txt
+++ b/test/src/CMakeLists.txt
@@ -9,21 +9,21 @@ include_directories(${PROJECT_SOURCE_DIR}/src/)
 add_definitions(-std=c++11)
 LINK_DIRECTORIES(/opt/MESA/lib)
 
-add_executable(gtest_rule ${PROJECT_SOURCE_DIR}/src/tsg_rule.cpp ${PROJECT_SOURCE_DIR}/src/tsg_variable.cpp gtest_common.cpp gtest_rule.cpp)
-target_link_libraries(gtest_rule gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger maat4)
+add_executable(gtest_rule ${PROJECT_SOURCE_DIR}/src/tsg_rule.cpp ${PROJECT_SOURCE_DIR}/src/tsg_variable.cpp ${PROJECT_SOURCE_DIR}/src/tsg_stat.cpp gtest_common.cpp gtest_rule.cpp)
+target_link_libraries(gtest_rule gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger maat4 fieldstat3)
 
 
-add_executable(gtest_tableinfo ${PROJECT_SOURCE_DIR}/src/tsg_rule.cpp ${PROJECT_SOURCE_DIR}/src/tsg_variable.cpp gtest_common.cpp gtest_tableinfo.cpp)
-target_link_libraries(gtest_tableinfo gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger maat4)
+add_executable(gtest_tableinfo ${PROJECT_SOURCE_DIR}/src/tsg_rule.cpp ${PROJECT_SOURCE_DIR}/src/tsg_variable.cpp ${PROJECT_SOURCE_DIR}/src/tsg_stat.cpp gtest_common.cpp gtest_tableinfo.cpp)
+target_link_libraries(gtest_tableinfo gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger maat4 fieldstat3)
 
-add_executable(gtest_bridge ${PROJECT_SOURCE_DIR}/src/tsg_bridge.cpp ${PROJECT_SOURCE_DIR}/src/tsg_protocol.cpp ${PROJECT_SOURCE_DIR}/src/tsg_variable.cpp gtest_common.cpp gtest_bridge.cpp)
-target_link_libraries(gtest_bridge gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger maat4)
+add_executable(gtest_bridge ${PROJECT_SOURCE_DIR}/src/tsg_bridge.cpp ${PROJECT_SOURCE_DIR}/src/tsg_protocol.cpp ${PROJECT_SOURCE_DIR}/src/tsg_variable.cpp ${PROJECT_SOURCE_DIR}/src/tsg_stat.cpp gtest_common.cpp gtest_bridge.cpp)
+target_link_libraries(gtest_bridge gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger maat4 fieldstat3)
 
-add_executable(gtest_action ${PROJECT_SOURCE_DIR}/src/tsg_action.cpp ${PROJECT_SOURCE_DIR}/src/tsg_leaky_bucket.cpp ${PROJECT_SOURCE_DIR}/src/tsg_dns.cpp ${PROJECT_SOURCE_DIR}/src/tsg_icmp.cpp ${PROJECT_SOURCE_DIR}/src/tsg_tamper.cpp ${PROJECT_SOURCE_DIR}/src/tsg_variable.cpp gtest_common.cpp gtest_action.cpp)
-target_link_libraries(gtest_action gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger maat4 MESA_field_stat2)
+add_executable(gtest_action ${PROJECT_SOURCE_DIR}/src/tsg_action.cpp ${PROJECT_SOURCE_DIR}/src/tsg_leaky_bucket.cpp ${PROJECT_SOURCE_DIR}/src/tsg_dns.cpp ${PROJECT_SOURCE_DIR}/src/tsg_icmp.cpp ${PROJECT_SOURCE_DIR}/src/tsg_tamper.cpp ${PROJECT_SOURCE_DIR}/src/tsg_variable.cpp ${PROJECT_SOURCE_DIR}/src/tsg_stat.cpp gtest_common.cpp gtest_action.cpp)
+target_link_libraries(gtest_action gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger maat4 fieldstat3)
 
-add_executable(gtest_sendlog ${PROJECT_SOURCE_DIR}/src/tsg_send_log.cpp ${PROJECT_SOURCE_DIR}/src/tsg_variable.cpp gtest_common.cpp gtest_kafka.cpp gtest_sendlog.cpp)
-target_link_libraries(gtest_sendlog gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger maat4 rdkafka MESA_field_stat2)
+add_executable(gtest_sendlog ${PROJECT_SOURCE_DIR}/src/tsg_send_log.cpp ${PROJECT_SOURCE_DIR}/src/tsg_variable.cpp ${PROJECT_SOURCE_DIR}/src/tsg_stat.cpp gtest_common.cpp gtest_kafka.cpp gtest_sendlog.cpp)
+target_link_libraries(gtest_sendlog gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger maat4 rdkafka fieldstat3)
 
 set(TSG_MASTER_SRC ${PROJECT_SOURCE_DIR}/src/tsg_entry.cpp 
 	${PROJECT_SOURCE_DIR}/src/tsg_rule.cpp 
@@ -43,13 +43,14 @@ set(TSG_MASTER_SRC ${PROJECT_SOURCE_DIR}/src/tsg_entry.cpp
 	${PROJECT_SOURCE_DIR}/src/tsg_protocol.cpp
 	${PROJECT_SOURCE_DIR}/src/tsg_proxy.cpp
 	${PROJECT_SOURCE_DIR}/src/mpack.c
+	${PROJECT_SOURCE_DIR}/src/tsg_stat.cpp
 )
 
 add_executable(gtest_master ${TSG_MASTER_SRC} gtest_kafka.cpp gtest_common.cpp gtest_master.cpp)
 target_link_libraries(gtest_master gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger MESA_jump_layer MESA_field_stat2 maat4 MESA_htable fieldstat3)
 
-add_executable(gtest_sync_state ${PROJECT_SOURCE_DIR}/src/tsg_sync_state.cpp ${PROJECT_SOURCE_DIR}/src/mpack.c gtest_common.cpp gtest_sync_state.cpp)
-target_link_libraries(gtest_sync_state gtest-static cjson ctemplate-static MESA_handle_logger)
+add_executable(gtest_sync_state ${PROJECT_SOURCE_DIR}/src/tsg_sync_state.cpp ${PROJECT_SOURCE_DIR}/src/mpack.c ${PROJECT_SOURCE_DIR}/src/tsg_stat.cpp gtest_common.cpp gtest_sync_state.cpp)
+target_link_libraries(gtest_sync_state gtest-static cjson ctemplate-static MESA_prof_load MESA_handle_logger fieldstat3)
 
 add_executable(gtest_fieldstat3 ${TSG_MASTER_SRC} gtest_common.cpp gtest_kafka.cpp gtest_fieldstat3.cpp)
 target_link_libraries(gtest_fieldstat3 gtest-static ctemplate-static cjson MESA_prof_load MESA_handle_logger MESA_jump_layer MESA_field_stat2 maat4 MESA_htable fieldstat3)
diff --git a/test/src/gtest_rule.cpp b/test/src/gtest_rule.cpp
index 7d7fd51..a3082af 100644
--- a/test/src/gtest_rule.cpp
+++ b/test/src/gtest_rule.cpp
@@ -1,8 +1,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-
 #include <arpa/inet.h>
+
+#include "tsg_stat.h"
 #include "tsg_rule.h"
 #include "tsg_label.h"
 #include "tsg_entry.h"
@@ -1091,7 +1092,11 @@ TEST(TMAPI, ScanAppPropertiesPolicy)
 
 int main(int argc, char *argv[])
 {
+	tsg_stat_create("./tsgconf/main.conf");
+	tsg_stat_init();
 	tsg_maat_rule_init("tsgconf/main.conf");
+	tsg_stat_start();
+
 	testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
 }
diff --git a/test/src/gtest_sendlog.cpp b/test/src/gtest_sendlog.cpp
index 8a5d7d9..3d6cde2 100644
--- a/test/src/gtest_sendlog.cpp
+++ b/test/src/gtest_sendlog.cpp
@@ -5,6 +5,7 @@
 #include <MESA/field_stat2.h>
 #include <MESA/stream.h>
 
+#include "tsg_stat.h"
 #include "tsg_rule.h"
 #include "tsg_bridge.h"
 #include "tsg_send_log.h"
@@ -17,7 +18,7 @@
 
 struct maat *g_tsg_maat_feather;
 
-extern struct tsg_log_instance_t *tsg_sendlog_init(const char * conffile, screen_stat_handle_t fs2_handle);
+extern struct tsg_log_instance_t *tsg_sendlog_init(const char * conffile, screen_stat_handle_t fs3_instance);
 
 char *tsg_device_tag_get(void)
 {
@@ -365,21 +366,11 @@ TEST(Master, SendBgpRecord)
 
 int main(int argc, char *argv[])
 {
-	screen_stat_handle_t fs2_handle=FS_create_handle();
+	tsg_stat_create("./tsgconf/main.conf");
+	tsg_stat_init();
 
-	int value=0,cycle=30;
-	value=1;//Rewrite
-	FS_set_para(fs2_handle, PRINT_MODE, &value, sizeof(value));
-	value=1;//Do not create stat thread
-	FS_set_para(fs2_handle, CREATE_THREAD, &value, sizeof(value));
-	FS_set_para(fs2_handle, STAT_CYCLE, &cycle, sizeof(cycle));
-	FS_set_para(fs2_handle, APP_NAME, (char *)"test", strlen((char *)"test")+1);
-
-	value=FS_OUTPUT_INFLUX_LINE;
-	FS_set_para(fs2_handle, STATS_FORMAT, &value, sizeof(value));
-
-	g_tsg_log_instance=tsg_sendlog_init("./tsgconf/main.conf", fs2_handle);
-	FS_start(fs2_handle);
+	g_tsg_log_instance=tsg_sendlog_init("./tsgconf/main.conf");
+	tsg_stat_start();
 	
 	testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/src/gtest_sync_state.cpp b/test/src/gtest_sync_state.cpp
index b28bef9..17c50cf 100644
--- a/test/src/gtest_sync_state.cpp
+++ b/test/src/gtest_sync_state.cpp
@@ -6,6 +6,7 @@
 #include <MESA/cJSON.h>
 #include <MESA/MESA_handle_logger.h>
 
+#include "tsg_stat.h"
 #include "tsg_sync_state.h"
 #include "tsg_variable.h"
 #include "mpack.h"
@@ -1464,10 +1465,13 @@ TEST(LOG_UPDATE, ProxyTwice)
 
 int main(int argc, char *argv[])
 {
-    g_tsg_para.logger = MESA_create_runtime_log_handle("log/tsg_sync_state", 10);
-    // tsg_bridge_init("tsgconf/main.conf");
-    testing::InitGoogleTest(&argc, argv);
-    int ret = RUN_ALL_TESTS();
-    MESA_destroy_runtime_log_handle(g_tsg_para.logger);
-    return ret;
+	g_tsg_para.logger = MESA_create_runtime_log_handle("log/tsg_sync_state", 10);
+	tsg_stat_create("./tsgconf/main.conf");
+	tsg_stat_init();
+	tsg_stat_start();
+
+	testing::InitGoogleTest(&argc, argv);
+	int ret = RUN_ALL_TESTS();
+	MESA_destroy_runtime_log_handle(g_tsg_para.logger);
+	return ret;
 }
diff --git a/test/src/gtest_tableinfo.cpp b/test/src/gtest_tableinfo.cpp
index 263a9f3..28ea6c8 100644
--- a/test/src/gtest_tableinfo.cpp
+++ b/test/src/gtest_tableinfo.cpp
@@ -1,8 +1,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-
 #include <arpa/inet.h>
+
+#include "tsg_stat.h"
 #include "tsg_rule.h"
 #include "tsg_label.h"
 #include "tsg_entry.h"
@@ -1379,9 +1380,14 @@ TEST(TSG_Table, APP_SIG_SESSION_ATTRIBUTE_INTEGER)
     maat_state_free(mid);
     mid = NULL;
 }
+
 int main(int argc, char *argv[])
 {
-    tsg_maat_rule_init("tsgconf/main.conf");
-    testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
+	tsg_stat_create("./tsgconf/main.conf");
+	tsg_stat_init();
+
+	tsg_maat_rule_init("tsgconf/main.conf");
+	tsg_stat_start();
+	testing::InitGoogleTest(&argc, argv);
+	return RUN_ALL_TESTS();
 }
\ No newline at end of file