X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=dc037508c055b7f61b8c758d581bd0178e26552a;hb=80bb26003945e96a8ade9c8788dab9b2e08cbc08;hp=ecec4f0bc42bb12f84ce5a9ac1fa33c62edbf3df;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index ecec4f0b..dc037508 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -37,7 +37,6 @@
 #include <lttng-events.h>
 #include <lttng-tracer.h>
 #include <wrapper/irqdesc.h>
-#include <wrapper/spinlock.h>
 #include <wrapper/fdtable.h>
 #include <wrapper/irq.h>
 #include <wrapper/tracepoint.h>
@@ -63,6 +62,9 @@ DEFINE_TRACE(lttng_statedump_file_descriptor);
 DEFINE_TRACE(lttng_statedump_start);
 DEFINE_TRACE(lttng_statedump_process_state);
 DEFINE_TRACE(lttng_statedump_network_interface);
+#ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
+DEFINE_TRACE(lttng_statedump_cpu_topology);
+#endif
 
 struct lttng_fd_ctx {
 	char *page;
@@ -279,6 +281,28 @@ int lttng_enumerate_file_descriptors(struct lttng_session *session)
 	return 0;
 }
 
+#ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
+static
+int lttng_enumerate_cpu_topology(struct lttng_session *session)
+{
+	int cpu;
+	const cpumask_t *cpumask = cpu_possible_mask;
+
+	for (cpu = cpumask_first(cpumask); cpu < nr_cpu_ids;
+			cpu = cpumask_next(cpu, cpumask)) {
+		trace_lttng_statedump_cpu_topology(session, &cpu_data(cpu));
+	}
+
+	return 0;
+}
+#else
+static
+int lttng_enumerate_cpu_topology(struct lttng_session *session)
+{
+	return 0;
+}
+#endif
+
 #if 0
 /*
  * FIXME: we cannot take a mmap_sem while in a RCU read-side critical section
@@ -329,10 +353,6 @@ int lttng_enumerate_vm_maps(struct lttng_session *session)
 
 #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
-#define irq_desc_get_chip(desc) get_irq_desc_chip(desc)
-#endif
-
 static
 int lttng_list_interrupts(struct lttng_session *session)
 {
@@ -348,12 +368,12 @@ int lttng_list_interrupts(struct lttng_session *session)
 			irq_desc_get_chip(desc)->name ? : "unnamed_irq_chip";
 
 		local_irq_save(flags);
-		wrapper_desc_spin_lock(&desc->lock);
+		raw_spin_lock(&desc->lock);
 		for (action = desc->action; action; action = action->next) {
 			trace_lttng_statedump_interrupt(session,
 				irq, irq_chip_name, action);
 		}
-		wrapper_desc_spin_unlock(&desc->lock);
+		raw_spin_unlock(&desc->lock);
 		local_irq_restore(flags);
 	}
 	return 0;
@@ -489,6 +509,9 @@ int do_lttng_statedump(struct lttng_session *session)
 	default:
 		return ret;
 	}
+	ret = lttng_enumerate_cpu_topology(session);
+	if (ret)
+		return ret;
 
 	/* TODO lttng_dump_idt_table(session); */
 	/* TODO lttng_dump_softirq_vec(session); */