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 committed
Oct 23, 2024 at 06:19 UTC
281b298118181065c08e9f67c58c0b23e3d7d5fe
23 files changed
+33
-32
CMakeLists.txt
+5
-3
@@ -636,6 +636,7 @@ set(LIBNETDATA_FILES
636
src/libnetdata/aral/aral.h
637
src/libnetdata/avl/avl.c
638
src/libnetdata/avl/avl.h
639
+ src/libnetdata/bitmap/bitmap64.h
640
src/libnetdata/buffer/buffer.c
641
src/libnetdata/buffer/buffer.h
642
src/libnetdata/ringbuffer/ringbuffer.c
@@ -674,6 +675,7 @@ set(LIBNETDATA_FILES
675
src/libnetdata/line_splitter/line_splitter.c
676
src/libnetdata/line_splitter/line_splitter.h
677
src/libnetdata/libnetdata.h
678
+ src/libnetdata/linked_lists/linked_lists.h
679
src/libnetdata/locks/locks.c
680
src/libnetdata/locks/locks.h
681
src/libnetdata/log/systemd-journal-helpers.c
@@ -682,7 +684,6 @@ set(LIBNETDATA_FILES
684
src/libnetdata/log/nd_log.h
685
src/libnetdata/os/os.c
686
src/libnetdata/os/os.h
685
- src/libnetdata/simple_hashtable.h
687
src/libnetdata/os/byteorder.h
688
src/libnetdata/onewayalloc/onewayalloc.c
689
src/libnetdata/onewayalloc/onewayalloc.h
@@ -693,6 +694,8 @@ set(LIBNETDATA_FILES
694
src/libnetdata/required_dummies.h
695
src/libnetdata/socket/security.c
696
src/libnetdata/socket/security.h
697
+ src/libnetdata/simple_hashtable/simple_hashtable.h
698
+ src/libnetdata/simple_hashtable/simple_hashtable_undef.h
699
src/libnetdata/simple_pattern/simple_pattern.c
700
src/libnetdata/simple_pattern/simple_pattern.h
701
src/libnetdata/socket/socket.c
@@ -733,11 +736,9 @@ set(LIBNETDATA_FILES
736
src/libnetdata/dictionary/dictionary-hashtable.h
737
src/libnetdata/dictionary/dictionary-item.h
738
src/libnetdata/dictionary/dictionary-callbacks.h
736
- src/libnetdata/linked-lists.h
739
src/libnetdata/storage-point.h
740
src/libnetdata/parsers/parsers.h
741
src/libnetdata/parsers/duration.c
740
- src/libnetdata/bitmap64.h
742
src/libnetdata/os/gettid.c
743
src/libnetdata/os/gettid.h
744
src/libnetdata/os/adjtimex.c
@@ -860,6 +861,7 @@ set(LIBNETDATA_FILES
861
src/libnetdata/log/nd_log-common.h
862
src/libnetdata/log/nd_log-to-windows-common.h
863
src/libnetdata/common.h
864
+ src/libnetdata/xxHash/xxhash.h
865
)
866
867
if(ENABLE_PLUGIN_EBPF)
src/collectors/apps.plugin/apps_pid.c
+1
-1
@@ -13,7 +13,7 @@ static inline void link_pid_to_its_parent(struct pid_stat *p);
13
#define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION pid_stat_to_pid_ptr
14
#define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION pid_ptr_eq
15
#define SIMPLE_HASHTABLE_SAMPLE_IMPLEMENTATION 0
16
-#include "libnetdata/simple_hashtable.h"
16
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
17
18
static inline int32_t *pid_stat_to_pid_ptr(struct pid_stat *p) {
19
return &p->pid;
src/collectors/log2journal/log2journal.h
+3
-3
@@ -109,7 +109,7 @@ static inline void freez(void *ptr) {
109
// ----------------------------------------------------------------------------
110
111
#define XXH_INLINE_ALL
112
-#include "libnetdata/xxhash.h"
112
+#include "libnetdata/xxHash/xxhash.h"
113
114
#define PCRE2_CODE_UNIT_WIDTH 8
115
#include <pcre2.h>
@@ -122,14 +122,14 @@ static inline void freez(void *ptr) {
122
// hashtable for HASHED_KEY
123
124
// cleanup hashtable defines
125
-#include "libnetdata/simple_hashtable_undef.h"
125
+#include "libnetdata/simple_hashtable/simple_hashtable_undef.h"
126
127
struct hashed_key;
128
static inline int compare_keys(struct hashed_key *k1, struct hashed_key *k2);
129
#define SIMPLE_HASHTABLE_SORT_FUNCTION compare_keys
130
#define SIMPLE_HASHTABLE_VALUE_TYPE struct hashed_key
131
#define SIMPLE_HASHTABLE_NAME _KEY
132
-#include "libnetdata/simple_hashtable.h"
132
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
133
134
// ----------------------------------------------------------------------------
135
src/collectors/network-viewer.plugin/network-viewer.c
+1
-1
@@ -31,7 +31,7 @@ static SPAWN_SERVER *spawn_srv = NULL;
31
32
#define SIMPLE_HASHTABLE_VALUE_TYPE LOCAL_SOCKET
33
#define SIMPLE_HASHTABLE_NAME _AGGREGATED_SOCKETS
34
-#include "libnetdata/simple_hashtable.h"
34
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
35
36
netdata_mutex_t stdout_mutex = NETDATA_MUTEX_INITIALIZER;
37
static bool plugin_should_exit = false;
src/collectors/windows-events.plugin/windows-events-fields-cache.c
+1
-1
@@ -19,7 +19,7 @@ typedef struct field_value {
19
#define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION field_cache_value_to_key
20
#define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION field_cache_cache_compar
21
#define SIMPLE_HASHTABLE_SAMPLE_IMPLEMENTATION 1
22
-#include "libnetdata/simple_hashtable.h"
22
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
23
24
static inline WEVT_FIELD_KEY *field_cache_value_to_key(WEVT_FIELD_VALUE *p) {
25
return &p->key;
src/collectors/windows-events.plugin/windows-events-providers.c
+1
-1
@@ -64,7 +64,7 @@ typedef struct provider {
64
#define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION provider_value_to_key
65
#define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION provider_cache_compar
66
#define SIMPLE_HASHTABLE_SAMPLE_IMPLEMENTATION 1
67
-#include "libnetdata/simple_hashtable.h"
67
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
68
69
static struct {
70
SPINLOCK spinlock;
src/database/engine/journalfile.c
-1
@@ -1,5 +1,4 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
-#include "libnetdata/bitmap64.h"
2
#include "rrdengine.h"
3
4
static void after_extent_write_journalfile_v1_io(uv_fs_t* req)
src/libnetdata/bitmap/bitmap64.h
renamed
src/libnetdata/common.h
+2
-2
@@ -252,7 +252,7 @@ typedef uint32_t uid_t;
252
#endif
253
254
#define XXH_INLINE_ALL
255
-#include "xxhash.h"
255
+#include "xxHash/xxhash.h"
256
257
// --------------------------------------------------------------------------------------------------------------------
258
// OpenSSL
@@ -378,7 +378,7 @@ typedef uint32_t uid_t;
378
// --------------------------------------------------------------------------------------------------------------------
379
// Macro-only includes
380
381
-#include "linked-lists.h"
381
+#include "linked_lists/linked_lists.h"
382
383
// --------------------------------------------------------------------------------------------------------------------
384
src/libnetdata/config/dyncfg.c
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-#include "../../libnetdata/libnetdata.h"
3
+#include "../libnetdata.h"
4
5
// ----------------------------------------------------------------------------
6
src/libnetdata/facets/facets.c
+4
-4
@@ -102,25 +102,25 @@ static inline bool is_valid_string_hash(const char *s) {
102
// hashtable for FACET_VALUE
103
104
// cleanup hashtable defines
105
-#include "../../libnetdata/simple_hashtable_undef.h"
105
+#include "../simple_hashtable/simple_hashtable_undef.h"
106
107
struct facet_value;
108
// #define SIMPLE_HASHTABLE_SORT_FUNCTION compare_facet_value
109
#define SIMPLE_HASHTABLE_VALUE_TYPE struct facet_value
110
#define SIMPLE_HASHTABLE_NAME _VALUE
111
-#include "../simple_hashtable.h"
111
+#include "../simple_hashtable/simple_hashtable.h"
112
113
// ----------------------------------------------------------------------------
114
// hashtable for FACET_KEY
115
116
// cleanup hashtable defines
117
-#include "../../libnetdata/simple_hashtable_undef.h"
117
+#include "../simple_hashtable/simple_hashtable_undef.h"
118
119
struct facet_key;
120
// #define SIMPLE_HASHTABLE_SORT_FUNCTION compare_facet_key
121
#define SIMPLE_HASHTABLE_VALUE_TYPE struct facet_key
122
#define SIMPLE_HASHTABLE_NAME _KEY
123
-#include "../simple_hashtable.h"
123
+#include "../simple_hashtable/simple_hashtable.h"
124
125
// ----------------------------------------------------------------------------
126
src/libnetdata/libnetdata.h
+1
-1
@@ -88,7 +88,7 @@ char *find_and_replace(const char *src, const char *find, const char *replace, c
88
89
#define error_report(x, args...) do { errno_clear(); netdata_log_error(x, ##args); } while(0)
90
91
-#include "bitmap64.h"
91
+#include "bitmap/bitmap64.h"
92
93
#define COMPRESSION_MAX_CHUNK 0x4000
94
#define COMPRESSION_MAX_OVERHEAD 128
src/libnetdata/linked_lists/linked_lists.h
renamed
src/libnetdata/local-sockets/local-sockets.h
+5
-5
@@ -29,7 +29,7 @@
29
30
#define SIMPLE_HASHTABLE_VALUE_TYPE uint64_t
31
#define SIMPLE_HASHTABLE_NAME _NET_NS
32
-#include "libnetdata/simple_hashtable.h"
32
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
33
34
// --------------------------------------------------------------------------------------------------------------------
35
// hashtable for keeping the sockets of PIDs
@@ -38,7 +38,7 @@
38
struct pid_socket;
39
#define SIMPLE_HASHTABLE_VALUE_TYPE struct pid_socket
40
#define SIMPLE_HASHTABLE_NAME _PID_SOCKET
41
-#include "libnetdata/simple_hashtable.h"
41
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
42
43
// --------------------------------------------------------------------------------------------------------------------
44
// hashtable for keeping all the sockets
@@ -47,7 +47,7 @@ struct pid_socket;
47
struct local_socket;
48
#define SIMPLE_HASHTABLE_VALUE_TYPE struct local_socket
49
#define SIMPLE_HASHTABLE_NAME _LOCAL_SOCKET
50
-#include "libnetdata/simple_hashtable.h"
50
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
51
52
// --------------------------------------------------------------------------------------------------------------------
53
// hashtable for keeping all local IPs
@@ -56,7 +56,7 @@ struct local_socket;
56
union ipv46;
57
#define SIMPLE_HASHTABLE_VALUE_TYPE union ipv46
58
#define SIMPLE_HASHTABLE_NAME _LOCAL_IP
59
-#include "libnetdata/simple_hashtable.h"
59
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
60
61
// --------------------------------------------------------------------------------------------------------------------
62
// hashtable for keeping all listening ports
@@ -65,7 +65,7 @@ union ipv46;
65
struct local_port;
66
#define SIMPLE_HASHTABLE_VALUE_TYPE struct local_port
67
#define SIMPLE_HASHTABLE_NAME _LISTENING_PORT
68
-#include "libnetdata/simple_hashtable.h"
68
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
69
70
// --------------------------------------------------------------------------------------------------------------------
71
src/libnetdata/os/system-maps/cached-gid-groupname.c
+1
-1
@@ -11,7 +11,7 @@
11
#define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION cached_groupname_to_gid_ptr
12
#define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION compar_gid_ptr
13
#define SIMPLE_HASHTABLE_NAME _GROUPNAMES_CACHE
14
-#include "libnetdata/simple_hashtable.h"
14
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
15
16
static struct {
17
bool initialized;
src/libnetdata/os/system-maps/cached-sid-username.c
+1
-1
@@ -31,7 +31,7 @@ typedef struct {
31
#define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION sid_value_to_key
32
#define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION sid_cache_compar
33
#define SIMPLE_HASHTABLE_SAMPLE_IMPLEMENTATION 1
34
-#include "libnetdata/simple_hashtable.h"
34
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
35
36
static struct {
37
SPINLOCK spinlock;
src/libnetdata/os/system-maps/cached-uid-username.c
+1
-1
@@ -11,7 +11,7 @@
11
#define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION cached_username_to_uid_ptr
12
#define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION compar_uid_ptr
13
#define SIMPLE_HASHTABLE_NAME _USERNAMES_CACHE
14
-#include "libnetdata/simple_hashtable.h"
14
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
15
16
static struct {
17
uint32_t version;
src/libnetdata/os/system-maps/system-services.h
+1
-1
@@ -12,7 +12,7 @@
12
13
#define SIMPLE_HASHTABLE_VALUE_TYPE STRING
14
#define SIMPLE_HASHTABLE_NAME _SERVICENAMES_CACHE
15
-#include "libnetdata/simple_hashtable.h"
15
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
16
17
typedef struct servicenames_cache {
18
SPINLOCK spinlock;
src/libnetdata/os/windows-perflib/perflib-names.c
+1
-1
@@ -26,7 +26,7 @@ static inline const char *value2key_perfLibRegistryEntry(perfLibRegistryEntry *e
26
#define SIMPLE_HASHTABLE_KEY_TYPE const char
27
#define SIMPLE_HASHTABLE_VALUE_TYPE perfLibRegistryEntry
28
#define SIMPLE_HASHTABLE_NAME _PERFLIB
29
-#include "libnetdata/simple_hashtable.h"
29
+#include "libnetdata/simple_hashtable/simple_hashtable.h"
30
31
static struct {
32
SPINLOCK spinlock;
src/libnetdata/query_progress/progress.c
+2
-2
@@ -8,7 +8,7 @@
8
// hashtable for HASHED_KEY
9
10
// cleanup hashtable defines
11
-#include "../simple_hashtable_undef.h"
11
+#include "../simple_hashtable/simple_hashtable_undef.h"
12
13
struct query;
14
#define SIMPLE_HASHTABLE_VALUE_TYPE struct query
@@ -16,7 +16,7 @@ struct query;
16
#define SIMPLE_HASHTABLE_NAME _QUERY
17
#define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION query_transaction
18
#define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION query_compare_keys
19
-#include "../simple_hashtable.h"
19
+#include "../simple_hashtable/simple_hashtable.h"
20
21
// ----------------------------------------------------------------------------
22
src/libnetdata/simple_hashtable/simple_hashtable.h
renamed
+1
-1
@@ -507,7 +507,7 @@ static inline SIMPLE_HASHTABLE_SLOT_NAMED *simple_hashtable_next_read_only_named
507
#ifndef XXH_INLINE_ALL
508
#define XXH_INLINE_ALL
509
#endif
510
-#include "xxhash.h"
510
+#include "../xxHash/xxhash.h"
511
512
#define simple_hashtable_set_named CONCAT(simple_hashtable_set, SIMPLE_HASHTABLE_NAME)
513
#define simple_hashtable_get_named CONCAT(simple_hashtable_get, SIMPLE_HASHTABLE_NAME)