X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-abi.c;h=ede2ae79bd7b15c45ec4ef3864a048cc85f2e006;hb=33a39a3cd074931ab3a2eaff6eb8807091cf8172;hp=5823a1db042d6fa8aa5e88bef4a35235bf5eea4e;hpb=4ac10b765aed7983d382ed2eeedfb42a45e7fe83;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index 5823a1db..ede2ae79 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -423,6 +423,10 @@ fd_error:
  *		Disables tracing for a session (strong disable)
  *	LTTNG_KERNEL_METADATA
  *		Returns a LTTng metadata file descriptor
+ *	LTTNG_KERNEL_SESSION_TRACK_PID
+ *		Add PID to session tracker
+ *	LTTNG_KERNEL_SESSION_UNTRACK_PID
+ *		Remove PID from session tracker
  *
  * The returned channel will be deleted when its file descriptor is closed.
  */
@@ -502,6 +506,12 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		return lttng_abi_create_channel(file, &chan_param,
 				METADATA_CHANNEL);
 	}
+	case LTTNG_KERNEL_SESSION_TRACK_PID:
+		return lttng_session_track_pid(session, (int) arg);
+	case LTTNG_KERNEL_SESSION_UNTRACK_PID:
+		return lttng_session_untrack_pid(session, (int) arg);
+	case LTTNG_KERNEL_SESSION_LIST_TRACKER_PIDS:
+		return lttng_session_list_tracker_pids(session);
 	default:
 		return -ENOIOCTLCMD;
 	}
