time_t t = time(0);
const char *updatestr = "Last update %d.%m.%Y %T (%Z)";
- pid = do_fork_limited();
- if (pid)
- return pid;
-
pr_info("Drawing image %s\n", image->image_filename);
tmpfile[0] = 0;
add_arg(args, argcnt, argstr, idx, "COMMENT: %s\\c", timestamp);
- pid = run(cmd, args);
- harvest_zombies(pid);
+ run(cmd, args);
rename(tmpfile, image->image_filename);
- exit(0);
+ return 0;
}
int rrdtool_draw_images(struct rrd_image **image)
{
int i;
for (i = 0; image[i]; i++)
- rrdtool_draw_image(image[i]);
+ queue_work(WORK_PRIORITY_LOW, "rrdtool_draw_image",
+ rrdtool_draw_image, image[i]);
return 0;
}
return ret < 0 ? ret : 0;
}
-int rrdtool_update_data(struct rrd_database *rrd)
+static int do_rrdtool_update_data(struct rrd_database *rrd)
{
int pid;
char data[RRD_DATA_MAX_LEN + 3]; /* 3 == "N:" + NULL termination */
};
int l;
- rrd->last_update = time(0);
- if (do_fork())
- return 0;
-
l = sprintf(data, "N:");
if (rrd->parser && rrd->parser->parse) {
sanitize_rrd_update_data(data + l);
write_to_logfile(rrd, data);
- pid = run(cmd, cmdline);
- harvest_zombies(pid);
+ run(cmd, cmdline);
}
if (rrd->pre_draw_cmd && !strcmp(rrd->pre_draw_cmd[0], "shell")) {
- pid = run(rrd->pre_draw_cmd[1], &rrd->pre_draw_cmd[1]);
- harvest_zombies(pid);
+ run(rrd->pre_draw_cmd[1], &rrd->pre_draw_cmd[1]);
}
if (rrd->images)
rrdtool_draw_images(rrd->images);
- while (harvest_zombies(0));
+ if (rrd->post_draw_cmd && !strcmp(rrd->post_draw_cmd[0], "shell"))
+ run(rrd->post_draw_cmd[1], &rrd->post_draw_cmd[1]);
- if (rrd->post_draw_cmd && !strcmp(rrd->post_draw_cmd[0], "shell")) {
- pid = run(rrd->post_draw_cmd[1], &rrd->post_draw_cmd[1]);
- harvest_zombies(pid);
- }
+ return 0;
+}
- exit(0);
+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);
}
/*
// char cmd[] = "echo";
char *args[512], argstr[ARGSTR_LEN];
int idx = 0, argcnt = 0;
- int child, i;
+ int i;
if (!db->filename) {
pr_err("Database %s missing database filename\n", db->name);
db->archives[i].rows);
}
- child = run(cmd, args);
-
- harvest_zombies(child);
+ run(cmd, args);
return 0;
}