Misc code cleanup (#18540)
Code cleanup
Stelios Fragkakis committed
Sep 16, 2024 at 08:45 UTC
39a3bff6d175770daa62748853b7c1d764c325c3
10 files changed
+2
-33
CMakeLists.txt
-1
@@ -1339,7 +1339,6 @@ set(CLAIM_WINDOWS_FILES
1339
)
1340
1341
set(ACLK_ALWAYS_BUILD
1342
- src/aclk/aclk_rrdhost_state.h
1342
src/aclk/aclk_proxy.c
1343
src/aclk/aclk_proxy.h
1344
src/aclk/aclk.c
src/aclk/aclk.h
+1
-1
@@ -5,7 +5,7 @@
5
#include "daemon/common.h"
6
7
#include "aclk_util.h"
8
-#include "aclk_rrdhost_state.h"
8
+//#include "aclk_rrdhost_state.h"
9
10
// How many MQTT PUBACKs we need to get to consider connection
11
// stable for the purposes of TBEB (truncated binary exponential backoff)
src/aclk/aclk_alarm_api.h
-1
@@ -6,7 +6,6 @@
6
#include "../daemon/common.h"
7
#include "schema-wrappers/schema_wrappers.h"
8
9
-//void aclk_send_provide_alarm_checkpoint(struct alarm_checkpoint *checkpoint);
9
void aclk_send_alarm_log_entry(struct alarm_log_entry *log_entry);
10
void aclk_send_provide_alarm_cfg(struct provide_alarm_configuration *cfg);
11
void aclk_send_alarm_snapshot(alarm_snapshot_proto_ptr_t snapshot);
src/aclk/aclk_query.c
-7
@@ -4,15 +4,8 @@
4
#include "aclk_tx_msgs.h"
5
#include "../../web/server/web_client_cache.h"
6
7
-#define WEB_HDR_ACCEPT_ENC "Accept-Encoding:"
8
-
7
static HTTP_ACL default_aclk_http_acl = HTTP_ACL_ALL_FEATURES;
8
11
-pthread_cond_t query_cond_wait = PTHREAD_COND_INITIALIZER;
12
-pthread_mutex_t query_lock_wait = PTHREAD_MUTEX_INITIALIZER;
13
-#define QUERY_THREAD_LOCK pthread_mutex_lock(&query_lock_wait)
14
-#define QUERY_THREAD_UNLOCK pthread_mutex_unlock(&query_lock_wait)
15
-
9
struct pending_req_list {
10
const char *msg_id;
11
uint32_t hash;
src/aclk/aclk_rrdhost_state.h
deleted
-11
@@ -1,11 +0,0 @@
1
-#ifndef ACLK_RRDHOST_STATE_H
2
-#define ACLK_RRDHOST_STATE_H
3
-
4
-#include "libnetdata/libnetdata.h"
5
-
6
-typedef struct aclk_rrdhost_state {
7
- char *claimed_id; // Claimed ID if host has one otherwise NULL
8
- char *prev_claimed_id; // Claimed ID if changed (reclaimed) during runtime
9
-} aclk_rrdhost_state;
10
-
11
-#endif /* ACLK_RRDHOST_STATE_H */
src/aclk/aclk_rx_msgs.h
-5
@@ -1,16 +1,11 @@
1
-
2
-
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
#ifndef ACLK_RX_MSGS_H
4
#define ACLK_RX_MSGS_H
5
8
-#include "daemon/common.h"
6
#include "libnetdata/libnetdata.h"
7
8
int aclk_handle_cloud_cmd_message(char *payload);
12
-
13
-const char *rx_handler_get_name(size_t i);
9
void aclk_init_rx_msg_handlers(void);
10
void aclk_handle_new_cloud_msg(const char *message_type, const char *msg, size_t msg_len, const char *topic);
11
src/aclk/aclk_tx_msgs.c
-3
@@ -189,9 +189,6 @@ short aclk_http_msg_v2(mqtt_wss_client client, const char *topic, const char *ms
189
case HTTP_RESP_INTERNAL_SERVER_ERROR:
190
aclk_http_msg_v2_err(client, topic, msg_id, rc, CLOUD_EC_FAIL_TOPIC, CLOUD_EMSG_FAIL_TOPIC, payload, payload_len);
191
break;
192
-// case HTTP_RESP_SERVICE_UNAVAILABLE:
193
-// aclk_http_msg_v2_err(client, topic, msg_id, rc, CLOUD_EC_SND_TIMEOUT, CLOUD_EMSG_SND_TIMEOUT, payload, payload_len);
194
-// break;
192
default:
193
rc = http_code;
194
break;
src/aclk/aclk_tx_msgs.h
-1
@@ -4,7 +4,6 @@
4
5
#include <json-c/json.h>
6
#include "libnetdata/libnetdata.h"
7
-#include "daemon/common.h"
7
#include "mqtt_websockets/mqtt_wss_client.h"
8
#include "schema-wrappers/schema_wrappers.h"
9
#include "aclk_util.h"
src/aclk/aclk_util.c
-2
@@ -10,8 +10,6 @@ usec_t aclk_session_newarch = 0;
10
11
aclk_env_t *aclk_env = NULL;
12
13
-int chart_batch_id;
14
-
13
aclk_encoding_type_t aclk_encoding_type_t_from_str(const char *str) {
14
if (!strcmp(str, "json")) {
15
return ACLK_ENC_JSON;
src/database/rrd.h
+1
-1
@@ -107,7 +107,7 @@ struct ml_metrics_statistics {
107
#include "streaming/stream_capabilities.h"
108
#include "streaming/stream_path.h"
109
#include "streaming/rrdpush.h"
110
-#include "aclk/aclk_rrdhost_state.h"
110
+//#include "aclk/aclk_rrdhost_state.h"
111
#include "sqlite/sqlite_health.h"
112
113
typedef struct storage_query_handle STORAGE_QUERY_HANDLE;