Allow parsers to store private data to databases

[rrdd] / rrdtool.c

diff --git a/rrdtool.c b/rrdtool.c
index e7eedc7603927ebc8aa364844ff1184222b76b5c..da876d51da7620d8051ca6f0320790c71f5e687f 100644 (file)
--- a/rrdtool.c
+++ b/rrdtool.c
@@ -102,7 +102,7 @@ int rrdtool_draw_images(struct rrd_image **image)
        int i;
        for (i = 0; image[i]; i++)
                queue_work(WORK_PRIORITY_LOW, "rrdtool_draw_image",
-                       rrdtool_draw_image, image[i]);
+                       (work_fn_t *)rrdtool_draw_image, image[i]);
 
        return 0;
 }
@@ -250,6 +250,16 @@ static int write_to_logfile(struct rrd_database *rrd, const char *data)
        return ret < 0 ? ret : 0;
 }
 
+static int run_post_draw_cmd(struct rrd_database *rrd)
+{
+       pr_info("Running post draw command for %s\n", rrd->name);
+
+       if (rrd->post_draw_cmd && !strcmp(rrd->post_draw_cmd[0], "shell"))
+               run(rrd->post_draw_cmd[1], &rrd->post_draw_cmd[1]);
+
+       return 0;
+}
+
 static int do_rrdtool_update_data(struct rrd_database *rrd)
 {
        char data[RRD_DATA_MAX_LEN + 3]; /* 3 == "N:" + NULL termination */
@@ -264,10 +274,12 @@ static int do_rrdtool_update_data(struct rrd_database *rrd)
        };
        int l;
 
+       bzero(data, sizeof(data));
        l = sprintf(data, "N:");
 
        if (rrd->parser && rrd->parser->parse) {
-               rrd->parser->parse(data + l, rrd->parser_data);
+               rrd->parser->parse(data + l, rrd->parser_data,
+                               &rrd->parser_state);
                data[RRD_DATA_MAX_LEN + 2] = '\0';
 
                pr_info("Data: %s\n", data);
@@ -285,8 +297,18 @@ static int do_rrdtool_update_data(struct rrd_database *rrd)
        if (rrd->images)
                rrdtool_draw_images(rrd->images);
 
-       if (rrd->post_draw_cmd && !strcmp(rrd->post_draw_cmd[0], "shell"))
-               run(rrd->post_draw_cmd[1], &rrd->post_draw_cmd[1]);
+       /*
+        * We rely on the fact that rrdtool_draw_images queues image
+        * drawings into low priority queue and the post draw queue is
+        * placed on the queue after images. This ensures post draw
+        * command is not started before images are started.
+        *
+        * There is nothing that guarantees post_draw_cmd is executed
+        * after all images are completed though, but it's close..
+        */
+       if (rrd->post_draw_cmd)
+               queue_work(WORK_PRIORITY_LOW, "rrdtool_post_draw_cmd",
+                       (work_fn_t *)run_post_draw_cmd, rrd);
 
        return 0;
 }
@@ -296,7 +318,7 @@ int rrdtool_update_data(struct rrd_database *rrd)
        rrd->last_update = time(0);
 
        return queue_work(WORK_PRIORITY_HIGH, "rrdtool_update_data",
-                       do_rrdtool_update_data, rrd);
+                       (work_fn_t *)do_rrdtool_update_data, rrd);
 }
 
 /*