X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=graph_def.c;h=926fde2946f1573fd06a3d1d78e947a78402d399;hb=964b6bdd9fc86ed17e00e01abbe423166326b45d;hp=181788a9524dcced958980ae70c4a9088f6918c8;hpb=d2a2cba37a1cd81af977285679bb0476f122a535;p=collection4.git

diff --git a/graph_def.c b/graph_def.c
index 181788a..926fde2 100644
--- a/graph_def.c
+++ b/graph_def.c
@@ -12,6 +12,7 @@ struct graph_def_s
 {
   graph_ident_t *select;
 
+  char *ds_name;
   uint32_t color;
 
   graph_def_t *next;
@@ -24,11 +25,15 @@ struct graph_def_s
 /*
  * Public functions
  */
-graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident) /* {{{ */
+graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident, /* {{{ */
+    const char *ds_name)
 {
   graph_ident_t *selector;
   graph_def_t *ret;
 
+  if ((cfg == NULL) || (ident == NULL) || (ds_name == NULL))
+    return (NULL);
+
   selector = gl_graph_get_selector (cfg);
   if (selector == NULL)
     return (NULL);
@@ -40,6 +45,15 @@ graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident) /* {{{ */
     return (NULL);
   }
   memset (ret, 0, sizeof (*ret));
+
+  ret->ds_name = strdup (ds_name);
+  if (ret->ds_name == NULL)
+  {
+    ident_destroy (selector);
+    free (ret);
+    return (NULL);
+  }
+
   ret->color = get_random_color ();
   ret->next = NULL;
 
@@ -48,6 +62,7 @@ graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident) /* {{{ */
   if (ret->select == NULL)
   {
     ident_destroy (selector);
+    free (ret->ds_name);
     free (ret);
     return (NULL);
   }
@@ -67,6 +82,8 @@ void def_destroy (graph_def_t *def) /* {{{ */
 
   ident_destroy (def->select);
 
+  free (def->ds_name);
+
   free (def);
 
   def_destroy (next);
@@ -88,28 +105,56 @@ int def_append (graph_def_t *head, graph_def_t *def) /* {{{ */
   return (0);
 } /* }}} int def_append */
 
-graph_def_t *def_search (graph_def_t *head, graph_ident_t *ident) /* {{{ */
+graph_def_t *def_search (graph_def_t *head, graph_ident_t *ident, /* {{{ */
+    const char *ds_name)
 {
   graph_def_t *ptr;
 
-  if ((head == NULL) || (ident == NULL))
+  if ((head == NULL) || (ident == NULL) || (ds_name == NULL))
     return (NULL);
 
   for (ptr = head; ptr != NULL; ptr = ptr->next)
-    if (ident_matches (ptr->select, ident))
+  {
+    if (!ident_matches (ptr->select, ident))
+      continue;
+
+    if (strcmp (ptr->ds_name, ds_name) == 0)
       return (ptr);
+  }
 
   return (NULL);
 } /* }}} graph_def_t *def_search */
 
