From 6388029c11796f2416f772c1f9aca2ec925774e2 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 13 Apr 2020 14:46:22 -0400 Subject: [PATCH] wrapper: remove namespace.h wrapper --- .../events/lttng-module/lttng-statedump.h | 15 +++++------ instrumentation/events/lttng-module/sched.h | 5 ++-- lttng-context-cgroup-ns.c | 5 ++-- lttng-context-ipc-ns.c | 5 ++-- lttng-context-mnt-ns.c | 5 ++-- lttng-context-net-ns.c | 5 ++-- lttng-context-pid-ns.c | 5 ++-- lttng-context-user-ns.c | 5 ++-- lttng-context-uts-ns.c | 5 ++-- lttng-statedump-impl.c | 3 +-- wrapper/namespace.h | 27 ------------------- 11 files changed, 24 insertions(+), 61 deletions(-) delete mode 100644 wrapper/namespace.h diff --git a/instrumentation/events/lttng-module/lttng-statedump.h b/instrumentation/events/lttng-module/lttng-statedump.h index f8f10e7c..6e2dd9e7 100644 --- a/instrumentation/events/lttng-module/lttng-statedump.h +++ b/instrumentation/events/lttng-module/lttng-statedump.h @@ -15,7 +15,6 @@ #include #include #include -#include #include #ifndef LTTNG_MNT_NS_MISSING_HEADER @@ -73,7 +72,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_cgroup_ns, TP_ARGS(session, p, cgroup_ns), TP_FIELDS( ctf_integer(pid_t, tid, p->pid) - ctf_integer(unsigned int, ns_inum, cgroup_ns ? cgroup_ns->lttng_ns_inum : 0) + ctf_integer(unsigned int, ns_inum, cgroup_ns ? cgroup_ns->ns.inum : 0) ) ) #endif @@ -86,7 +85,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_ipc_ns, TP_FIELDS( ctf_integer(pid_t, tid, p->pid) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) - ctf_integer(unsigned int, ns_inum, ipc_ns ? ipc_ns->lttng_ns_inum : 0) + ctf_integer(unsigned int, ns_inum, ipc_ns ? ipc_ns->ns.inum : 0) #endif ) ) @@ -100,7 +99,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_mnt_ns, TP_FIELDS( ctf_integer(pid_t, tid, p->pid) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) - ctf_integer(unsigned int, ns_inum, mnt_ns ? mnt_ns->lttng_ns_inum : 0) + ctf_integer(unsigned int, ns_inum, mnt_ns ? mnt_ns->ns.inum : 0) #endif ) ) @@ -114,7 +113,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_net_ns, TP_FIELDS( ctf_integer(pid_t, tid, p->pid) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) - ctf_integer(unsigned int, ns_inum, net_ns ? net_ns->lttng_ns_inum : 0) + ctf_integer(unsigned int, ns_inum, net_ns ? net_ns->ns.inum : 0) #endif ) ) @@ -143,7 +142,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_pid_ns, })) ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) - ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->lttng_ns_inum : 0) + ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->ns.inum : 0) #endif ) ) @@ -161,7 +160,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_user_ns, ctf_integer(int, ns_level, user_ns ? user_ns->level : 0) #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) - ctf_integer(unsigned int, ns_inum, user_ns ? user_ns->lttng_ns_inum : 0) + ctf_integer(unsigned int, ns_inum, user_ns ? user_ns->ns.inum : 0) #endif ) ) @@ -174,7 +173,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_uts_ns, TP_FIELDS( ctf_integer(pid_t, tid, p->pid) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) - ctf_integer(unsigned int, ns_inum, uts_ns ? uts_ns->lttng_ns_inum : 0) + ctf_integer(unsigned int, ns_inum, uts_ns ? uts_ns->ns.inum : 0) #endif ) ) diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h index 80f85ca4..e9d73475 100644 --- a/instrumentation/events/lttng-module/sched.h +++ b/instrumentation/events/lttng-module/sched.h @@ -13,7 +13,6 @@ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) #include #endif -#include #define LTTNG_MAX_PID_NS_LEVEL 32 @@ -466,7 +465,7 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork, pid_ns = task_active_pid_ns(parent); if (pid_ns) parent_ns_inum = - pid_ns->lttng_ns_inum; + pid_ns->ns.inum; } parent_ns_inum; })) @@ -486,7 +485,7 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork, pid_ns = task_active_pid_ns(child); if (pid_ns) child_ns_inum = - pid_ns->lttng_ns_inum; + pid_ns->ns.inum; } child_ns_inum; })) diff --git a/lttng-context-cgroup-ns.c b/lttng-context-cgroup-ns.c index 0c284966..188c1d44 100644 --- a/lttng-context-cgroup-ns.c +++ b/lttng-context-cgroup-ns.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #if defined(CONFIG_CGROUPS) && \ @@ -47,7 +46,7 @@ void cgroup_ns_record(struct lttng_ctx_field *field, * namespaces, just dereference the pointers. */ if (current->nsproxy) - cgroup_ns_inum = current->nsproxy->cgroup_ns->lttng_ns_inum; + cgroup_ns_inum = current->nsproxy->cgroup_ns->ns.inum; lib_ring_buffer_align_ctx(ctx, lttng_alignof(cgroup_ns_inum)); chan->ops->event_write(ctx, &cgroup_ns_inum, sizeof(cgroup_ns_inum)); @@ -68,7 +67,7 @@ void cgroup_ns_get_value(struct lttng_ctx_field *field, * namespaces, just dereference the pointers. */ if (current->nsproxy) - cgroup_ns_inum = current->nsproxy->cgroup_ns->lttng_ns_inum; + cgroup_ns_inum = current->nsproxy->cgroup_ns->ns.inum; value->s64 = cgroup_ns_inum; } diff --git a/lttng-context-ipc-ns.c b/lttng-context-ipc-ns.c index 09d8f2e3..4e9a60ee 100644 --- a/lttng-context-ipc-ns.c +++ b/lttng-context-ipc-ns.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #if defined(CONFIG_IPC_NS) && \ @@ -46,7 +45,7 @@ void ipc_ns_record(struct lttng_ctx_field *field, * namespaces, just dereference the pointers. */ if (current->nsproxy) - ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum; + ipc_ns_inum = current->nsproxy->ipc_ns->ns.inum; lib_ring_buffer_align_ctx(ctx, lttng_alignof(ipc_ns_inum)); chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum)); @@ -67,7 +66,7 @@ void ipc_ns_get_value(struct lttng_ctx_field *field, * namespaces, just dereference the pointers. */ if (current->nsproxy) - ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum; + ipc_ns_inum = current->nsproxy->ipc_ns->ns.inum; value->s64 = ipc_ns_inum; } diff --git a/lttng-context-mnt-ns.c b/lttng-context-mnt-ns.c index 72e8efa1..154517bd 100644 --- a/lttng-context-mnt-ns.c +++ b/lttng-context-mnt-ns.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \ @@ -48,7 +47,7 @@ void mnt_ns_record(struct lttng_ctx_field *field, * namespaces, just dereference the pointers. */ if (current->nsproxy) - mnt_ns_inum = current->nsproxy->mnt_ns->lttng_ns_inum; + mnt_ns_inum = current->nsproxy->mnt_ns->ns.inum; lib_ring_buffer_align_ctx(ctx, lttng_alignof(mnt_ns_inum)); chan->ops->event_write(ctx, &mnt_ns_inum, sizeof(mnt_ns_inum)); @@ -69,7 +68,7 @@ void mnt_ns_get_value(struct lttng_ctx_field *field, * namespaces, just dereference the pointers. */ if (current->nsproxy) - mnt_ns_inum = current->nsproxy->mnt_ns->lttng_ns_inum; + mnt_ns_inum = current->nsproxy->mnt_ns->ns.inum; value->s64 = mnt_ns_inum; } diff --git a/lttng-context-net-ns.c b/lttng-context-net-ns.c index 6cdd622a..459aa379 100644 --- a/lttng-context-net-ns.c +++ b/lttng-context-net-ns.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #if defined(CONFIG_NET_NS) && \ @@ -47,7 +46,7 @@ void net_ns_record(struct lttng_ctx_field *field, * namespaces, just dereference the pointers. */ if (current->nsproxy) - net_ns_inum = current->nsproxy->net_ns->lttng_ns_inum; + net_ns_inum = current->nsproxy->net_ns->ns.inum; lib_ring_buffer_align_ctx(ctx, lttng_alignof(net_ns_inum)); chan->ops->event_write(ctx, &net_ns_inum, sizeof(net_ns_inum)); @@ -68,7 +67,7 @@ void net_ns_get_value(struct lttng_ctx_field *field, * namespaces, just dereference the pointers. */ if (current->nsproxy) - net_ns_inum = current->nsproxy->net_ns->lttng_ns_inum; + net_ns_inum = current->nsproxy->net_ns->ns.inum; value->s64 = net_ns_inum; } diff --git a/lttng-context-pid-ns.c b/lttng-context-pid-ns.c index cb1ee0d4..1e95d6b3 100644 --- a/lttng-context-pid-ns.c +++ b/lttng-context-pid-ns.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #if defined(CONFIG_PID_NS) && \ @@ -47,7 +46,7 @@ void pid_ns_record(struct lttng_ctx_field *field, ns = task_active_pid_ns(current); if (ns) - pid_ns_inum = ns->lttng_ns_inum; + pid_ns_inum = ns->ns.inum; lib_ring_buffer_align_ctx(ctx, lttng_alignof(pid_ns_inum)); chan->ops->event_write(ctx, &pid_ns_inum, sizeof(pid_ns_inum)); @@ -69,7 +68,7 @@ void pid_ns_get_value(struct lttng_ctx_field *field, ns = task_active_pid_ns(current); if (ns) - pid_ns_inum = ns->lttng_ns_inum; + pid_ns_inum = ns->ns.inum; value->s64 = pid_ns_inum; } diff --git a/lttng-context-user-ns.c b/lttng-context-user-ns.c index bb08f8c1..15306389 100644 --- a/lttng-context-user-ns.c +++ b/lttng-context-user-ns.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #if defined(CONFIG_USER_NS) && \ @@ -39,7 +38,7 @@ void user_ns_record(struct lttng_ctx_field *field, unsigned int user_ns_inum = 0; if (current_user_ns()) - user_ns_inum = current_user_ns()->lttng_ns_inum; + user_ns_inum = current_user_ns()->ns.inum; lib_ring_buffer_align_ctx(ctx, lttng_alignof(user_ns_inum)); chan->ops->event_write(ctx, &user_ns_inum, sizeof(user_ns_inum)); @@ -53,7 +52,7 @@ void user_ns_get_value(struct lttng_ctx_field *field, unsigned int user_ns_inum = 0; if (current_user_ns()) - user_ns_inum = current_user_ns()->lttng_ns_inum; + user_ns_inum = current_user_ns()->ns.inum; value->s64 = user_ns_inum; } diff --git a/lttng-context-uts-ns.c b/lttng-context-uts-ns.c index c6c6d072..cb8c60f1 100644 --- a/lttng-context-uts-ns.c +++ b/lttng-context-uts-ns.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #if defined(CONFIG_UTS_NS) && \ @@ -46,7 +45,7 @@ void uts_ns_record(struct lttng_ctx_field *field, * namespaces, just dereference the pointers. */ if (current->nsproxy) - uts_ns_inum = current->nsproxy->uts_ns->lttng_ns_inum; + uts_ns_inum = current->nsproxy->uts_ns->ns.inum; lib_ring_buffer_align_ctx(ctx, lttng_alignof(uts_ns_inum)); chan->ops->event_write(ctx, &uts_ns_inum, sizeof(uts_ns_inum)); @@ -67,7 +66,7 @@ void uts_ns_get_value(struct lttng_ctx_field *field, * namespaces, just dereference the pointers. */ if (current->nsproxy) - uts_ns_inum = current->nsproxy->uts_ns->lttng_ns_inum; + uts_ns_inum = current->nsproxy->uts_ns->ns.inum; value->s64 = uts_ns_inum; } diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c index 07ffbf7f..a40ef760 100644 --- a/lttng-statedump-impl.c +++ b/lttng-statedump-impl.c @@ -37,7 +37,6 @@ #include #include -#include #include /* Define the tracepoints, but do not build the probes */ @@ -397,7 +396,7 @@ void lttng_statedump_process_ns(struct lttng_session *session, * paranoid behavior of * trace_lttng_statedump_process_user_ns(). */ - user_ns = user_ns ? user_ns->lttng_user_ns_parent : NULL; + user_ns = user_ns ? user_ns->parent : NULL; } while (user_ns); /* diff --git a/wrapper/namespace.h b/wrapper/namespace.h deleted file mode 100644 index 8e8a3712..00000000 --- a/wrapper/namespace.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) - * - * wrapper/namespace.h - * - * Copyright (C) 2011-2012 Mathieu Desnoyers - * 2019 Michael Jeanson - * - */ - -#ifndef _LTTNG_WRAPPER_NAMESPACE_H -#define _LTTNG_WRAPPER_NAMESPACE_H - -#include - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)) -#define lttng_ns_inum ns.inum -#else -#define lttng_ns_inum proc_inum -#endif - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) -#define lttng_user_ns_parent parent -#else -#define lttng_user_ns_parent creator->user_ns -#endif - -#endif /* _LTTNG_WRAPPER_NAMESPACE_H */ -- 2.34.1