From 65ae1ae9f0edbb4352b1e4a96b414e5b1bd8858b Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 2 Apr 2019 17:51:01 -0400
Subject: [PATCH] MI: add support for namespace and uid/gid contexts
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/common/mi-lttng-3.0.xsd | 19 +++++++++++++++++++
 src/common/mi-lttng.c       | 38 +++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
index 017956ccc..b15491a6e 100644
--- a/src/common/mi-lttng-3.0.xsd
+++ b/src/common/mi-lttng-3.0.xsd
@@ -119,6 +119,25 @@ THE SOFTWARE.
 			<xs:enumeration value="MIGRATABLE" />
 			<xs:enumeration value="CALLSTACK_USER" />
 			<xs:enumeration value="CALLSTACK_KERNEL" />
+			<xs:enumeration value="CGROUP_NS" />
+			<xs:enumeration value="IPC_NS" />
+			<xs:enumeration value="MNT_NS" />
+			<xs:enumeration value="NET_NS" />
+			<xs:enumeration value="PID_NS" />
+			<xs:enumeration value="USER_NS" />
+			<xs:enumeration value="UTS_NS" />
+			<xs:enumeration value="UID" />
+			<xs:enumeration value="EUID" />
+			<xs:enumeration value="SUID" />
+			<xs:enumeration value="GID" />
+			<xs:enumeration value="EGID" />
+			<xs:enumeration value="SGID" />
+			<xs:enumeration value="VUID" />
+			<xs:enumeration value="VEUID" />
+			<xs:enumeration value="VSUID" />
+			<xs:enumeration value="VGID" />
+			<xs:enumeration value="VEGID" />
+			<xs:enumeration value="VSGID" />
 		</xs:restriction>
 	</xs:simpleType>
 
diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index 59a624a96..2a69d4529 100644
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -428,6 +428,44 @@ const char *mi_lttng_event_contexttype_string(enum lttng_event_context_type val)
 		return config_event_context_callstack_user;
 	case LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL:
 		return config_event_context_callstack_kernel;
+	case LTTNG_EVENT_CONTEXT_CGROUP_NS:
+		return config_event_context_cgroup_ns;
+	case LTTNG_EVENT_CONTEXT_IPC_NS:
+		return config_event_context_ipc_ns;
+	case LTTNG_EVENT_CONTEXT_MNT_NS:
+		return config_event_context_mnt_ns;
+	case LTTNG_EVENT_CONTEXT_NET_NS:
+		return config_event_context_net_ns;
+	case LTTNG_EVENT_CONTEXT_PID_NS:
+		return config_event_context_pid_ns;
+	case LTTNG_EVENT_CONTEXT_USER_NS:
+		return config_event_context_user_ns;
+	case LTTNG_EVENT_CONTEXT_UTS_NS:
+		return config_event_context_uts_ns;
+	case LTTNG_EVENT_CONTEXT_UID:
+		return config_event_context_uid;
+	case LTTNG_EVENT_CONTEXT_EUID:
+		return config_event_context_euid;
+	case LTTNG_EVENT_CONTEXT_SUID:
+		return config_event_context_suid;
+	case LTTNG_EVENT_CONTEXT_GID:
+		return config_event_context_gid;
+	case LTTNG_EVENT_CONTEXT_EGID:
+		return config_event_context_egid;
+	case LTTNG_EVENT_CONTEXT_SGID:
+		return config_event_context_sgid;
+	case LTTNG_EVENT_CONTEXT_VUID:
+		return config_event_context_vuid;
+	case LTTNG_EVENT_CONTEXT_VEUID:
+		return config_event_context_veuid;
+	case LTTNG_EVENT_CONTEXT_VSUID:
+		return config_event_context_vsuid;
+	case LTTNG_EVENT_CONTEXT_VGID:
+		return config_event_context_vgid;
+	case LTTNG_EVENT_CONTEXT_VEGID:
+		return config_event_context_vegid;
+	case LTTNG_EVENT_CONTEXT_VSGID:
+		return config_event_context_vsgid;
 	default:
 		return NULL;
 	}
-- 
2.34.1