diff options
author | vkalintiris <vasilis@netdata.cloud> | 2022-11-01 20:53:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-01 20:53:35 +0200 |
commit | a364cef58290bb8b699f2bf356bf086663d67002 (patch) | |
tree | 61490f1a21e7f6a154cb877b69f002db899b6aab | |
parent | 2a340bc2a0649db2ef6c6e643e5dadf7aa13bed7 (diff) |
Remove pluginsd action param & dead code. (#13928)
-rw-r--r-- | collectors/plugins.d/plugins_d.h | 4 | ||||
-rw-r--r-- | collectors/plugins.d/pluginsd_parser.c | 135 | ||||
-rw-r--r-- | collectors/plugins.d/pluginsd_parser.h | 4 | ||||
-rw-r--r-- | parser/parser.c | 6 | ||||
-rw-r--r-- | parser/parser.h | 52 | ||||
-rw-r--r-- | streaming/receiver.c | 4 |
6 files changed, 45 insertions, 160 deletions
diff --git a/collectors/plugins.d/plugins_d.h b/collectors/plugins.d/plugins_d.h index c4b4830bef..a8acf038a4 100644 --- a/collectors/plugins.d/plugins_d.h +++ b/collectors/plugins.d/plugins_d.h @@ -26,10 +26,6 @@ #define PLUGINSD_KEYWORD_FUNCTION "FUNCTION" #define PLUGINSD_KEYWORD_FUNCTION_RESULT_BEGIN "FUNCTION_RESULT_BEGIN" #define PLUGINSD_KEYWORD_FUNCTION_RESULT_END "FUNCTION_RESULT_END" -#define PLUGINSD_KEYWORD_GUID "GUID" -#define PLUGINSD_KEYWORD_CONTEXT "CONTEXT" -#define PLUGINSD_KEYWORD_TOMBSTONE "TOMBSTONE" -#define PLUGINSD_KEYWORD_HOST "HOST" #define PLUGINSD_KEYWORD_REPLAY_CHART "REPLAY_CHART" #define PLUGINSD_KEYWORD_REPLAY_BEGIN "RBEGIN" diff --git a/collectors/plugins.d/pluginsd_parser.c b/collectors/plugins.d/pluginsd_parser.c index 34d4ce6768..2d20e8971c 100644 --- a/collectors/plugins.d/pluginsd_parser.c +++ b/collectors/plugins.d/pluginsd_parser.c @@ -29,7 +29,7 @@ static int send_to_plugin(const char *txt, void *data) { return ret; } -PARSER_RC pluginsd_set(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_set(char **words, size_t num_words, void *user) { char *dimension = get_word(words, num_words, 1); char *value = get_word(words, num_words, 2); @@ -73,7 +73,7 @@ disable: return PARSER_RC_ERROR; } -PARSER_RC pluginsd_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_begin(char **words, size_t num_words, void *user) { char *id = get_word(words, num_words, 1); char *microseconds_txt = get_word(words, num_words, 2); @@ -112,7 +112,7 @@ disable: return PARSER_RC_ERROR; } -PARSER_RC pluginsd_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_end(char **words, size_t num_words, void *user) { UNUSED(words); UNUSED(num_words); @@ -135,7 +135,7 @@ PARSER_RC pluginsd_end(char **words, size_t num_words, void *user, PLUGINSD_ACTI return PARSER_RC_OK; } -PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user) { RRDHOST *host = ((PARSER_USER_OBJECT *) user)->host; if (unlikely(!host && !((PARSER_USER_OBJECT *) user)->host_exists)) { @@ -259,10 +259,8 @@ PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user, PLUGINSD_AC return PARSER_RC_OK; } -PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action) +PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *user) { - UNUSED(plugins_action); - long first_entry_child = str2l(get_word(words, num_words, 1)); long last_entry_child = str2l(get_word(words, num_words, 2)); @@ -281,7 +279,7 @@ PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *us return ok ? PARSER_RC_OK : PARSER_RC_ERROR; } -PARSER_RC pluginsd_dimension(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_dimension(char **words, size_t num_words, void *user) { char *id = get_word(words, num_words, 1); char *name = get_word(words, num_words, 2); @@ -511,7 +509,7 @@ static int pluginsd_execute_function_callback(BUFFER *destination_wb, int timeou return HTTP_RESP_OK; } -PARSER_RC pluginsd_function(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_function(char **words, size_t num_words, void *user) { bool global = false; size_t i = 1; @@ -558,7 +556,7 @@ static void pluginsd_function_result_end(struct parser *parser, void *action_dat string_freez(key); } -PARSER_RC pluginsd_function_result_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_function_result_begin(char **words, size_t num_words, void *user) { char *key = get_word(words, num_words, 1); char *status = get_word(words, num_words, 2); @@ -614,7 +612,7 @@ PARSER_RC pluginsd_function_result_begin(char **words, size_t num_words, void *u // ---------------------------------------------------------------------------- -PARSER_RC pluginsd_variable(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_variable(char **words, size_t num_words, void *user) { char *name = get_word(words, num_words, 1); char *value = get_word(words, num_words, 2); @@ -691,7 +689,7 @@ PARSER_RC pluginsd_variable(char **words, size_t num_words, void *user, PLUGINSD return PARSER_RC_OK; } -PARSER_RC pluginsd_flush(char **words __maybe_unused, size_t num_words __maybe_unused, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_flush(char **words __maybe_unused, size_t num_words __maybe_unused, void *user) { debug(D_PLUGINSD, "requested a FLUSH"); ((PARSER_USER_OBJECT *) user)->st = NULL; @@ -702,14 +700,14 @@ PARSER_RC pluginsd_flush(char **words __maybe_unused, size_t num_words __maybe_u return PARSER_RC_OK; } -PARSER_RC pluginsd_disable(char **words __maybe_unused, size_t num_words __maybe_unused, void *user __maybe_unused, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_disable(char **words __maybe_unused, size_t num_words __maybe_unused, void *user __maybe_unused) { info("called DISABLE. Disabling it."); ((PARSER_USER_OBJECT *) user)->enabled = 0; return PARSER_RC_ERROR; } -PARSER_RC pluginsd_label(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_label(char **words, size_t num_words, void *user) { const char *name = get_word(words, num_words, 1); const char *label_source = get_word(words, num_words, 2); @@ -761,7 +759,7 @@ PARSER_RC pluginsd_label(char **words, size_t num_words, void *user, PLUGINSD_AC return PARSER_RC_OK; } -PARSER_RC pluginsd_overwrite(char **words __maybe_unused, size_t num_words __maybe_unused, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_overwrite(char **words __maybe_unused, size_t num_words __maybe_unused, void *user) { RRDHOST *host = ((PARSER_USER_OBJECT *) user)->host; debug(D_PLUGINSD, "requested to OVERWRITE host labels"); @@ -778,7 +776,7 @@ PARSER_RC pluginsd_overwrite(char **words __maybe_unused, size_t num_words __may } -PARSER_RC pluginsd_clabel(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_clabel(char **words, size_t num_words, void *user) { const char *name = get_word(words, num_words, 1); const char *value = get_word(words, num_words, 2); @@ -800,7 +798,7 @@ PARSER_RC pluginsd_clabel(char **words, size_t num_words, void *user, PLUGINSD_A return PARSER_RC_OK; } -PARSER_RC pluginsd_clabel_commit(char **words __maybe_unused, size_t num_words __maybe_unused, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_clabel_commit(char **words __maybe_unused, size_t num_words __maybe_unused, void *user) { RRDHOST *host = ((PARSER_USER_OBJECT *) user)->host; RRDSET *st = ((PARSER_USER_OBJECT *)user)->st; @@ -824,100 +822,7 @@ PARSER_RC pluginsd_clabel_commit(char **words __maybe_unused, size_t num_words _ return PARSER_RC_OK; } -PARSER_RC pluginsd_guid(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action) -{ - char *uuid_str = get_word(words, num_words, 1); - uuid_t uuid; - - if (unlikely(!uuid_str)) { - error("requested a GUID, without a uuid."); - return PARSER_RC_ERROR; - } - if (unlikely(strlen(uuid_str) != GUID_LEN || uuid_parse(uuid_str, uuid) == -1)) { - error("requested a GUID, without a valid uuid string."); - return PARSER_RC_ERROR; - } - - debug(D_PLUGINSD, "Parsed uuid=%s", uuid_str); - if (plugins_action->guid_action) { - return plugins_action->guid_action(user, &uuid); - } - - return PARSER_RC_OK; -} - -PARSER_RC pluginsd_context(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action) -{ - char *uuid_str = get_word(words, num_words, 1); - uuid_t uuid; - - if (unlikely(!uuid_str)) { - error("requested a CONTEXT, without a uuid."); - return PARSER_RC_ERROR; - } - if (unlikely(strlen(uuid_str) != GUID_LEN || uuid_parse(uuid_str, uuid) == -1)) { - error("requested a CONTEXT, without a valid uuid string."); - return PARSER_RC_ERROR; - } - - debug(D_PLUGINSD, "Parsed uuid=%s", uuid_str); - if (plugins_action->context_action) { - return plugins_action->context_action(user, &uuid); - } - - return PARSER_RC_OK; -} - -PARSER_RC pluginsd_tombstone(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action) -{ - char *uuid_str = get_word(words, num_words, 1); - uuid_t uuid; - - if (unlikely(!uuid_str)) { - error("requested a TOMBSTONE, without a uuid."); - return PARSER_RC_ERROR; - } - if (unlikely(strlen(uuid_str) != GUID_LEN || uuid_parse(uuid_str, uuid) == -1)) { - error("requested a TOMBSTONE, without a valid uuid string."); - return PARSER_RC_ERROR; - } - - debug(D_PLUGINSD, "Parsed uuid=%s", uuid_str); - if (plugins_action->tombstone_action) { - return plugins_action->tombstone_action(user, &uuid); - } - - return PARSER_RC_OK; -} - -PARSER_RC metalog_pluginsd_host(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action) -{ - char *machine_guid = get_word(words, num_words, 1); - char *hostname = get_word(words, num_words, 2); - char *registry_hostname = get_word(words, num_words, 3); - char *update_every_s = get_word(words, num_words, 4); - char *os = get_word(words, num_words, 5); - char *timezone = get_word(words, num_words, 6); - char *tags = get_word(words, num_words, 7); - - int update_every = 1; - if (likely(update_every_s && *update_every_s)) - update_every = str2i(update_every_s); - if (unlikely(!update_every)) - update_every = 1; - - debug(D_PLUGINSD, "HOST PARSED: guid=%s, hostname=%s, reg_host=%s, update=%d, os=%s, timezone=%s, tags=%s", - machine_guid, hostname, registry_hostname, update_every, os, timezone, tags); - - if (plugins_action->host_action) { - return plugins_action->host_action( - user, machine_guid, hostname, registry_hostname, update_every, os, timezone, tags); - } - - return PARSER_RC_OK; -} - -PARSER_RC pluginsd_replay_rrdset_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_replay_rrdset_begin(char **words, size_t num_words, void *user) { char *id = get_word(words, num_words, 1); char *start_time_str = get_word(words, num_words, 2); @@ -988,7 +893,7 @@ disable: return PARSER_RC_ERROR; } -PARSER_RC pluginsd_replay_set(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_replay_set(char **words, size_t num_words, void *user) { char *dimension = get_word(words, num_words, 1); char *value_str = get_word(words, num_words, 2); @@ -1084,7 +989,7 @@ disable: return PARSER_RC_ERROR; } -PARSER_RC pluginsd_replay_rrddim_collection_state(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_replay_rrddim_collection_state(char **words, size_t num_words, void *user) { char *dimension = get_word(words, num_words, 1); char *last_collected_ut_str = get_word(words, num_words, 2); @@ -1133,7 +1038,7 @@ disable: return PARSER_RC_ERROR; } -PARSER_RC pluginsd_replay_rrdset_collection_state(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_replay_rrdset_collection_state(char **words, size_t num_words, void *user) { char *last_collected_ut_str = get_word(words, num_words, 1); char *last_updated_ut_str = get_word(words, num_words, 2); @@ -1176,7 +1081,7 @@ disable: return PARSER_RC_ERROR; } -PARSER_RC pluginsd_replay_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused) +PARSER_RC pluginsd_replay_end(char **words, size_t num_words, void *user) { if (num_words < 7) { error("REPLAY: malformed " PLUGINSD_KEYWORD_REPLAY_END " command"); diff --git a/collectors/plugins.d/pluginsd_parser.h b/collectors/plugins.d/pluginsd_parser.h index 8ddb614f69..a76ab211fe 100644 --- a/collectors/plugins.d/pluginsd_parser.h +++ b/collectors/plugins.d/pluginsd_parser.h @@ -29,7 +29,7 @@ typedef struct parser_user_object { } replay; } PARSER_USER_OBJECT; -PARSER_RC pluginsd_function(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_function_result_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); +PARSER_RC pluginsd_function(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_function_result_begin(char **words, size_t num_words, void *user); void inflight_functions_init(PARSER *parser); #endif //NETDATA_PLUGINSD_PARSER_H diff --git a/parser/parser.c b/parser/parser.c index 190f31414d..3eeba8816a 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -34,7 +34,6 @@ PARSER *parser_init(RRDHOST *host, void *user, void *input, void *output, PARSER PARSER *parser; parser = callocz(1, sizeof(*parser)); - parser->plugins_action = callocz(1, sizeof(PLUGINSD_ACTION)); parser->user = user; parser->input = input; parser->output = output; @@ -194,7 +193,6 @@ void parser_destroy(PARSER *parser) tmp_parser_data = tmp_parser_data_next; } - freez(parser->plugins_action); freez(parser); } @@ -334,7 +332,7 @@ inline int parser_action(PARSER *parser, char *input) if (unlikely(!action_function_list)) { if (unlikely(parser->unknown_function)) - rc = parser->unknown_function(words, num_words, parser->user, NULL); + rc = parser->unknown_function(words, num_words, parser->user); else rc = PARSER_RC_ERROR; @@ -343,7 +341,7 @@ inline int parser_action(PARSER *parser, char *input) else { worker_is_busy(worker_job_id); while ((action_function = *action_function_list) != NULL) { - rc = action_function(words, num_words, parser->user, parser->plugins_action); + rc = action_function(words, num_words, parser->user); if (unlikely(rc == PARSER_RC_ERROR || rc == PARSER_RC_STOP)) { internal_error(true, "action_function() failed with rc = %u", rc); break; diff --git a/parser/parser.h b/parser/parser.h index 146b988eec..c8a89a59d0 100644 --- a/parser/parser.h +++ b/parser/parser.h @@ -16,14 +16,6 @@ typedef enum parser_rc { PARSER_RC_ERROR // Callback failed (abort rest of callbacks) } PARSER_RC; -typedef struct pluginsd_action { - PARSER_RC (*guid_action)(void *user, uuid_t *uuid); - PARSER_RC (*context_action)(void *user, uuid_t *uuid); - PARSER_RC (*tombstone_action)(void *user, uuid_t *uuid); - PARSER_RC (*host_action)(void *user, char *machine_guid, char *hostname, char *registry_hostname, int update_every, char *os, - char *timezone, char *tags); -} PLUGINSD_ACTION; - typedef enum parser_input_type { PARSER_INPUT_SPLIT = (1 << 1), PARSER_INPUT_KEEP_ORIGINAL = (1 << 2), @@ -35,7 +27,7 @@ typedef enum parser_input_type { #define PARSER_INPUT_FULL (PARSER_INPUT_SPLIT|PARSER_INPUT_ORIGINAL) -typedef PARSER_RC (*keyword_function)(char **words, size_t num_words, void *user_data, PLUGINSD_ACTION *plugins_action); +typedef PARSER_RC (*keyword_function)(char **words, size_t num_words, void *user_data); typedef struct parser_keyword { size_t worker_job_id; @@ -62,7 +54,6 @@ typedef struct parser { #endif PARSER_DATA *data; // extra input PARSER_KEYWORD *keyword; // List of parse keywords and functions - PLUGINSD_ACTION *plugins_action; void *user; // User defined structure to hold extra state between calls uint32_t flags; @@ -104,27 +95,24 @@ int parser_recover_input(PARSER *working_parser); size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp_plugin_input, FILE *fp_plugin_output, int trust_durations); -PARSER_RC pluginsd_set(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_dimension(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_variable(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_flush(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_disable(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_label(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_overwrite(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_guid(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_context(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_tombstone(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_clabel_commit(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_clabel(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); - -PARSER_RC pluginsd_replay_rrdset_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_replay_rrddim_collection_state(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_replay_rrdset_collection_state(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_replay_set(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); -PARSER_RC pluginsd_replay_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action); +PARSER_RC pluginsd_set(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_begin(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_end(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_dimension(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_variable(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_flush(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_disable(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_label(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_overwrite(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_clabel_commit(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_clabel(char **words, size_t num_words, void *user); + +PARSER_RC pluginsd_replay_rrdset_begin(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_replay_rrddim_collection_state(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_replay_rrdset_collection_state(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_replay_set(char **words, size_t num_words, void *user); +PARSER_RC pluginsd_replay_end(char **words, size_t num_words, void *user); #endif diff --git a/streaming/receiver.c b/streaming/receiver.c index 9ffada2417..ed5d51fe3d 100644 --- a/streaming/receiver.c +++ b/streaming/receiver.c @@ -65,10 +65,8 @@ static void rrdpush_receiver_thread_cleanup(void *ptr) { #include "collectors/plugins.d/pluginsd_parser.h" -PARSER_RC streaming_claimed_id(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action) +PARSER_RC streaming_claimed_id(char **words, size_t num_words, void *user) { - UNUSED(plugins_action); - const char *host_uuid_str = get_word(words, num_words, 1); const char *claim_id_str = get_word(words, num_words, 2); |