From 6fda3e9ddba421681df76c78718129fb41602051 Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Wed, 3 Jan 2024 17:18:06 +0800 Subject: [PATCH] Move dablooms to deps --- deps/CMakeLists.txt | 3 ++- {src => deps}/dablooms/CMakeLists.txt | 2 +- {src => deps}/dablooms/README.md | 0 {src => deps}/dablooms/dablooms.cpp | 0 {src => deps}/dablooms/dablooms.h | 0 {src => deps}/dablooms/murmur.cpp | 0 {src => deps}/dablooms/murmur.h | 0 {src => deps}/dablooms/test/CMakeLists.txt | 0 {src => deps}/dablooms/test/gtest_dablooms.cpp | 14 +++++++------- src/CMakeLists.txt | 3 +-- 10 files changed, 11 insertions(+), 11 deletions(-) rename {src => deps}/dablooms/CMakeLists.txt (78%) rename {src => deps}/dablooms/README.md (100%) rename {src => deps}/dablooms/dablooms.cpp (100%) rename {src => deps}/dablooms/dablooms.h (100%) rename {src => deps}/dablooms/murmur.cpp (100%) rename {src => deps}/dablooms/murmur.h (100%) rename {src => deps}/dablooms/test/CMakeLists.txt (100%) rename {src => deps}/dablooms/test/gtest_dablooms.cpp (76%) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 0a29ecf..25fad3d 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(timeout) \ No newline at end of file +add_subdirectory(timeout) +add_subdirectory(dablooms) \ No newline at end of file diff --git a/src/dablooms/CMakeLists.txt b/deps/dablooms/CMakeLists.txt similarity index 78% rename from src/dablooms/CMakeLists.txt rename to deps/dablooms/CMakeLists.txt index 9ea1fe1..ef8248e 100644 --- a/src/dablooms/CMakeLists.txt +++ b/deps/dablooms/CMakeLists.txt @@ -3,7 +3,7 @@ ############################################################################### add_library(dablooms dablooms.cpp murmur.cpp) -target_include_directories(dablooms PUBLIC ${CMAKE_SOURCE_DIR}/src/dablooms) +target_include_directories(dablooms PUBLIC ${CMAKE_CURRENT_LIST_DIR}) target_link_libraries(dablooms) add_subdirectory(test) \ No newline at end of file diff --git a/src/dablooms/README.md b/deps/dablooms/README.md similarity index 100% rename from src/dablooms/README.md rename to deps/dablooms/README.md diff --git a/src/dablooms/dablooms.cpp b/deps/dablooms/dablooms.cpp similarity index 100% rename from src/dablooms/dablooms.cpp rename to deps/dablooms/dablooms.cpp diff --git a/src/dablooms/dablooms.h b/deps/dablooms/dablooms.h similarity index 100% rename from src/dablooms/dablooms.h rename to deps/dablooms/dablooms.h diff --git a/src/dablooms/murmur.cpp b/deps/dablooms/murmur.cpp similarity index 100% rename from src/dablooms/murmur.cpp rename to deps/dablooms/murmur.cpp diff --git a/src/dablooms/murmur.h b/deps/dablooms/murmur.h similarity index 100% rename from src/dablooms/murmur.h rename to deps/dablooms/murmur.h diff --git a/src/dablooms/test/CMakeLists.txt b/deps/dablooms/test/CMakeLists.txt similarity index 100% rename from src/dablooms/test/CMakeLists.txt rename to deps/dablooms/test/CMakeLists.txt diff --git a/src/dablooms/test/gtest_dablooms.cpp b/deps/dablooms/test/gtest_dablooms.cpp similarity index 76% rename from src/dablooms/test/gtest_dablooms.cpp rename to deps/dablooms/test/gtest_dablooms.cpp index 36740a2..539d82d 100644 --- a/src/dablooms/test/gtest_dablooms.cpp +++ b/deps/dablooms/test/gtest_dablooms.cpp @@ -2,7 +2,7 @@ #include "dablooms.h" -struct packet_key +struct packet_idetify { unsigned int tcp_seq; unsigned int tcp_ack; @@ -14,7 +14,7 @@ struct packet_key unsigned int ip_dst; } __attribute__((packed, aligned(1))); -struct duplicate_packet_idetify_config +struct config { int enable; @@ -28,7 +28,7 @@ struct duplicate_packet_idetify_config .expiry_time = 10, }; -struct packet_key key = { +struct packet_idetify idetify = { .tcp_seq = 2172673142, .tcp_ack = 2198097831, .sport = 46582, @@ -44,18 +44,18 @@ TEST(DABLOOMS, ADD_SEARCH) struct expiry_dablooms_handle *handle = expiry_dablooms_init(config.capacity, config.error_rate, time(NULL), config.expiry_time); EXPECT_TRUE(handle != nullptr); - EXPECT_TRUE(expiry_dablooms_search(handle, (const char *)&key, sizeof(key), time(NULL)) != 1); // no exist - EXPECT_TRUE(expiry_dablooms_add(handle, (const char *)&key, sizeof(key), time(NULL)) == 0); // add + EXPECT_TRUE(expiry_dablooms_search(handle, (const char *)&idetify, sizeof(idetify), time(NULL)) != 1); // no exist + EXPECT_TRUE(expiry_dablooms_add(handle, (const char *)&idetify, sizeof(idetify), time(NULL)) == 0); // add for (int i = 0; i < 15; i++) { if (i < config.expiry_time) { - EXPECT_TRUE(expiry_dablooms_search(handle, (const char *)&key, sizeof(key), time(NULL)) == 1); // exist + EXPECT_TRUE(expiry_dablooms_search(handle, (const char *)&idetify, sizeof(idetify), time(NULL)) == 1); // exist } else { - EXPECT_TRUE(expiry_dablooms_search(handle, (const char *)&key, sizeof(key), time(NULL)) != 1); // no exist + EXPECT_TRUE(expiry_dablooms_search(handle, (const char *)&idetify, sizeof(idetify), time(NULL)) != 1); // no exist } sleep(1); printf("sleep[%02d] 1s\n", i); diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9df2956..22ba14b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,5 +2,4 @@ add_subdirectory(timestamp) add_subdirectory(tuple) add_subdirectory(packet) add_subdirectory(session) -add_subdirectory(stellar) -add_subdirectory(dablooms) \ No newline at end of file +add_subdirectory(stellar) \ No newline at end of file