Browse Source

Reorganize top-level headers in libnetdata. (#18643)

Move top-level libnetdata headers (simple hashtable,
bitmap, linked list, xxHash) into more
specific subdirectories and update the
corresponding include paths throughout the
project to reflect these changes.
vkalintiris 4 months ago
parent
commit
281b298118

+ 5 - 3
CMakeLists.txt

@@ -636,6 +636,7 @@ set(LIBNETDATA_FILES
         src/libnetdata/aral/aral.h
         src/libnetdata/avl/avl.c
         src/libnetdata/avl/avl.h
+        src/libnetdata/bitmap/bitmap64.h
         src/libnetdata/buffer/buffer.c
         src/libnetdata/buffer/buffer.h
         src/libnetdata/ringbuffer/ringbuffer.c
@@ -674,6 +675,7 @@ set(LIBNETDATA_FILES
         src/libnetdata/line_splitter/line_splitter.c
         src/libnetdata/line_splitter/line_splitter.h
         src/libnetdata/libnetdata.h
+        src/libnetdata/linked_lists/linked_lists.h
         src/libnetdata/locks/locks.c
         src/libnetdata/locks/locks.h
         src/libnetdata/log/systemd-journal-helpers.c
@@ -682,7 +684,6 @@ set(LIBNETDATA_FILES
         src/libnetdata/log/nd_log.h
         src/libnetdata/os/os.c
         src/libnetdata/os/os.h
-        src/libnetdata/simple_hashtable.h
         src/libnetdata/os/byteorder.h
         src/libnetdata/onewayalloc/onewayalloc.c
         src/libnetdata/onewayalloc/onewayalloc.h
@@ -693,6 +694,8 @@ set(LIBNETDATA_FILES
         src/libnetdata/required_dummies.h
         src/libnetdata/socket/security.c
         src/libnetdata/socket/security.h
+        src/libnetdata/simple_hashtable/simple_hashtable.h
+        src/libnetdata/simple_hashtable/simple_hashtable_undef.h
         src/libnetdata/simple_pattern/simple_pattern.c
         src/libnetdata/simple_pattern/simple_pattern.h
         src/libnetdata/socket/socket.c
@@ -733,11 +736,9 @@ set(LIBNETDATA_FILES
         src/libnetdata/dictionary/dictionary-hashtable.h
         src/libnetdata/dictionary/dictionary-item.h
         src/libnetdata/dictionary/dictionary-callbacks.h
-        src/libnetdata/linked-lists.h
         src/libnetdata/storage-point.h
         src/libnetdata/parsers/parsers.h
         src/libnetdata/parsers/duration.c
-        src/libnetdata/bitmap64.h
         src/libnetdata/os/gettid.c
         src/libnetdata/os/gettid.h
         src/libnetdata/os/adjtimex.c
@@ -860,6 +861,7 @@ set(LIBNETDATA_FILES
         src/libnetdata/log/nd_log-common.h
         src/libnetdata/log/nd_log-to-windows-common.h
         src/libnetdata/common.h
+        src/libnetdata/xxHash/xxhash.h
 )
 
 if(ENABLE_PLUGIN_EBPF)

+ 1 - 1
src/collectors/apps.plugin/apps_pid.c

@@ -13,7 +13,7 @@ static inline void link_pid_to_its_parent(struct pid_stat *p);
 #define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION pid_stat_to_pid_ptr
 #define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION pid_ptr_eq
 #define SIMPLE_HASHTABLE_SAMPLE_IMPLEMENTATION 0
-#include "libnetdata/simple_hashtable.h"
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
 
 static inline int32_t *pid_stat_to_pid_ptr(struct pid_stat *p) {
     return &p->pid;

+ 3 - 3
src/collectors/log2journal/log2journal.h

@@ -109,7 +109,7 @@ static inline void freez(void *ptr) {
 // ----------------------------------------------------------------------------
 
 #define XXH_INLINE_ALL
-#include "libnetdata/xxhash.h"
+#include "libnetdata/xxHash/xxhash.h"
 
 #define PCRE2_CODE_UNIT_WIDTH 8
 #include <pcre2.h>
@@ -122,14 +122,14 @@ static inline void freez(void *ptr) {
 // hashtable for HASHED_KEY
 
 // cleanup hashtable defines
-#include "libnetdata/simple_hashtable_undef.h"
+#include "libnetdata/simple_hashtable/simple_hashtable_undef.h"
 
 struct hashed_key;
 static inline int compare_keys(struct hashed_key *k1, struct hashed_key *k2);
 #define SIMPLE_HASHTABLE_SORT_FUNCTION compare_keys
 #define SIMPLE_HASHTABLE_VALUE_TYPE struct hashed_key
 #define SIMPLE_HASHTABLE_NAME _KEY
-#include "libnetdata/simple_hashtable.h"
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
 
 // ----------------------------------------------------------------------------
 

+ 1 - 1
src/collectors/network-viewer.plugin/network-viewer.c

@@ -31,7 +31,7 @@ static SPAWN_SERVER *spawn_srv = NULL;
 
 #define SIMPLE_HASHTABLE_VALUE_TYPE LOCAL_SOCKET
 #define SIMPLE_HASHTABLE_NAME _AGGREGATED_SOCKETS
-#include "libnetdata/simple_hashtable.h"
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
 
 netdata_mutex_t stdout_mutex = NETDATA_MUTEX_INITIALIZER;
 static bool plugin_should_exit = false;

+ 1 - 1
src/collectors/windows-events.plugin/windows-events-fields-cache.c

@@ -19,7 +19,7 @@ typedef struct field_value {
 #define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION field_cache_value_to_key
 #define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION field_cache_cache_compar
 #define SIMPLE_HASHTABLE_SAMPLE_IMPLEMENTATION 1
-#include "libnetdata/simple_hashtable.h"
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
 
 static inline WEVT_FIELD_KEY *field_cache_value_to_key(WEVT_FIELD_VALUE *p) {
     return &p->key;

+ 1 - 1
src/collectors/windows-events.plugin/windows-events-providers.c

@@ -64,7 +64,7 @@ typedef struct provider {
 #define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION provider_value_to_key
 #define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION provider_cache_compar
 #define SIMPLE_HASHTABLE_SAMPLE_IMPLEMENTATION 1
-#include "libnetdata/simple_hashtable.h"
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
 
 static struct {
     SPINLOCK spinlock;

+ 0 - 1
src/database/engine/journalfile.c

@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-#include "libnetdata/bitmap64.h"
 #include "rrdengine.h"
 
 static void after_extent_write_journalfile_v1_io(uv_fs_t* req)

+ 0 - 0
src/libnetdata/bitmap64.h → src/libnetdata/bitmap/bitmap64.h


+ 2 - 2
src/libnetdata/common.h

@@ -252,7 +252,7 @@ typedef uint32_t uid_t;
 #endif
 
 #define XXH_INLINE_ALL
-#include "xxhash.h"
+#include "xxHash/xxhash.h"
 
 // --------------------------------------------------------------------------------------------------------------------
 // OpenSSL
@@ -378,7 +378,7 @@ typedef uint32_t uid_t;
 // --------------------------------------------------------------------------------------------------------------------
 // Macro-only includes
 
-#include "linked-lists.h"
+#include "linked_lists/linked_lists.h"
 
 // --------------------------------------------------------------------------------------------------------------------
 

+ 1 - 1
src/libnetdata/config/dyncfg.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "../../libnetdata/libnetdata.h"
+#include "../libnetdata.h"
 
 // ----------------------------------------------------------------------------
 

Some files were not shown because too many files changed in this diff