fix fsanitize ifdefs (#19809)
Costa Tsaousis committed
Mar 8, 2025 at 21:20 UTC
bb42987e8d4c0dd37c12f0e5182d085a8a4e30fa
4 files changed
+4
-12
src/daemon/signal-handler.c
+2
-2
@@ -87,7 +87,7 @@ static void posix_unmask_my_signals(void) {
87
}
88
89
void nd_initialize_signals(void) {
90
-#if defined(FSANITIZE)
90
+#if defined(FSANITIZE_ADDRESS)
91
;
92
#else
93
signals_block_all_except_deadly();
@@ -165,7 +165,7 @@ static void process_triggered_signals(void) {
165
}
166
167
void nd_process_signals(void) {
168
-#if defined(FSANITIZE)
168
+#if defined(FSANITIZE_ADDRESS)
169
while(true)
170
pause();
171
#else
src/database/rrddim-collection.c
+1
-1
@@ -49,7 +49,7 @@ void store_metric_at_tier_flush_last_completed(RRDDIM *rd __maybe_unused, size_t
49
}
50
51
ALWAYS_INLINE_HOT
52
-void store_metric_at_tier_save_last_completed(RRDDIM *rd, size_t tier, struct rrddim_tier *t, STORAGE_POINT sp) {
52
+static void store_metric_at_tier_save_last_completed(RRDDIM *rd, size_t tier, struct rrddim_tier *t, STORAGE_POINT sp) {
53
// make sure the last_completed_point is empty
54
store_metric_at_tier_flush_last_completed(rd, tier, t);
55
src/libnetdata/common.h
+1
-1
@@ -335,7 +335,7 @@ typedef uint32_t uid_t;
335
336
#define UNUSED(x) (void)(x)
337
338
-#if defined(__GNUC__) && !defined(FSANITIZE)
338
+#if defined(__GNUC__) && !defined(FSANITIZE_ADDRESS)
339
#define UNUSED_FUNCTION(x) __attribute__((unused)) UNUSED_##x
340
#define ALWAYS_INLINE_ONLY __attribute__((always_inline))
341
#define ALWAYS_INLINE inline __attribute__((always_inline)) // Forces inlining
src/libnetdata/signals/signals.c
-8
@@ -3,16 +3,12 @@
3
#include "../libnetdata.h"
4
5
void signals_block_all(void) {
6
-#if defined(FSANITIZE)
7
- ;
8
-#else
6
sigset_t sigset;
7
sigfillset(&sigset);
8
9
if(pthread_sigmask(SIG_BLOCK, &sigset, NULL) != 0)
10
nd_log(NDLS_DAEMON, NDLP_ERR,
11
"SIGNALS: cannot apply the default mask for signals");
15
-#endif
12
}
13
14
void signals_unblock_one(int signo) {
@@ -39,12 +35,8 @@ void signals_unblock(int signals[], size_t count) {
35
}
36
37
void signals_unblock_deadly(void) {
42
-#if defined(FSANITIZE)
43
- ;
44
-#else
38
int deadly_signals[] = {SIGBUS, SIGSEGV, SIGFPE, SIGILL, SIGABRT};
39
signals_unblock(deadly_signals, _countof(deadly_signals));
47
-#endif
40
}
41
42
void signals_block_all_except_deadly(void) {