Remove unused NETDATA_NO_ATOMIC_INSTRUCTIONS macro (#12045)
vkalintiris committed
Feb 22, 2022 at 13:55 UTC
1c23dbfe480a4412a5df2fb7ca2c001b0a24c98c
3 files changed
+8
-8
aclk/aclk_util.c
+1
-1
@@ -64,7 +64,7 @@ int aclk_env_has_capa(const char *capa)
64
65
#ifdef ACLK_LOG_CONVERSATION_DIR
66
volatile int aclk_conversation_log_counter = 0;
67
-#if !defined(HAVE_C___ATOMIC) || defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
67
+#if !defined(HAVE_C___ATOMIC)
68
netdata_mutex_t aclk_conversation_log_mutex = NETDATA_MUTEX_INITIALIZER;
69
int aclk_get_conv_log_next()
70
{
aclk/aclk_util.h
+1
-1
@@ -86,7 +86,7 @@ void free_topic_cache(void);
86
87
#ifdef ACLK_LOG_CONVERSATION_DIR
88
extern volatile int aclk_conversation_log_counter;
89
-#if defined(HAVE_C___ATOMIC) && !defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
89
+#if defined(HAVE_C___ATOMIC)
90
#define ACLK_GET_CONV_LOG_NEXT() __atomic_fetch_add(&aclk_conversation_log_counter, 1, __ATOMIC_SEQ_CST)
91
#else
92
extern netdata_mutex_t aclk_conversation_log_mutex;
daemon/global_statistics.c
+6
-6
@@ -37,7 +37,7 @@ static struct global_statistics {
37
.rrdr_result_points_generated = 0,
38
};
39
40
-#if defined(HAVE_C___ATOMIC) && !defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
40
+#if defined(HAVE_C___ATOMIC)
41
#else
42
netdata_mutex_t global_statistics_mutex = NETDATA_MUTEX_INITIALIZER;
43
@@ -52,7 +52,7 @@ static inline void global_statistics_unlock(void) {
52
53
54
void rrdr_query_completed(uint64_t db_points_read, uint64_t result_points_generated) {
55
-#if defined(HAVE_C___ATOMIC) && !defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
55
+#if defined(HAVE_C___ATOMIC)
56
__atomic_fetch_add(&global_statistics.rrdr_queries_made, 1, __ATOMIC_SEQ_CST);
57
__atomic_fetch_add(&global_statistics.rrdr_db_points_read, db_points_read, __ATOMIC_SEQ_CST);
58
__atomic_fetch_add(&global_statistics.rrdr_result_points_generated, result_points_generated, __ATOMIC_SEQ_CST);
@@ -75,7 +75,7 @@ void finished_web_request_statistics(uint64_t dt,
75
uint64_t bytes_sent,
76
uint64_t content_size,
77
uint64_t compressed_content_size) {
78
-#if defined(HAVE_C___ATOMIC) && !defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
78
+#if defined(HAVE_C___ATOMIC)
79
uint64_t old_web_usec_max = global_statistics.web_usec_max;
80
while(dt > old_web_usec_max)
81
__atomic_compare_exchange(&global_statistics.web_usec_max, &old_web_usec_max, &dt, 1, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
@@ -107,7 +107,7 @@ void finished_web_request_statistics(uint64_t dt,
107
}
108
109
uint64_t web_client_connected(void) {
110
-#if defined(HAVE_C___ATOMIC) && !defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
110
+#if defined(HAVE_C___ATOMIC)
111
__atomic_fetch_add(&global_statistics.connected_clients, 1, __ATOMIC_SEQ_CST);
112
uint64_t id = __atomic_fetch_add(&global_statistics.web_client_count, 1, __ATOMIC_SEQ_CST);
113
#else
@@ -125,7 +125,7 @@ uint64_t web_client_connected(void) {
125
}
126
127
void web_client_disconnected(void) {
128
-#if defined(HAVE_C___ATOMIC) && !defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
128
+#if defined(HAVE_C___ATOMIC)
129
__atomic_fetch_sub(&global_statistics.connected_clients, 1, __ATOMIC_SEQ_CST);
130
#else
131
if (web_server_is_multithreaded)
@@ -140,7 +140,7 @@ void web_client_disconnected(void) {
140
141
142
static inline void global_statistics_copy(struct global_statistics *gs, uint8_t options) {
143
-#if defined(HAVE_C___ATOMIC) && !defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
143
+#if defined(HAVE_C___ATOMIC)
144
gs->connected_clients = __atomic_fetch_add(&global_statistics.connected_clients, 0, __ATOMIC_SEQ_CST);
145
gs->web_requests = __atomic_fetch_add(&global_statistics.web_requests, 0, __ATOMIC_SEQ_CST);
146
gs->web_usec = __atomic_fetch_add(&global_statistics.web_usec, 0, __ATOMIC_SEQ_CST);