summaryrefslogtreecommitdiffstats
path: root/parser
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--parser/parser.c43
-rw-r--r--parser/parser.h2
2 files changed, 22 insertions, 23 deletions
diff --git a/parser/parser.c b/parser/parser.c
index 5fc601cea..01256da4a 100644
--- a/parser/parser.c
+++ b/parser/parser.c
@@ -33,38 +33,30 @@ PARSER *parser_init(RRDHOST *host, void *user, void *input, PARSER_INPUT_TYPE fl
PARSER *parser;
parser = callocz(1, sizeof(*parser));
-
- if (unlikely(!parser))
- return NULL;
-
parser->plugins_action = callocz(1, sizeof(PLUGINSD_ACTION));
- if (unlikely(!parser->plugins_action)) {
- freez(parser);
- return NULL;
- }
-
parser->user = user;
parser->input = input;
parser->flags = flags;
parser->host = host;
+
#ifdef ENABLE_HTTPS
parser->bytesleft = 0;
parser->readfrom = NULL;
#endif
if (unlikely(!(flags & PARSER_NO_PARSE_INIT))) {
- int rc = parser_add_keyword(parser, PLUGINSD_KEYWORD_FLUSH, pluginsd_flush);
- rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_CHART, pluginsd_chart);
- rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_DIMENSION, pluginsd_dimension);
- rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_DISABLE, pluginsd_disable);
- rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_VARIABLE, pluginsd_variable);
- rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_LABEL, pluginsd_label);
- rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_OVERWRITE, pluginsd_overwrite);
- rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_END, pluginsd_end);
- rc += parser_add_keyword(parser, "CLABEL_COMMIT", pluginsd_clabel_commit);
- rc += parser_add_keyword(parser, "CLABEL", pluginsd_clabel);
- rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_BEGIN, pluginsd_begin);
- rc += parser_add_keyword(parser, "SET", pluginsd_set);
+ parser_add_keyword(parser, PLUGINSD_KEYWORD_FLUSH, pluginsd_flush);
+ parser_add_keyword(parser, PLUGINSD_KEYWORD_CHART, pluginsd_chart);
+ parser_add_keyword(parser, PLUGINSD_KEYWORD_DIMENSION, pluginsd_dimension);
+ parser_add_keyword(parser, PLUGINSD_KEYWORD_DISABLE, pluginsd_disable);
+ parser_add_keyword(parser, PLUGINSD_KEYWORD_VARIABLE, pluginsd_variable);
+ parser_add_keyword(parser, PLUGINSD_KEYWORD_LABEL, pluginsd_label);
+ parser_add_keyword(parser, PLUGINSD_KEYWORD_OVERWRITE, pluginsd_overwrite);
+ parser_add_keyword(parser, PLUGINSD_KEYWORD_END, pluginsd_end);
+ parser_add_keyword(parser, "CLABEL_COMMIT", pluginsd_clabel_commit);
+ parser_add_keyword(parser, "CLABEL", pluginsd_clabel);
+ parser_add_keyword(parser, PLUGINSD_KEYWORD_BEGIN, pluginsd_begin);
+ parser_add_keyword(parser, "SET", pluginsd_set);
}
return parser;
@@ -141,10 +133,13 @@ int parser_add_keyword(PARSER *parser, char *keyword, keyword_function func)
tmp_keyword = callocz(1, sizeof(*tmp_keyword));
+ tmp_keyword->worker_job_id = parser->worker_job_ids++;
tmp_keyword->keyword = strdupz(keyword);
tmp_keyword->keyword_hash = keyword_hash;
tmp_keyword->func[tmp_keyword->func_no++] = (void *) func;
+ worker_register_job_name(tmp_keyword->worker_job_id, tmp_keyword->keyword);
+
tmp_keyword->next = parser->keyword;
parser->keyword = tmp_keyword;
return tmp_keyword->func_no;
@@ -181,9 +176,7 @@ void parser_destroy(PARSER *parser)
}
freez(parser->plugins_action);
-
freez(parser);
- return;
}
@@ -275,10 +268,12 @@ inline int parser_action(PARSER *parser, char *input)
uint32_t command_hash = simple_hash(command);
+ size_t worker_job_id = 0;
while(tmp_keyword) {
if (command_hash == tmp_keyword->keyword_hash &&
(!strcmp(command, tmp_keyword->keyword))) {
action_function_list = &tmp_keyword->func[0];
+ worker_job_id = tmp_keyword->worker_job_id;
break;
}
tmp_keyword = tmp_keyword->next;
@@ -294,12 +289,14 @@ inline int parser_action(PARSER *parser, char *input)
#endif
}
else {
+ worker_is_busy(worker_job_id);
while ((action_function = *action_function_list) != NULL) {
rc = action_function(words, parser->user, parser->plugins_action);
if (unlikely(rc == PARSER_RC_ERROR || rc == PARSER_RC_STOP))
break;
action_function_list++;
}
+ worker_is_idle();
}
if (likely(input == parser->buffer))
diff --git a/parser/parser.h b/parser/parser.h
index 8d11a9007..65a4e1ab3 100644
--- a/parser/parser.h
+++ b/parser/parser.h
@@ -54,6 +54,7 @@ typedef enum parser_input_type {
typedef PARSER_RC (*keyword_function)(char **, void *, PLUGINSD_ACTION *plugins_action);
typedef struct parser_keyword {
+ size_t worker_job_id;
char *keyword;
uint32_t keyword_hash;
int func_no;
@@ -67,6 +68,7 @@ typedef struct parser_data {
} PARSER_DATA;
typedef struct parser {
+ size_t worker_job_ids;
uint8_t version; // Parser version
RRDHOST *host;
void *input; // Input source e.g. stream