trace-view: Move cpu mask functions into cpu.h

Move the cpu mask alorithms out into cpu.h for other files to use them.

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

2 files changed, 46 insertions, 20 deletions

diff --git a/cpu.h b/cpu.h
new file mode 100644
index 0000000..86cab77
--- /dev/null
+++ b/cpu.h
@@ -0,0 +1,40 @@
+#ifndef _CPU_H
+#define _CPU_H
+
+static inline int cpu_isset(guint64 *cpu_mask, gint cpu)
+{
+        guint64 mask;
+
+        mask = *(cpu_mask + (cpu >> 6));
+
+        return mask & (1ULL << (cpu & ((1ULL << 6) - 1)));
+}
+
+static inline void cpu_set(guint64 *cpu_mask, gint cpu)
+{
+        guint64 *mask;
+
+        mask = cpu_mask + (cpu >> 6);
+        *mask |= (1ULL << (cpu & ((1ULL << 6) - 1)));
+}
+
+static inline void cpu_clear(guint64 *cpu_mask, gint cpu)
+{
+        guint64 *mask;
+
+        mask = cpu_mask + (cpu >> 6);
+        *mask &= ~(1ULL << (cpu & ((1ULL << 6) - 1)));
+}
+
+static inline void set_cpus(guint64 *cpu_mask, gint cpus)
+{
+        gint idx;
+
+        for (idx = 0; idx < (cpus >> 6); idx++) {
+                *(cpu_mask + idx) = -1ULL;
+        }
+
+        *(cpu_mask) = (1ULL << (cpus & ((1ULL << 6) - 1))) - 1;
+}
+
+#endif /* _CPU_H */
diff --git a/trace-view-store.c b/trace-view-store.c
index 2c4467a..6f7a46a 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -1,6 +1,8 @@
 #include "trace-view-store.h"
 #include <stdlib.h>
 
+#include "cpu.h"
+
 /* boring declarations of local functions */
 
 static void             trace_view_store_init           (TraceViewStore *pkg_tree);
@@ -703,38 +705,22 @@ trace_view_store_iter_parent (GtkTreeModel *tree_model,
 
 static int mask_cpu_isset(TraceViewStore *store, gint cpu)
 {
-        guint64 mask;
-
-        mask = *(store->cpu_mask + (cpu >> 6));
-
-        return mask & (1ULL << (cpu & ((1ULL << 6) - 1)));
+        return cpu_isset(store->cpu_mask, cpu);
 }
 
 static void mask_cpu_set(TraceViewStore *store, gint cpu)
 {
-        guint64 *mask;
-
-        mask = store->cpu_mask + (cpu >> 6);
-        *mask |= (1ULL << (cpu & ((1ULL << 6) - 1)));
+        cpu_set(store->cpu_mask, cpu);
 }
 
 static void mask_cpu_clear(TraceViewStore *store, gint cpu)
 {
-        guint64 *mask;
-
-        mask = store->cpu_mask + (cpu >> 6);
-        *mask &= ~(1ULL << (cpu & ((1ULL << 6) - 1)));
+        cpu_clear(store->cpu_mask, cpu);
 }
 
 static void mask_set_cpus(TraceViewStore *store, gint cpus)
 {
-        gint idx;
-
-        for (idx = 0; idx < (cpus >> 6); idx++) {
-                *(store->cpu_mask + idx) = -1ULL;
-        }
-
-        *(store->cpu_mask) = (1ULL << (cpus & ((1ULL << 6) - 1))) - 1;
+        set_cpus(store->cpu_mask, cpus);
 }
 
 static void update_page(TraceViewStore *store)