X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=lttng-statedump-impl.c;h=78c07adc6f354ea1ab3d98366f78d0787e75d22a;hb=refs%2Fheads%2Fstable-2.4;hp=a633657a3966ca702410eac440c0def819fc8d17;hpb=17f8e8fcac56aeb0f15356186c1e2941b9b16637;p=lttng-modules.git

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index a633657a..78c07adc 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -47,6 +47,7 @@
 #include <linux/mutex.h>
 
 #include "lttng-events.h"
+#include "lttng-tracer.h"
 #include "wrapper/irqdesc.h"
 #include "wrapper/spinlock.h"
 #include "wrapper/fdtable.h"
@@ -187,7 +188,11 @@ static
 int lttng_enumerate_file_descriptors(struct lttng_session *session)
 {
 	struct task_struct *p;
-	char *tmp = (char *) __get_free_page(GFP_KERNEL);
+	char *tmp;
+
+	tmp = (char *) __get_free_page(GFP_KERNEL);
+	if (!tmp)
+		return -ENOMEM;
 
 	/* Enumerate active file descriptors */
 	rcu_read_lock();
@@ -253,7 +258,7 @@ int lttng_enumerate_vm_maps(struct lttng_session *session)
 #endif
 
 static
-void lttng_list_interrupts(struct lttng_session *session)
+int lttng_list_interrupts(struct lttng_session *session)
 {
 	unsigned int irq;
 	unsigned long flags = 0;
@@ -275,12 +280,14 @@ void lttng_list_interrupts(struct lttng_session *session)
 		wrapper_desc_spin_unlock(&desc->lock);
 		local_irq_restore(flags);
 	}
+	return 0;
 #undef irq_to_desc
 }
 #else
 static inline
-void lttng_list_interrupts(struct lttng_session *session)
+int lttng_list_interrupts(struct lttng_session *session)
 {
+	return 0;
 }
 #endif
 
@@ -381,14 +388,27 @@ void lttng_statedump_work_func(struct work_struct *work)
 static
 int do_lttng_statedump(struct lttng_session *session)
 {
-	int cpu;
+	int cpu, ret;
 
 	trace_lttng_statedump_start(session);
-	lttng_enumerate_process_states(session);
-	lttng_enumerate_file_descriptors(session);
-	/* FIXME lttng_enumerate_vm_maps(session); */
-	lttng_list_interrupts(session);
-	lttng_enumerate_network_ip_interface(session);
+	ret = lttng_enumerate_process_states(session);
+	if (ret)
+		return ret;
+	ret = lttng_enumerate_file_descriptors(session);
+	if (ret)
+		return ret;
+	/*
+	 * FIXME
+	 * ret = lttng_enumerate_vm_maps(session);
+	 * if (ret)
+	 * 	return ret;
+	 */
+	ret = lttng_list_interrupts(session);
+	if (ret)
+		return ret;
+	ret = lttng_enumerate_network_ip_interface(session);
+	if (ret)
+		return ret;
 
 	/* TODO lttng_dump_idt_table(session); */
 	/* TODO lttng_dump_softirq_vec(session); */
@@ -448,3 +468,7 @@ module_exit(lttng_statedump_exit);
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Jean-Hugues Deschenes");
 MODULE_DESCRIPTION("Linux Trace Toolkit Next Generation Statedump");
+MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
+	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
+	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
+	LTTNG_MODULES_EXTRAVERSION);