diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/fieldstat_test.cpp | 10 | ||||
| -rw-r--r-- | test/src/gtest_dynamic_fieldstat.cpp | 40 | ||||
| -rw-r--r-- | test/src/gtest_dynamic_fieldstat_output.cpp | 4 | ||||
| -rw-r--r-- | test/src/gtest_fieldstat_interface.cpp | 2 |
4 files changed, 28 insertions, 28 deletions
diff --git a/test/fieldstat_test.cpp b/test/fieldstat_test.cpp index 95fa11b..4dfec7e 100644 --- a/test/fieldstat_test.cpp +++ b/test/fieldstat_test.cpp @@ -80,7 +80,7 @@ static void* dynamic_register(void* arg) const char * bins_htr = "10,20,30,40,50,60,70,80,90"; const char * bins_sar = "0.1,0.5,0.8,0.9,0.95,0.99"; - struct fieldstat_tag tags[16]; + struct field_tag tags[16]; tags[0].key = "disable_output_prometheus"; tags[0].value_type = 2; tags[0].value_str = "yes"; @@ -183,7 +183,7 @@ int test_register_by_fieldstat_type(struct fieldstat_instance *instance) } g_counter_id[0] = ret; - struct fieldstat_tag tag_counter; + struct field_tag tag_counter; tag_counter.value_type = 2; tag_counter.value_str = "C_one_tag"; tag_counter.key = "C_one_tag_yes"; @@ -196,7 +196,7 @@ int test_register_by_fieldstat_type(struct fieldstat_instance *instance) } g_counter_id[1] = ret; - struct fieldstat_tag tags_counter[3]; + struct field_tag tags_counter[3]; tags_counter[0].value_type = 2; tags_counter[0].value_str = "C_tags_0"; tags_counter[0].key = "C_tags_0_yes"; @@ -229,7 +229,7 @@ int test_register_by_fieldstat_type(struct fieldstat_instance *instance) } g_gauge_id[0] = ret; - struct fieldstat_tag tag_gauge; + struct field_tag tag_gauge; tag_gauge.value_type = 2; tag_gauge.value_str = "G_one_tag"; tag_gauge.key = "G_one_tag_yes"; @@ -242,7 +242,7 @@ int test_register_by_fieldstat_type(struct fieldstat_instance *instance) } g_gauge_id[1] = ret; - struct fieldstat_tag tags_gauge[3]; + struct field_tag tags_gauge[3]; tags_gauge[0].value_type = 2; tags_gauge[0].value_str = "G_tags_0"; tags_gauge[0].key = "G_tags_0_yes"; diff --git a/test/src/gtest_dynamic_fieldstat.cpp b/test/src/gtest_dynamic_fieldstat.cpp index cc5e463..7de7473 100644 --- a/test/src/gtest_dynamic_fieldstat.cpp +++ b/test/src/gtest_dynamic_fieldstat.cpp @@ -190,7 +190,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicMetricValueIncrby) { int ret = 0; int n_thread = 64; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; tags[0].key = "policy_id"; tags[0].value_int = 1; @@ -252,7 +252,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicMetricValueSet) { int ret = 0; int n_thread = 64; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; tags[0].key = "policy_id"; tags[0].value_int = 1; @@ -312,7 +312,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicMetricValueDecrby) { int ret = 0; int n_thread = 64; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; tags[0].key = "policy_id"; tags[0].value_int = 1; @@ -373,7 +373,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicTableMetricValueIncrby) { int ret = 0; int n_thread = 64; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; tags[0].key = "policy_id"; tags[0].value_int = 1; @@ -444,7 +444,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicTableMetricValueSet) { int ret = 0; int n_thread = 64; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; tags[0].key = "policy_id"; tags[0].value_int = 1; @@ -515,7 +515,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicTableMetricValueDecrby) { int ret = 0; int n_thread = 64; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; tags[0].key = "policy_id"; tags[0].value_int = 1; @@ -657,7 +657,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolOneTag) int n_thread = 48; int ret = 0; struct fieldstat_dynamic_instance *instance = NULL; - struct fieldstat_tag tags[1]; + struct field_tag tags[1]; instance = fieldstat_dynamic_instance_new("firewall", n_thread); const char *compare_one_tag = "{\"fields\":{\"Active_sessions\":11},\"name\":\"Active_sessions\",\"tags\":{\"app_name\":\"firewall\",\"policy_id\":\"1\"}}"; @@ -684,7 +684,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTwoTags) int n_thread = 48; int ret = 0; struct fieldstat_dynamic_instance *instance = NULL; - struct fieldstat_tag tags[2]; + struct field_tag tags[2]; instance = fieldstat_dynamic_instance_new("firewall", n_thread); const char *compare_two_tags = "{\"fields\":{\"Active_sessions\":12},\"name\":\"Active_sessions\",\"tags\":{\"app_name\":\"firewall\",\"policy_id\":\"1\",\"quanlity\":\"0.500000\"}}"; @@ -752,7 +752,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTableMetricOneTag) enum field_type column_type[] = {FIELD_TYPE_COUNTER, FIELD_TYPE_COUNTER}; unsigned int out_column_ids[2]; int table_id = -1; - struct fieldstat_tag tags[1]; + struct field_tag tags[1]; const char *compare_one_tag = "{\"fields\":{\"bytes\":30,\"packages\":30},\"name\":\"security_rule_hits\",\"tags\":{\"app_name\":\"firewall\",\"policy_id\":\"1\",\"table_name\":\"shaping\"}}"; @@ -791,7 +791,7 @@ TEST(FeildStatDynamicAPI, FieldStatDynamicOutputLineProtocolTableMetricTowTags) enum field_type column_type[] = {FIELD_TYPE_COUNTER, FIELD_TYPE_COUNTER}; unsigned int out_column_ids[2]; int table_id = -1; - struct fieldstat_tag tags[2]; + struct field_tag tags[2]; const char *compare_two_tags = "{\"fields\":{\"bytes\":30,\"packages\":30},\"name\":\"security_rule_hits\",\"tags\":{\"app_name\":\"firewall\",\"policy_id\":\"1\",\"quanlity\":\"0.500000\",\"table_name\":\"shaping\"}}"; @@ -1308,7 +1308,7 @@ void _worker_thread_multi_incrby(void *arg) struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; int i = 0; @@ -1445,7 +1445,7 @@ void _worker_thread_multi_decrby(void *arg) struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; int i = 0; @@ -1582,7 +1582,7 @@ void _worker_thread_multi_set(void *arg) struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; int i = 0; @@ -1719,7 +1719,7 @@ void _worker_thread_incrby_multi_metric(void *arg) struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; int i = 0; @@ -1861,7 +1861,7 @@ void _worker_thread_decrby_multi_metric(void *arg) struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; int i = 0; @@ -2005,7 +2005,7 @@ void _worker_thread_set_multi_metric(void *arg) struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; int i = 0; @@ -2150,7 +2150,7 @@ void _worker_thread_multi_incrby_multi_metric(void *arg) struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; int i = 0; @@ -2296,7 +2296,7 @@ void _worker_thread_multi_decrby_multi_metric(void *arg) struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; int i = 0; @@ -2441,7 +2441,7 @@ void _worker_thread_multi_set_multi_metric(void *arg) struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; int i = 0; @@ -2775,7 +2775,7 @@ TEST(FeildStatDynamicAPI, SendLenEqualUDPPayload) enum field_type column_type[] = {FIELD_TYPE_COUNTER, FIELD_TYPE_COUNTER}; unsigned int out_column_ids[2]; - struct fieldstat_tag tags[4]; + struct field_tag tags[4]; tags[0].key = "policy_id"; tags[0].value_int = 1; diff --git a/test/src/gtest_dynamic_fieldstat_output.cpp b/test/src/gtest_dynamic_fieldstat_output.cpp index 5e86372..4e88de3 100644 --- a/test/src/gtest_dynamic_fieldstat_output.cpp +++ b/test/src/gtest_dynamic_fieldstat_output.cpp @@ -30,7 +30,7 @@ void _worker_thread_multi_incrby(void *arg) struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[3]; + struct field_tag tags[3]; int i = 0; @@ -126,7 +126,7 @@ void _worker_thread_table_incrby(void *arg) const char *row_name = "security_rule_hits"; struct fieldstat_dynamic_instance *instance = para->instance; int ret = 0; - struct fieldstat_tag tags[14]; + struct field_tag tags[14]; long long values[20]; diff --git a/test/src/gtest_fieldstat_interface.cpp b/test/src/gtest_fieldstat_interface.cpp index eb236b7..d2d8eaf 100644 --- a/test/src/gtest_fieldstat_interface.cpp +++ b/test/src/gtest_fieldstat_interface.cpp @@ -171,7 +171,7 @@ TEST(FeildStatAPI, FieldStatRegister) struct fieldstat_instance * instance = NULL; int metric_id = -1; struct metric **in_block_metric = NULL; - struct fieldstat_tag tags[2]; + struct field_tag tags[2]; tags[0].value_type = 2; tags[0].value_str = "127.0.0.1"; tags[0].key = "dest_ip"; |