/*
* Private functions
*/
+struct ident_get_default_defs__data_s
+{
+ char **dses;
+ size_t dses_num;
+};
+typedef struct ident_get_default_defs__data_s ident_get_default_defs__data_t;
+
+static int ident_get_default_defs__callback (__attribute__((unused))
+ graph_ident_t *ident,
+ const char *ds_name, void *user_data)
+{
+ ident_get_default_defs__data_t *data = user_data;
+ char **tmp;
+
+ tmp = realloc (data->dses, (data->dses_num + 1) * sizeof (data->dses));
+ if (tmp == NULL)
+ return (ENOMEM);
+ data->dses = tmp;
+
+ data->dses[data->dses_num] = strdup (ds_name);
+ if (data->dses[data->dses_num] == NULL)
+ return (ENOMEM);
+
+ data->dses_num++;
+ return (0);
+} /* }}} int ident_get_default_defs__callback */
+
/* Create one DEF for each data source in the file. Called by
* "inst_get_default_defs" for each file. */
static graph_def_t *ident_get_default_defs (graph_config_t *cfg, /* {{{ */
{
graph_def_t *defs = NULL;
char *file;
- char **dses = NULL;
- size_t dses_num = 0;
+ ident_get_default_defs__data_t ds_data;
int status;
size_t i;
+ ds_data.dses = NULL;
+ ds_data.dses_num = 0;
+
if ((cfg == NULL) || (ident == NULL))
return (def_head);
return (def_head);
}
- status = ds_list_from_rrd_file (file, &dses_num, &dses);
+ status = data_provider_get_ident_ds_names (ident,
+ ident_get_default_defs__callback, &ds_data);
if (status != 0)
{
free (file);
return (def_head);
}
- for (i = 0; i < dses_num; i++)
+ for (i = 0; i < ds_data.dses_num; i++)
{
graph_def_t *def;
- def = def_search (def_head, ident, dses[i]);
+ def = def_search (def_head, ident, ds_data.dses[i]);
if (def != NULL)
continue;
- def = def_create (cfg, ident, dses[i]);
+ def = def_create (cfg, ident, ds_data.dses[i]);
if (def == NULL)
continue;
else
def_append (defs, def);
- free (dses[i]);
+ free (ds_data.dses[i]);
}
- free (dses);
+ free (ds_data.dses);
free (file);
return (defs);
} /* }}} int ident_get_default_defs */
-/* Create one or more DEFs for each file in the graph instance. The number
- * depends on the number of data sources in each of the files. Called from
- * "inst_get_rrdargs" if no DEFs are available from the configuration.
- * */
-static graph_def_t *inst_get_default_defs (graph_config_t *cfg, /* {{{ */
- graph_instance_t *inst)
-{
- graph_def_t *defs = NULL;
- size_t i;
-
- if ((cfg == NULL) || (inst == NULL))
- return (NULL);
-
- for (i = 0; i < inst->files_num; i++)
- {
- graph_def_t *def;
-
- def = ident_get_default_defs (cfg, inst->files[i], defs);
- if (def == NULL)
- continue;
-
- if (defs == NULL)
- defs = def;
- else
- def_append (defs, def);
- }
-
- return (defs);
-} /* }}} graph_def_t *inst_get_default_defs */
-
/* Called with each DEF in turn. Calls "def_get_rrdargs" with every appropriate
* file / DEF pair. */
static int gl_instance_get_rrdargs_cb (graph_def_t *def, void *user_data) /* {{{ */
rrd_args_t *args = data->args;
size_t i;
+ int status;
for (i = 0; i < inst->files_num; i++)
{
if (!def_matches (def, inst->files[i]))
continue;
- def_get_rrdargs (def, inst->files[i], args);
+ status = def_get_rrdargs (def, inst->files[i], args);
+ if (status != 0)
+ {
+ fprintf (stderr, "gl_instance_get_rrdargs_cb: def_get_rrdargs failed with status %i\n",
+ status);
+ fflush (stderr);
+ }
}
return (0);
return (status);
} /* }}} int inst_get_rrdargs */
+/* Create one or more DEFs for each file in the graph instance. The number
+ * depends on the number of data sources in each of the files. Called from
+ * "inst_get_rrdargs" if no DEFs are available from the configuration.
+ * */
+graph_def_t *inst_get_default_defs (graph_config_t *cfg, /* {{{ */
+ graph_instance_t *inst)
+{
+ graph_def_t *defs = NULL;
+ size_t i;
+
+ if ((cfg == NULL) || (inst == NULL))
+ return (NULL);
+
+ for (i = 0; i < inst->files_num; i++)
+ {
+ graph_def_t *def;
+
+ def = ident_get_default_defs (cfg, inst->files[i], defs);
+ if (def == NULL)
+ continue;
+
+ if (defs == NULL)
+ defs = def;
+ else
+ def_append (defs, def);
+ }
+
+ return (defs);
+} /* }}} graph_def_t *inst_get_default_defs */
+
graph_ident_t *inst_get_selector (graph_instance_t *inst) /* {{{ */
{
if (inst == NULL)
buffer[0] = 0;
+#define COPY_ESCAPE(str) do { \
+ char tmp[1024]; \
+ uri_escape_copy (tmp, (str), sizeof (tmp)); \
+ strlcat (buffer, tmp, buffer_size); \
+} while (0) \
+
#define COPY_FIELD(field) do { \
const char *cfg_f = ident_get_##field (cfg_select); \
const char *inst_f = ident_get_##field (inst->select); \
{ \
strlcat (buffer, #field, buffer_size); \
strlcat (buffer, "=", buffer_size); \
- strlcat (buffer, cfg_f, buffer_size); \
+ COPY_ESCAPE (cfg_f); \
} \
else \
{ \
strlcat (buffer, "graph_", buffer_size); \
strlcat (buffer, #field, buffer_size); \
strlcat (buffer, "=", buffer_size); \
- strlcat (buffer, cfg_f, buffer_size); \
+ COPY_ESCAPE (cfg_f); \
strlcat (buffer, ";", buffer_size); \
strlcat (buffer, "inst_", buffer_size); \
strlcat (buffer, #field, buffer_size); \
strlcat (buffer, "=", buffer_size); \
- strlcat (buffer, inst_f, buffer_size); \
+ COPY_ESCAPE (inst_f); \
} \
} while (0)
COPY_FIELD(type_instance);
#undef COPY_FIELD
+#undef COPY_ESCAPE
ident_destroy (cfg_select);
return (0);
} /* }}} _Bool inst_matches_field */
+int inst_to_json (const graph_instance_t *inst, /* {{{ */
+ yajl_gen handler)
+{
+ size_t i;
+
+ if ((inst == NULL) || (handler == NULL))
+ return (EINVAL);
+
+ /* TODO: error handling */
+ yajl_gen_map_open (handler);
+ yajl_gen_string (handler,
+ (unsigned char *) "select",
+ (unsigned int) strlen ("select"));
+ ident_to_json (inst->select, handler);
+ yajl_gen_string (handler,
+ (unsigned char *) "files",
+ (unsigned int) strlen ("files"));
+ yajl_gen_array_open (handler);
+ for (i = 0; i < inst->files_num; i++)
+ ident_to_json (inst->files[i], handler);
+ yajl_gen_array_close (handler);
+ yajl_gen_map_close (handler);
+
+ return (0);
+} /* }}} int inst_to_json */
+
+int inst_data_to_json (const graph_instance_t *inst, /* {{{ */
+ dp_time_t begin, dp_time_t end, dp_time_t res,
+ yajl_gen handler)
+{
+ size_t i;
+
+ yajl_gen_array_open (handler);
+ for (i = 0; i < inst->files_num; i++)
+ ident_data_to_json (inst->files[i], begin, end, res, handler);
+ yajl_gen_array_close (handler);
+
+ return (0);
+} /* }}} int inst_data_to_json */
+
int inst_describe (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
char *buffer, size_t buffer_size)
{
graph_ident_t *cfg_select;
+ int status;
if ((cfg == NULL) || (inst == NULL)
|| (buffer == NULL) || (buffer_size < 2))
return (-1);
}
- buffer[0] = 0;
-
-#define CHECK_FIELD(field) do { \
- if (IS_ANY (ident_get_##field (cfg_select))) \
- { \
- if (buffer[0] != 0) \
- strlcat (buffer, "/", buffer_size); \
- strlcat (buffer, ident_get_##field (inst->select), buffer_size); \
- } \
-} while (0)
-
- CHECK_FIELD (host);
- CHECK_FIELD (plugin);
- CHECK_FIELD (plugin_instance);
- CHECK_FIELD (type);
- CHECK_FIELD (type_instance);
-
-#undef CHECK_FIELD
-
- if (buffer[0] == 0)
- strlcat (buffer, "default", buffer_size);
+ status = ident_describe (inst->select, cfg_select,
+ buffer, buffer_size);
ident_destroy (cfg_select);
- return (0);
+ return (status);
} /* }}} int inst_describe */
time_t inst_get_mtime (graph_instance_t *inst) /* {{{ */