X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=04acf6eff3409beb78944fad9476d44c74098cec;hb=refs%2Fheads%2Fstable-2.1;hp=89b55e53c369abeae1b3d5a34d6ee824b528b58f;hpb=73e8ba371039bc05745a739db4d69b4220a1c03e;p=lttng-modules.git

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index 89b55e53..04acf6ef 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -48,6 +48,8 @@
 
 #include "lttng-events.h"
 #include "wrapper/irqdesc.h"
+#include "wrapper/spinlock.h"
+#include "wrapper/fdtable.h"
 
 #ifdef CONFIG_GENERIC_HARDIRQS
 #include <linux/irq.h>
@@ -59,6 +61,12 @@
 #define TRACE_INCLUDE_FILE lttng-statedump
 #include "instrumentation/events/lttng-module/lttng-statedump.h"
 
+struct lttng_fd_ctx {
+	char *page;
+	struct lttng_session *session;
+	struct task_struct *p;
+};
+
 /*
  * Protected by the trace lock.
  */
@@ -140,34 +148,35 @@ int lttng_enumerate_network_ip_interface(struct lttng_session *session)
 }
 #endif /* CONFIG_INET */
 
+static
+int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
+{
+	const struct lttng_fd_ctx *ctx = p;
+	const char *s = d_path(&file->f_path, ctx->page, PAGE_SIZE);
+
+	if (IS_ERR(s)) {
+		struct dentry *dentry = file->f_path.dentry;
+
+		/* Make sure we give at least some info */
+		spin_lock(&dentry->d_lock);
+		trace_lttng_statedump_file_descriptor(ctx->session, ctx->p, fd,
+			dentry->d_name.name);
+		spin_unlock(&dentry->d_lock);
+		goto end;
+	}
+	trace_lttng_statedump_file_descriptor(ctx->session, ctx->p, fd, s);
+end:
+	return 0;
+}
 
 static
 void lttng_enumerate_task_fd(struct lttng_session *session,
 		struct task_struct *p, char *tmp)
 {
-	struct fdtable *fdt;
-	struct file *filp;
-	unsigned int i;
-	const unsigned char *path;
+	struct lttng_fd_ctx ctx = { .page = tmp, .session = session, .p = p };
 
 	task_lock(p);
-	if (!p->files)
-		goto unlock_task;
-	spin_lock(&p->files->file_lock);
-	fdt = files_fdtable(p->files);
-	for (i = 0; i < fdt->max_fds; i++) {
-		filp = fcheck_files(p->files, i);
-		if (!filp)
-			continue;
-		path = d_path(&filp->f_path, tmp, PAGE_SIZE);
-		/* Make sure we give at least some info */
-		trace_lttng_statedump_file_descriptor(session, p, i,
-			IS_ERR(path) ?
-				filp->f_dentry->d_name.name :
-				path);
-	}
-	spin_unlock(&p->files->file_lock);
-unlock_task:
+	lttng_iterate_fd(p->files, 0, lttng_dump_one_fd, &ctx);
 	task_unlock(p);
 }
 
@@ -255,12 +264,12 @@ void lttng_list_interrupts(struct lttng_session *session)
 			irq_desc_get_chip(desc)->name ? : "unnamed_irq_chip";
 
 		local_irq_save(flags);
-		raw_spin_lock(&desc->lock);
+		wrapper_desc_spin_lock(&desc->lock);
 		for (action = desc->action; action; action = action->next) {
 			trace_lttng_statedump_interrupt(session,
 				irq, irq_chip_name, action);
 		}
-		raw_spin_unlock(&desc->lock);
+		wrapper_desc_spin_unlock(&desc->lock);
 		local_irq_restore(flags);
 	}
 #undef irq_to_desc
@@ -290,6 +299,7 @@ void lttng_statedump_process_ns(struct lttng_session *session,
 		do {
 			trace_lttng_statedump_process_state(session,
 				p, type, mode, submode, status, pid_ns);
+			pid_ns = pid_ns->parent;
 		} while (pid_ns);
 	} else {
 		trace_lttng_statedump_process_state(session,
@@ -395,7 +405,7 @@ int do_lttng_statedump(struct lttng_session *session)
 		schedule_delayed_work_on(cpu, &cpu_work[cpu], 0);
 	}
 	/* Wait for all threads to run */
-	__wait_event(statedump_wq, (atomic_read(&kernel_threads_to_run) != 0));
+	__wait_event(statedump_wq, (atomic_read(&kernel_threads_to_run) == 0));
 	put_online_cpus();
 	/* Our work is done */
 	printk(KERN_DEBUG "LTT state dump end\n");