diff options
| author | root <[email protected]> | 2024-07-29 03:29:27 +0000 |
|---|---|---|
| committer | root <[email protected]> | 2024-07-29 03:29:27 +0000 |
| commit | 9a9a03f7a9a5ec6acd6356a6e0143b1cd1e17892 (patch) | |
| tree | f6062dfb9923642b4273b5a4ed1b1e01a5f3c9f9 /shaping | |
| parent | 96832f8e726dd5596532acbdaaaec6fe6caa853f (diff) | |
fix ci buile break
Diffstat (limited to 'shaping')
| -rw-r--r-- | shaping/include/shaper_global_stat.h | 1 | ||||
| -rw-r--r-- | shaping/include/shaper_stat.h | 1 | ||||
| -rw-r--r-- | shaping/src/shaper_global_stat.cpp | 1 | ||||
| -rw-r--r-- | shaping/src/shaper_stat.cpp | 1 | ||||
| -rw-r--r-- | shaping/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | shaping/test/gtest_shaper.cpp | 1 | ||||
| -rw-r--r-- | shaping/test/gtest_shaper_with_swarmkv.cpp | 2 |
7 files changed, 3 insertions, 5 deletions
diff --git a/shaping/include/shaper_global_stat.h b/shaping/include/shaper_global_stat.h index ec68453..4e3a276 100644 --- a/shaping/include/shaper_global_stat.h +++ b/shaping/include/shaper_global_stat.h @@ -1,4 +1,5 @@ #pragma once +#include <fieldstat/fieldstat_easy.h> enum shaping_global_stat_column_index { CURR_SESSION_NUM_IDX = 0, diff --git a/shaping/include/shaper_stat.h b/shaping/include/shaper_stat.h index 22ca620..e508d63 100644 --- a/shaping/include/shaper_stat.h +++ b/shaping/include/shaper_stat.h @@ -2,6 +2,7 @@ #include <netinet/in.h> #include <librdkafka/rdkafka.h> +#include <fieldstat/fieldstat_easy.h> #include "uthash.h" enum shaping_packet_dir { diff --git a/shaping/src/shaper_global_stat.cpp b/shaping/src/shaper_global_stat.cpp index c039fda..1080033 100644 --- a/shaping/src/shaper_global_stat.cpp +++ b/shaping/src/shaper_global_stat.cpp @@ -2,7 +2,6 @@ #include <stdlib.h> #include <MESA/MESA_prof_load.h> -#include <fieldstat/fieldstat_easy.h> #include "log.h" #include "utils.h" diff --git a/shaping/src/shaper_stat.cpp b/shaping/src/shaper_stat.cpp index e37f5e0..feb1406 100644 --- a/shaping/src/shaper_stat.cpp +++ b/shaping/src/shaper_stat.cpp @@ -4,7 +4,6 @@ #include <arpa/inet.h> #include <MESA/MESA_prof_load.h> #include <MESA/swarmkv.h> -#include <fieldstat/fieldstat_easy.h> #include "log.h" #include "utils.h" diff --git a/shaping/test/CMakeLists.txt b/shaping/test/CMakeLists.txt index 6a0dd48..67f18b6 100644 --- a/shaping/test/CMakeLists.txt +++ b/shaping/test/CMakeLists.txt @@ -51,5 +51,6 @@ gtest_discover_tests(gtest_shaper_maat) gtest_discover_tests(gtest_shaper_send_log) gtest_discover_tests(gtest_shaper) gtest_discover_tests(gtest_shaper_aqm) +gtest_discover_tests(gtest_shaper_with_swarmkv) file(COPY ./test_conf/ DESTINATION ./conf/)
\ No newline at end of file diff --git a/shaping/test/gtest_shaper.cpp b/shaping/test/gtest_shaper.cpp index 8121936..97f71ee 100644 --- a/shaping/test/gtest_shaper.cpp +++ b/shaping/test/gtest_shaper.cpp @@ -1,7 +1,6 @@ #include <gtest/gtest.h> #include <cjson/cJSON.h> #include <sys/queue.h> -#include <fieldstat/fieldstat_easy.h> #include "log.h" #include "shaper.h" diff --git a/shaping/test/gtest_shaper_with_swarmkv.cpp b/shaping/test/gtest_shaper_with_swarmkv.cpp index 055908e..675d46e 100644 --- a/shaping/test/gtest_shaper_with_swarmkv.cpp +++ b/shaping/test/gtest_shaper_with_swarmkv.cpp @@ -245,9 +245,7 @@ int main(int argc, char **argv) testing::InitGoogleTest(&argc, argv); //testing::GTEST_FLAG(filter) = "single_session.udp_tx_in_order"; - char *err=NULL; const char *cluster_name="swarmkv-shaping-nodes"; - struct swarmkv *db=NULL; swarmkv_cli_create_cluster(cluster_name, "127.0.0.1:5210"); |