@@ -901,9 +911,9 @@ int lttng_abi_create_event(struct file *channel_file,
 			   struct lttng_kernel_event *event_param)
 {
 	struct lttng_channel *channel = channel_file->private_data;
-	struct lttng_event *event;
 	int event_fd, ret;
 	struct file *event_file;
+	void *priv;
 
 	event_param->name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
 	switch (event_param->instrumentation) {
@@ -919,56 +929,51 @@ int lttng_abi_create_event(struct file *channel_file,
 	default:
 		break;
 	}
-	switch (event_param->instrumentation) {
-	default:
-		event_fd = lttng_get_unused_fd();
-		if (event_fd < 0) {
-			ret = event_fd;
-			goto fd_error;
-		}
-		event_file = anon_inode_getfile("[lttng_event]",
-						&lttng_event_fops,
-						NULL, O_RDWR);
-		if (IS_ERR(event_file)) {
-			ret = PTR_ERR(event_file);
-			goto file_error;
+	event_fd = lttng_get_unused_fd();
+	if (event_fd < 0) {
+		ret = event_fd;
+		goto fd_error;
+	}
+	event_file = anon_inode_getfile("[lttng_event]",
+					&lttng_event_fops,
+					NULL, O_RDWR);
+	if (IS_ERR(event_file)) {
+		ret = PTR_ERR(event_file);
+		goto file_error;
+	}
+	if (event_param->instrumentation == LTTNG_KERNEL_TRACEPOINT
+			|| event_param->instrumentation == LTTNG_KERNEL_SYSCALL) {
+		struct lttng_enabler *enabler;
+
+		if (event_param->name[strlen(event_param->name) - 1] == '*') {
+			enabler = lttng_enabler_create(LTTNG_ENABLER_WILDCARD,
+				event_param, channel);
+		} else {
+			enabler = lttng_enabler_create(LTTNG_ENABLER_NAME,
+				event_param, channel);
 		}
+		priv = enabler;
+	} else {
+		struct lttng_event *event;
+
 		/*
 		 * We tolerate no failure path after event creation. It
 		 * will stay invariant for the rest of the session.
 		 */
-		event = lttng_event_create(channel, event_param, NULL, NULL);
+		event = lttng_event_create(channel, event_param,
+				NULL, NULL,
+				event_param->instrumentation);
 		WARN_ON_ONCE(!event);
 		if (IS_ERR(event)) {
 			ret = PTR_ERR(event);
 			goto event_error;
 		}
-		event_file->private_data = event;
-		fd_install(event_fd, event_file);
-		/* The event holds a reference on the channel */
-		atomic_long_inc(&channel_file->f_count);
-		break;
-	case LTTNG_KERNEL_SYSCALL:
-		ret = lttng_syscalls_register(channel, NULL);
-		if (ret)
-			goto fd_error;
-		event_fd = 0;
-		if (event_param->u.syscall.enable) {
-			ret = lttng_syscall_filter_enable(channel,
-				event_param->name[0] == '\0' ?
-					NULL : event_param->name);
-			if (ret)
-				goto fd_error;
-
-		} else {
-			ret = lttng_syscall_filter_disable(channel,
-				event_param->name[0] == '\0' ?
-					NULL : event_param->name);
-			if (ret)
-				goto fd_error;
-		}
-		break;
+		priv = event;
 	}
+	event_file->private_data = priv;
+	fd_install(event_fd, event_file);
+	/* The event holds a reference on the channel */
+	atomic_long_inc(&channel_file->f_count);
 	return event_fd;
 
 event_error:
@@ -1277,77 +1282,47 @@ static const struct file_operations lttng_metadata_fops = {
 static
 long lttng_event_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-	struct lttng_event *event = file->private_data;
+	struct lttng_event *event;
+	struct lttng_enabler *enabler;
+	enum lttng_event_type *evtype = file->private_data;
 
 	switch (cmd) {
 	case LTTNG_KERNEL_OLD_CONTEXT:
 	{
-		struct lttng_kernel_context *ucontext_param;
-		struct lttng_kernel_old_context *old_ucontext_param;
-		int ret;
-
-		ucontext_param = kmalloc(sizeof(struct lttng_kernel_context),
-				GFP_KERNEL);
-		if (!ucontext_param) {
-			ret = -ENOMEM;
-			goto old_ctx_end;
-		}
-		old_ucontext_param = kmalloc(sizeof(struct lttng_kernel_old_context),
-				GFP_KERNEL);
-		if (!old_ucontext_param) {
-			ret = -ENOMEM;
-			goto old_ctx_error_free_param;
-		}
-
-		if (copy_from_user(old_ucontext_param,
-					(struct lttng_kernel_old_context __user *) arg,
-					sizeof(struct lttng_kernel_old_context))) {
-			ret = -EFAULT;
-			goto old_ctx_error_free_old_param;
-		}
-		ucontext_param->ctx = old_ucontext_param->ctx;
-		memcpy(ucontext_param->padding, old_ucontext_param->padding,
-				sizeof(ucontext_param->padding));
-		/* only type that uses the union */
-		if (old_ucontext_param->ctx == LTTNG_KERNEL_CONTEXT_PERF_COUNTER) {
-			ucontext_param->u.perf_counter.type =
-				old_ucontext_param->u.perf_counter.type;
-			ucontext_param->u.perf_counter.config =
-				old_ucontext_param->u.perf_counter.config;
-			memcpy(ucontext_param->u.perf_counter.name,
-					old_ucontext_param->u.perf_counter.name,
-					sizeof(ucontext_param->u.perf_counter.name));
-		}
-
-		ret = lttng_abi_add_context(file,
-				ucontext_param,
-				&event->ctx, event->chan->session);
-
-old_ctx_error_free_old_param:
-		kfree(old_ucontext_param);
-old_ctx_error_free_param:
-		kfree(ucontext_param);
-old_ctx_end:
-		return ret;
+		/* Not implemented */
+		return -ENOSYS;
 	}
 	case LTTNG_KERNEL_CONTEXT:
 	{
-		struct lttng_kernel_context ucontext_param;
-
-		if (copy_from_user(&ucontext_param,
-					(struct lttng_kernel_context __user *) arg,
-					sizeof(ucontext_param)))
-			return -EFAULT;
-		return lttng_abi_add_context(file,
-				&ucontext_param,
-				&event->ctx, event->chan->session);
+		/* Not implemented */
+		return -ENOSYS;
 	}
 	case LTTNG_KERNEL_OLD_ENABLE:
 	case LTTNG_KERNEL_ENABLE:
-		return lttng_event_enable(event);
+		switch (*evtype) {
+		case LTTNG_TYPE_EVENT:
+			event = file->private_data;
+			return lttng_event_enable(event);
+		case LTTNG_TYPE_ENABLER:
+			enabler = file->private_data;
+			return lttng_enabler_enable(enabler);
+		default:
+			WARN_ON_ONCE(1);
+			return -ENOSYS;
+		}
 	case LTTNG_KERNEL_OLD_DISABLE:
 	case LTTNG_KERNEL_DISABLE:
-		return lttng_event_disable(event);
+		switch (*evtype) {
+		case LTTNG_TYPE_EVENT:
+			event = file->private_data;
+			return lttng_event_disable(event);
+		case LTTNG_TYPE_ENABLER:
+			enabler = file->private_data;
+			return lttng_enabler_disable(enabler);
+		default:
+			WARN_ON_ONCE(1);
+			return -ENOSYS;
+		}
 	default:
 		return -ENOIOCTLCMD;
 	}
@@ -1356,10 +1331,29 @@ old_ctx_end:
 static
 int lttng_event_release(struct inode *inode, struct file *file)
 {
-	struct lttng_event *event = file->private_data;
+	struct lttng_event *event;
+	struct lttng_enabler *enabler;
+	enum lttng_event_type *evtype = file->private_data;
+
+	if (!evtype)
+		return 0;
+
+	switch (*evtype) {
+	case LTTNG_TYPE_EVENT:
+		event = file->private_data;
+		if (event)
+			fput(event->chan->file);
+		break;
+	case LTTNG_TYPE_ENABLER:
+		enabler = file->private_data;
+		if (enabler)
+			fput(enabler->chan->file);
+		break;
+	default:
+		WARN_ON_ONCE(1);
+		break;
+	}
 
-	if (event)
-		fput(event->chan->file);
 	return 0;
 }