X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph_ident.c;h=e7d193266e4d38622ff6ad35a659102cb605be50;hb=e30594797655c82d92ee8c4718dfdd82e9e3d377;hp=7dda849e0794bb01f9e19c3d75a58529126a9e80;hpb=d03bbb38c5177de7ad4da2934980ebd9d119f287;p=collection4.git

diff --git a/src/graph_ident.c b/src/graph_ident.c
index 7dda849..e7d1932 100644
--- a/src/graph_ident.c
+++ b/src/graph_ident.c
@@ -426,6 +426,27 @@ _Bool ident_matches (const graph_ident_t *selector, /* {{{ */
   return (1);
 } /* }}} _Bool ident_matches */
 
+_Bool ident_intersect (const graph_ident_t *s0, /* {{{ */
+    const graph_ident_t *s1)
+{
+#define INTERSECT_PART(p) do {                                               \
+  if (!IS_ANY (s0->p) && !IS_ALL (s0->p)                                     \
+      && !IS_ANY (s1->p) && !IS_ALL (s1->p)                                  \
+      && (strcmp (s0->p, s1->p) != 0))                                       \
+    return (0);                                                              \
+} while (0)
+
+  INTERSECT_PART (host);
+  INTERSECT_PART (plugin);
+  INTERSECT_PART (plugin_instance);
+  INTERSECT_PART (type);
+  INTERSECT_PART (type_instance);
+
+#undef INTERSECT_PART
+
+  return (1);
+} /* }}} _Bool ident_intersect */
+
 char *ident_to_string (const graph_ident_t *ident) /* {{{ */
 {
   char buffer[PATH_MAX];
@@ -481,34 +502,72 @@ char *ident_to_file (const graph_ident_t *ident) /* {{{ */
   return (strdup (buffer));
 } /* }}} char *ident_to_file */
 
-#define ADD_FIELD(field) do {                              \
-  char json[1024];                                         \
-  json_escape_copy (json, ident->field, sizeof (json));    \
-  strlcat (buffer, json, sizeof (buffer));                 \
+int ident_to_json (const graph_ident_t *ident, /* {{{ */
+    yajl_gen handler)
+{
+  yajl_gen_status status;
+
+  if ((ident == NULL) || (handler == NULL))
+    return (EINVAL);
+
+#define ADD_STRING(str) do {                              \
+  status = yajl_gen_string (handler,                      \
+      (unsigned char *) (str),                            \
+      (unsigned int) strlen (str));                       \
+  if (status != yajl_gen_status_ok)                       \
+    return ((int) status);                                \
 } while (0)
 
-char *ident_to_json (const graph_ident_t *ident) /* {{{ */
+  yajl_gen_map_open (handler);
+  ADD_STRING ("host");
+  ADD_STRING (ident->host);
+  ADD_STRING ("plugin");
+  ADD_STRING (ident->plugin);
+  ADD_STRING ("plugin_instance");
+  ADD_STRING (ident->plugin_instance);
+  ADD_STRING ("type");
+  ADD_STRING (ident->type);
+  ADD_STRING ("type_instance");
+  ADD_STRING (ident->type_instance);
+  yajl_gen_map_close (handler);
+
+#undef ADD_FIELD
+
+  return (0);
+} /* }}} char *ident_to_json */
+
+int ident_describe (const graph_ident_t *ident, /* {{{ */
+    const graph_ident_t *selector,
+    char *buffer, size_t buffer_size)
 {
-  char buffer[4096];
+  if ((ident == NULL) || (selector == NULL)
+      || (buffer == NULL) || (buffer_size < 2))
+    return (EINVAL);
 
   buffer[0] = 0;
 
-  strlcat (buffer, "{\"host\":\"", sizeof (buffer));
-  ADD_FIELD (host);
-  strlcat (buffer, "\",\"plugin\":\"", sizeof (buffer));
-  ADD_FIELD (plugin);
-  strlcat (buffer, "\",\"plugin_instance\":\"", sizeof (buffer));
-  ADD_FIELD (plugin_instance);
-  strlcat (buffer, "\",\"type\":\"", sizeof (buffer));
-  ADD_FIELD (type);
-  strlcat (buffer, "\",\"type_instance\":\"", sizeof (buffer));
-  ADD_FIELD (type_instance);
-  strlcat (buffer, "\"}", sizeof (buffer));
+#define CHECK_FIELD(field) do {                                              \
+  if (strcasecmp (selector->field, ident->field) != 0)                       \
+  {                                                                          \
+    if (buffer[0] != 0)                                                      \
+      strlcat (buffer, "/", buffer_size);                                    \
+    strlcat (buffer, ident->field, buffer_size);                             \
+  }                                                                          \
+} while (0)
+
+  CHECK_FIELD (host);
+  CHECK_FIELD (plugin);
+  CHECK_FIELD (plugin_instance);
+  CHECK_FIELD (type);
+  CHECK_FIELD (type_instance);
 
-  return (strdup (buffer));
-} /* }}} char *ident_to_json */
+#undef CHECK_FIELD
 
-#undef ADD_FIELD
+  if (buffer[0] == 0)
+    strlcat (buffer, "default", buffer_size);
+
+  return (0);
+} /* }}} int ident_describe */
 
 time_t ident_get_mtime (const graph_ident_t *ident) /* {{{ */
 {