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);
} /* }}} int inst_get_params */
+int inst_compare (const graph_instance_t *i0, /* {{{ */
+ const graph_instance_t *i1)
+{
+ return (ident_compare (i0->select, i1->select));
+} /* }}} int inst_compare */
+
int inst_compare_ident (graph_instance_t *inst, /* {{{ */
const graph_ident_t *ident)
{
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_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) /* {{{ */