#include <linux/mutex.h>
#include <linux/device.h>
-#include "lttng-events.h"
-#include "lttng-tracer.h"
-#include "wrapper/irqdesc.h"
-#include "wrapper/spinlock.h"
-#include "wrapper/fdtable.h"
-#include "wrapper/nsproxy.h"
-#include "wrapper/irq.h"
-#include "wrapper/tracepoint.h"
-#include "wrapper/genhd.h"
+#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>
+#include <wrapper/genhd.h>
+#include <wrapper/file.h>
+#include <wrapper/time.h>
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#include <linux/irq.h>
/* Define the tracepoints, but do not build the probes */
#define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
#define TRACE_INCLUDE_FILE lttng-statedump
#define LTTNG_INSTRUMENTATION
-#include "instrumentation/events/lttng-module/lttng-statedump.h"
+#include <instrumentation/events/lttng-module/lttng-statedump.h>
DEFINE_TRACE(lttng_statedump_block_device);
DEFINE_TRACE(lttng_statedump_end);
}
#endif /* CONFIG_INET */
-#ifdef FD_ISSET /* For old kernels lacking close_on_exec() */
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
-{
- return FD_ISSET(fd, fdt->close_on_exec);
-}
-#else
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
-{
- return close_on_exec(fd, fdt);
-}
-#endif
-
static
int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
{
down_read(&mm->mmap_sem);
while (map) {
if (map->vm_file)
- ino = map->vm_file->f_dentry->d_inode->i_ino;
+ ino = map->vm_file->lttng_f_dentry->d_inode->i_ino;
else
ino = 0;
trace_lttng_statedump_vm_map(session, p, map, ino);
enum lttng_execution_submode submode,
enum lttng_process_status status)
{
- struct nsproxy *proxy;
struct pid_namespace *pid_ns;
- /*
- * Back and forth on locking strategy within Linux upstream for nsproxy.
- * See Linux upstream commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3
- * "namespaces: Use task_lock and not rcu to protect nsproxy"
- * for details.
- */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
- LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
- LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
- proxy = p->nsproxy;
-#else
- rcu_read_lock();
- proxy = task_nsproxy(p);
-#endif
- if (proxy) {
- pid_ns = lttng_get_proxy_pid_ns(proxy);
- do {
- trace_lttng_statedump_process_state(session,
- p, type, mode, submode, status, pid_ns);
- pid_ns = pid_ns->parent;
- } while (pid_ns);
- } else {
+ pid_ns = task_active_pid_ns(p);
+ do {
trace_lttng_statedump_process_state(session,
- p, type, mode, submode, status, NULL);
- }
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
- LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
- LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
- /* (nothing) */
-#else
- rcu_read_unlock();
-#endif
+ p, type, mode, submode, status, pid_ns);
+ pid_ns = pid_ns->parent;
+ } while (pid_ns);
}
static
return ret;
ret = lttng_enumerate_block_devices(session);
switch (ret) {
+ case 0:
+ break;
case -ENOSYS:
printk(KERN_WARNING "LTTng: block device enumeration is not supported by kernel\n");
break;