trace-graph: Add plot_list to hold the plots on a hash

Add an intermediate list item for hashs to let a plot be assigned
to more that one hash.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

2 files changed, 19 insertions, 9 deletions

diff --git a/trace-graph.h b/trace-graph.h
index f7bc117..f8d582c 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -81,7 +81,6 @@ struct plot_callbacks {
 };
 
 struct graph_plot {
-        struct graph_plot               *next;  /* for hash */
         int                             pos;
         char                            *label;
         const struct plot_callbacks     *cb;
@@ -93,9 +92,14 @@ struct graph_callbacks {
         graph_filter_cb         *filter;
 };
 
+struct plot_list {
+        struct plot_list        *next;
+        struct graph_plot       *plot;
+};
+
 struct plot_hash {
         struct plot_hash        *next;
-        struct graph_plot       *plots;
+        struct plot_list        *plots;
         gint                    val;
 };
 
diff --git a/trace-plot.c b/trace-plot.c
index 5f0ab75..37b5cfc 100644
--- a/trace-plot.c
+++ b/trace-plot.c
@@ -155,8 +155,10 @@ static struct plot_hash *find_hash(struct plot_hash **array, gint val)
 static void add_hash(struct plot_hash **array, struct graph_plot *plot, gint val)
 {
         struct plot_hash *hash;
+        struct plot_list *list;
         gint key;
 
+        list = malloc_or_die(sizeof(*list));
         hash = find_hash(array, val);
         if (!hash) {
                 hash = g_new0(typeof(*hash), 1);
@@ -167,25 +169,29 @@ static void add_hash(struct plot_hash **array, struct graph_plot *plot, gint val
                 array[key] = hash;
         }
 
-        plot->next = hash->plots;
-        hash->plots = plot;
+        list->next = hash->plots;
+        list->plot = plot;
+
+        hash->plots = list;
 }
 
 static void remove_hash(struct plot_hash **array, struct graph_plot *plot, gint val)
 {
         struct plot_hash *hash, **phash;
-        struct graph_plot **pplot;
+        struct plot_list **pplot;
+        struct plot_list *list;
         gint key;
 
         hash = find_hash(array, val);
         pplot = &hash->plots;
 
-        while (*pplot) {
-                if (*pplot == plot) {
-                        *pplot = plot->next;
+        while ((list = *pplot)) {
+                if (list->plot == plot) {
+                        *pplot = list->next;
+                        free(list);
                         break;
                 }
-                pplot = &(*pplot)->next;
+                pplot = &list->next;
         }
 
         if (hash->plots)