X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Fgraph_ident.c;h=3635990d8feb68a59960776c81f8d4acc872ba2c;hp=d1b1b056af763c414a9f8b3e5f8f5b73215084b5;hb=2ef734476e3511b6f1c2611875e340b6b8ca2d4c;hpb=a0ce16dc07cbdb39a408fee847bfde5ca808406e

diff --git a/src/graph_ident.c b/src/graph_ident.c
index d1b1b05..3635990 100644
--- a/src/graph_ident.c
+++ b/src/graph_ident.c
@@ -33,6 +33,7 @@
 
 #include "graph_ident.h"
 #include "common.h"
+#include "data_provider.h"
 #include "filesystem.h"
 #include "utils_cgi.h"
 
@@ -94,8 +95,10 @@ static char *part_copy_with_selector (const char *selector, /* {{{ */
 static _Bool part_matches (const char *selector, /* {{{ */
     const char *part)
 {
+#if C4_DEBUG
   if ((selector == NULL) && (part == NULL))
     return (1);
+#endif
 
   if (selector == NULL) /* && (part != NULL) */
     return (0);
@@ -401,8 +404,10 @@ int ident_compare (const graph_ident_t *i0, /* {{{ */
 _Bool ident_matches (const graph_ident_t *selector, /* {{{ */
     const graph_ident_t *ident)
 {
+#if C4_DEBUG
   if ((selector == NULL) || (ident == NULL))
     return (0);
+#endif
 
   if (!part_matches (selector->host, ident->host))
     return (0);
@@ -422,6 +427,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];
@@ -477,34 +503,148 @@ 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 */
+
+/* {{{ ident_data_to_json */
+struct ident_data_to_json__data_s
+{
+  dp_time_t begin;
+  dp_time_t end;
+  yajl_gen handler;
+};
+typedef struct ident_data_to_json__data_s ident_data_to_json__data_t;
+
+#define yajl_gen_string_cast(h,s,l) \
+  yajl_gen_string (h, (unsigned char *) s, (unsigned int) l)
+
+static int ident_data_to_json__get_ident_data (
+    __attribute__((unused)) graph_ident_t *ident, /* {{{ */
+    __attribute__((unused)) const char *ds_name,
+    const dp_data_point_t *dp, size_t dp_num,
+    void *user_data)
+{
+  ident_data_to_json__data_t *data = user_data;
+  size_t i;
+
+  yajl_gen_map_open (data->handler);
+
+  for (i = 0; i < dp_num; i++)
+  {
+    yajl_gen_map_open (data->handler);
+    yajl_gen_integer (data->handler, (long) dp[i].time.tv_sec);
+    yajl_gen_double (data->handler, dp[i].value);
+    yajl_gen_map_close (data->handler);
+  }
+
+  yajl_gen_map_close (data->handler);
+} /* }}} int ident_data_to_json__get_ident_data */
+
+/* Called for each DS name */
+static int ident_data_to_json__get_ds_name (const graph_ident_t *ident, /* {{{ */
+    const char *ds_name, void *user_data)
+{
+  ident_data_to_json__data_t *data = user_data;
+  int status;
+
+  yajl_gen_map_open (data->handler);
+
+  yajl_gen_string_cast (data->handler, "ds_name", strlen ("ds_name"));
+  yajl_gen_string_cast (data->handler, ds_name, strlen (ds_name));
+
+  yajl_gen_string_cast (data->handler, "data", strlen ("data"));
+  yajl_gen_array_open (data->handler);
+
+  status = data_provider_get_ident_data (ident, ds_name,
+      data->begin, data->end,
+      ident_data_to_json__get_ident_data,
+      data);
+
+  yajl_gen_array_close (data->handler);
+  yajl_gen_map_close (data->handler);
+
+  return (status);
+} /* }}} int ident_data_to_json__get_ds_name */
+
+int ident_data_to_json (const graph_ident_t *ident, /* {{{ */
+    dp_time_t begin, dp_time_t end,
+    yajl_gen handler)
 {
-  char buffer[4096];
+  ident_data_to_json__data_t data;
+
+  data.begin = begin;
+  data.end = end;
+  data.handler = handler;
+
+  /* Iterate over all DS names */
+  return (data_provider_get_ident_ds_names (ident,
+        ident_data_to_json__get_ds_name, &data));
+} /* }}} int ident_data_to_json */
+/* }}} ident_data_to_json */
+
+int ident_describe (const graph_ident_t *ident, /* {{{ */
+    const graph_ident_t *selector,
+    char *buffer, size_t buffer_size)
+{
+  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)
 
-  return (strdup (buffer));
-} /* }}} char *ident_to_json */
+  CHECK_FIELD (host);
+  CHECK_FIELD (plugin);
+  CHECK_FIELD (plugin_instance);
+  CHECK_FIELD (type);
+  CHECK_FIELD (type_instance);
 
-#undef ADD_FIELD
+#undef CHECK_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) /* {{{ */
 {