X-Git-Url: http://git.efficios.com/?p=deliverable%2Flttng-modules.git;a=blobdiff_plain;f=lttng-abi.c;h=8c7a3d23f287ba0409d3c44696637ae4ca918331;hp=c535cb95d4814a0f0e50debc496dbec66b767ff3;hb=refs%2Fheads%2Fns-phase-1;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2

diff --git a/lttng-abi.c b/lttng-abi.c
index c535cb95..8c7a3d23 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;
 	}
@@ -419,8 +457,8 @@ int lttng_abi_create_channel(struct file *session_file,
 		transport_name = "<unknown>";
 		break;
 	}
-	if (atomic_long_add_unless(&session_file->f_count,
-		1, INT_MAX) == INT_MAX) {
+	if (!atomic_long_add_unless(&session_file->f_count, 1, LONG_MAX)) {
+		ret = -EOVERFLOW;
 		goto refcount_error;
 	}
 	/*
@@ -1072,8 +1110,7 @@ int lttng_abi_create_event(struct file *channel_file,
 		goto file_error;
 	}
 	/* The event holds a reference on the channel */
-	if (atomic_long_add_unless(&channel_file->f_count,
-		1, INT_MAX) == INT_MAX) {
+	if (!atomic_long_add_unless(&channel_file->f_count, 1, LONG_MAX)) {
 		ret = -EOVERFLOW;
 		goto refcount_error;
 	}
@@ -1306,7 +1343,6 @@ old_ctx_end:
 	default:
 		return -ENOIOCTLCMD;
 	}
-
 }
 
 /**
@@ -1473,7 +1509,18 @@ long lttng_event_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 			return lttng_enabler_attach_bytecode(enabler,
 				(struct lttng_kernel_filter_bytecode __user *) arg);
 		}
-
+		default:
+			WARN_ON_ONCE(1);
+			return -ENOSYS;
+		}
+	case LTTNG_KERNEL_ADD_CALLSITE:
+		switch (*evtype) {
+		case LTTNG_TYPE_EVENT:
+			event = file->private_data;
+			return lttng_event_add_callsite(event,
+				(struct lttng_kernel_event_callsite __user *) arg);
+		case LTTNG_TYPE_ENABLER:
+			return -EINVAL;
 		}
 	default:
 		return -ENOIOCTLCMD;