+_Bool def_matches (graph_def_t *def, graph_ident_t *ident) /* {{{ */
+{
+  return (ident_matches (def->select, ident));
+} /* }}} _Bool def_matches */
+
+int def_foreach (graph_def_t *def, def_callback_t callback, /* {{{ */
+    void *user_data)
+{
+  graph_def_t *ptr;
+
+  if ((def == NULL) || (callback == NULL))
+    return (EINVAL);
+
+  for (ptr = def; ptr != NULL; ptr = ptr->next)
+  {
+    int status;
+
+    status = (*callback) (ptr, user_data);
+    if (status != 0)
+      return (status);
+  }
+
+  return (0);
+} /* }}} int def_foreach */
+
 int def_get_rrdargs (graph_def_t *def, graph_ident_t *ident, /* {{{ */
     str_array_t *args)
 {
   char *file;
-  char **dses = NULL;
-  size_t dses_num = 0;
-  int status;
-  size_t i;
+  int index;
 
   if ((def == NULL) || (ident == NULL) || (args == NULL))
     return (EINVAL);
@@ -123,50 +168,33 @@ int def_get_rrdargs (graph_def_t *def, graph_ident_t *ident, /* {{{ */
 
   DEBUG ("gl_ident_get_rrdargs: file = %s;\n", file);
 
-  status = ds_list_from_rrd_file (file, &dses_num, &dses);
-  if (status != 0)
-  {
-    free (file);
-    return (status);
-  }
-
-  for (i = 0; i < dses_num; i++)
-  {
-    int index;
-
-    DEBUG ("gl_ident_get_rrdargs: ds[%lu] = %s;\n", (unsigned long) i, dses[i]);
-
-    index = array_argc (args);
-
-    /* CDEFs */
-    array_append_format (args, "DEF:def_%04i_min=%s:%s:MIN",
-        index, file, dses[i]);
-    array_append_format (args, "DEF:def_%04i_avg=%s:%s:AVERAGE",
-        index, file, dses[i]);
-    array_append_format (args, "DEF:def_%04i_max=%s:%s:MAX",
-        index, file, dses[i]);
-    /* VDEFs */
-    array_append_format (args, "VDEF:vdef_%04i_min=def_%04i_min,MINIMUM",
-        index, index);
-    array_append_format (args, "VDEF:vdef_%04i_avg=def_%04i_avg,AVERAGE",
-        index, index);
-    array_append_format (args, "VDEF:vdef_%04i_max=def_%04i_max,MAXIMUM",
-        index, index);
-    array_append_format (args, "VDEF:vdef_%04i_lst=def_%04i_avg,LAST",
-        index, index);
-
-    /* Graph part */
-    array_append_format (args, "LINE1:def_%04i_avg#%06"PRIx32":%s",
-        index, def->color, dses[i]);
-    array_append_format (args, "GPRINT:vdef_%04i_min:%%lg min,", index);
-    array_append_format (args, "GPRINT:vdef_%04i_avg:%%lg avg,", index);
-    array_append_format (args, "GPRINT:vdef_%04i_max:%%lg max,", index);
-    array_append_format (args, "GPRINT:vdef_%04i_lst:%%lg last\\l", index);
-
-    free (dses[i]);
-  }
+  index = array_argc (args);
+
+  /* CDEFs */
+  array_append_format (args, "DEF:def_%04i_min=%s:%s:MIN",
+      index, file, def->ds_name);
+  array_append_format (args, "DEF:def_%04i_avg=%s:%s:AVERAGE",
+      index, file, def->ds_name);
+  array_append_format (args, "DEF:def_%04i_max=%s:%s:MAX",
+      index, file, def->ds_name);
+  /* VDEFs */
+  array_append_format (args, "VDEF:vdef_%04i_min=def_%04i_min,MINIMUM",
+      index, index);
+  array_append_format (args, "VDEF:vdef_%04i_avg=def_%04i_avg,AVERAGE",
+      index, index);
+  array_append_format (args, "VDEF:vdef_%04i_max=def_%04i_max,MAXIMUM",
+      index, index);
+  array_append_format (args, "VDEF:vdef_%04i_lst=def_%04i_avg,LAST",
+      index, index);
+
+  /* Graph part */
+  array_append_format (args, "LINE1:def_%04i_avg#%06"PRIx32":%s",
+      index, def->color, def->ds_name);
+  array_append_format (args, "GPRINT:vdef_%04i_min:%%lg min,", index);
+  array_append_format (args, "GPRINT:vdef_%04i_avg:%%lg avg,", index);
+  array_append_format (args, "GPRINT:vdef_%04i_max:%%lg max,", index);
+  array_append_format (args, "GPRINT:vdef_%04i_lst:%%lg last\\l", index);
 
-  free (dses);
   free (file);
 
   return (0);