Merge branch 'kernelshark-devel' into trace-cmd

Conflicts:
	Makefile

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

1 files changed, 63 insertions, 0 deletions

diff --git a/trace-hash.c b/trace-hash.c
index 1197913..ed53ee1 100644
--- a/trace-hash.c
+++ b/trace-hash.c
@@ -19,6 +19,7 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 
@@ -155,3 +156,65 @@ struct filter_task *filter_task_hash_copy(struct filter_task *hash)
 
         return new_hash;
 }
+
+int *filter_task_pids(struct filter_task *hash)
+{
+        struct filter_task_item *task;
+        int *pids;
+        int count = 0;
+        int i;
+
+        if (!hash->count)
+                return NULL;
+
+        pids = malloc(sizeof(*pids) * (hash->count + 1));
+        if (!pids)
+                return NULL;
+
+        for (i = 0; i < FILTER_TASK_HASH_SIZE; i++) {
+                task = hash->hash[i];
+                while (task) {
+                        pids[count++] = task->pid;
+                        task = task->next;
+                }
+        }
+        pids[count] = -1;
+
+        return pids;
+}
+
+/**
+ * filter_task_compare - compare two task hashs to see if they are equal
+ * @hash1: one hash to compare
+ * @hash2: another hash to compare to @hash1
+ *
+ * Returns 1 if the two hashes are the same, 0 otherwise.
+ */
+int filter_task_compare(struct filter_task *hash1, struct filter_task *hash2)
+{
+        int *pids;
+        int ret = 0;
+        int i;
+
+        /* If counts don't match, then they obviously are not the same */
+        if (hash1->count != hash2->count)
+                return 0;
+
+        /* If both hashes are empty, they are the same */
+        if (!hash1->count && !hash2->count)
+                return 1;
+
+        /* Now compare the pids of one hash with the other */
+        pids = filter_task_pids(hash1);
+        for (i = 0; pids[i] >= 0; i++) {
+                if (!filter_task_find_pid(hash2, pids[i]))
+                        break;
+        }
+
+        if (pids[i] == -1)
+                ret = 1;
+
+        free(pids);
+
+        return ret;
+}