X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-abi.c;h=5c6f384d8fc62c6b40a229a30d9036a0be9f3f9e;hb=436f640717bab63240d9a624846d947e150a2cee;hp=aab2caca467f15eadcfb916858931b134daad6d5;hpb=7f859fbf8ecbf5b10921eb1cbc608e504118c684;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index aab2caca..5c6f384d 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -236,6 +236,44 @@ long lttng_abi_add_context(struct file *file,
 	case LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL:
 	case LTTNG_KERNEL_CONTEXT_CALLSTACK_USER:
 		return lttng_add_callstack_to_ctx(ctx, context_param->ctx);
+	case LTTNG_KERNEL_CONTEXT_CGROUP_NS:
+		return lttng_add_cgroup_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_IPC_NS:
+		return lttng_add_ipc_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_MNT_NS:
+		return lttng_add_mnt_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_NET_NS:
+		return lttng_add_net_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_PID_NS:
+		return lttng_add_pid_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_USER_NS:
+		return lttng_add_user_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_UTS_NS:
+		return lttng_add_uts_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_UID:
+		return lttng_add_uid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_EUID:
+		return lttng_add_euid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_SUID:
+		return lttng_add_suid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_GID:
+		return lttng_add_gid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_EGID:
+		return lttng_add_egid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_SGID:
+		return lttng_add_sgid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VUID:
+		return lttng_add_vuid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VEUID:
+		return lttng_add_veuid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VSUID:
+		return lttng_add_vsuid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VGID:
+		return lttng_add_vgid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VEGID:
+		return lttng_add_vegid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VSGID:
+		return lttng_add_vsgid_to_ctx(ctx);
 	default:
 		return -EINVAL;
 	}
@@ -470,6 +508,23 @@ int lttng_abi_session_set_name(struct lttng_session *session,
 	return 0;
 }
 
+static
+int lttng_abi_session_set_creation_time(struct lttng_session *session,
+		struct lttng_kernel_session_creation_time *time)
+{
+	size_t len;
+
+	len = strnlen(time->iso8601, LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN);
+
+	if (len == LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN) {
+		/* Time is too long/malformed */
+		return -EINVAL;
+	}
+
+	strcpy(session->creation_time, time->iso8601);
+	return 0;
+}
+
 /**
  *	lttng_session_ioctl - lttng session fd ioctl
  *
@@ -497,13 +552,12 @@ static
 long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
 	struct lttng_session *session = file->private_data;
+	struct lttng_kernel_channel chan_param;
+	struct lttng_kernel_old_channel old_chan_param;
 
 	switch (cmd) {
 	case LTTNG_KERNEL_OLD_CHANNEL:
 	{
-		struct lttng_kernel_channel chan_param;
-		struct lttng_kernel_old_channel old_chan_param;
-
 		if (copy_from_user(&old_chan_param,
 				(struct lttng_kernel_old_channel __user *) arg,
 				sizeof(struct lttng_kernel_old_channel)))
@@ -520,8 +574,6 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	}
 	case LTTNG_KERNEL_CHANNEL:
 	{
-		struct lttng_kernel_channel chan_param;
-
 		if (copy_from_user(&chan_param,
 				(struct lttng_kernel_channel __user *) arg,
 				sizeof(struct lttng_kernel_channel)))
@@ -541,9 +593,6 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		return lttng_session_disable(session);
 	case LTTNG_KERNEL_OLD_METADATA:
 	{
-		struct lttng_kernel_channel chan_param;
-		struct lttng_kernel_old_channel old_chan_param;
-
 		if (copy_from_user(&old_chan_param,
 				(struct lttng_kernel_old_channel __user *) arg,
 				sizeof(struct lttng_kernel_old_channel)))
@@ -560,8 +609,6 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	}
 	case LTTNG_KERNEL_METADATA:
 	{
-		struct lttng_kernel_channel chan_param;
-
 		if (copy_from_user(&chan_param,
 					(struct lttng_kernel_channel __user *) arg,
 					sizeof(struct lttng_kernel_channel)))
@@ -589,6 +636,16 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 			return -EFAULT;
 		return lttng_abi_session_set_name(session, &name);
 	}
+	case LTTNG_KERNEL_SESSION_SET_CREATION_TIME:
+	{
+		struct lttng_kernel_session_creation_time time;
+
+		if (copy_from_user(&time,
+				(struct lttng_kernel_session_creation_time __user *) arg,
+				sizeof(struct lttng_kernel_session_creation_time)))
+			return -EFAULT;
+		return lttng_abi_session_set_creation_time(session, &time);
+	}
 	default:
 		return -ENOIOCTLCMD;
 	}
@@ -1510,6 +1567,9 @@ long lttng_event_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 				(struct lttng_kernel_event_callsite __user *) arg);
 		case LTTNG_TYPE_ENABLER:
 			return -EINVAL;
+		default:
+			WARN_ON_ONCE(1);
+			return -ENOSYS;
 		}
 	default:
 		return -ENOIOCTLCMD;