X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-debugfs-abi.c;h=0f649fc2af4bd10682949be82408cce0b7191ec9;hb=85a9ca7ff30ef892e5865c5541fd11f6c6de33a3;hp=2f200ed143e73ae2bad5e364d5c98023f8f72a25;hpb=a509e13364a2d024a2ae2acbeee3ac4ac2634842;p=lttng-modules.git

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index 2f200ed1..0f649fc2 100644
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -28,7 +28,7 @@
 #include <linux/file.h>
 #include <linux/uaccess.h>
 #include <linux/slab.h>
-#include <linux/vmalloc.h>	/* For vmalloc_sync_all */
+#include "wrapper/vmalloc.h"	/* for wrapper_vmalloc_sync_all() */
 #include "wrapper/ringbuffer/vfs.h"
 #include "ltt-debugfs-abi.h"
 #include "ltt-events.h"
@@ -47,7 +47,6 @@ static const struct file_operations lttng_event_fops;
 
 enum channel_type {
 	PER_CPU_CHANNEL,
-	GLOBAL_CHANNEL,
 	METADATA_CHANNEL,
 };
 
@@ -125,30 +124,30 @@ void lttng_metadata_create_events(struct file *channel_file)
 {
 	struct ltt_channel *channel = channel_file->private_data;
 	char *event_name = "lttng-metadata";
+	const struct lttng_event_desc *event_desc;
 	struct ltt_event *event;
 	int ret;
-	void *probe;
 
-	probe = ltt_probe_get(event_name);
-	if (!probe) {
+	event_desc = ltt_event_get(event_name);
+	if (!event_desc) {
 		ret = -ENOENT;
-		goto probe_error;
+		goto get_error;
 	}
 	/*
 	 * We tolerate no failure path after event creation. It will stay
 	 * invariant for the rest of the session.
 	 */
 	event = ltt_event_create(channel, event_name, INSTRUM_TRACEPOINTS,
-				 probe, NULL);
+				 event_desc, NULL);
 	if (!event) {
-		goto event_error;
+		goto create_error;
 		ret = -EEXIST;
 	}
 	return;
 
-event_error:
-	ltt_probe_put(probe);
-probe_error:
+create_error:
+	ltt_event_put(event_desc);
+get_error:
 	WARN_ON(1);
 	return;		/* not allowed to return error */
 }
@@ -187,13 +186,8 @@ int lttng_abi_create_channel(struct file *session_file,
 			"relay-overwrite" : "relay-discard";
 		fops = &lttng_channel_fops;
 		break;
-	case GLOBAL_CHANNEL:
-		transport_name = chan_param.overwrite ?
-			"global-relay-overwrite" : "global-relay-discard";
-		fops = &lttng_channel_fops;
-		break;
 	case METADATA_CHANNEL:
-		transport_name = "global-relay-discard";
+		transport_name = "relay-metadata";
 		fops = &lttng_metadata_fops;
 		break;
 	default:
@@ -344,12 +338,12 @@ int lttng_abi_create_event(struct file *channel_file,
 			   struct lttng_event __user *uevent_param)
 {
 	struct ltt_channel *channel = channel_file->private_data;
+	const struct lttng_event_desc *event_desc;
 	struct ltt_event *event;
 	char *event_name;
 	struct lttng_event event_param;
 	int event_fd, ret;
 	struct file *event_file;
-	void *probe;
 
 	if (copy_from_user(&event_param, uevent_param, sizeof(event_param)))
 		return -EFAULT;
@@ -362,10 +356,10 @@ int lttng_abi_create_event(struct file *channel_file,
 	}
 	event_name[PATH_MAX - 1] = '\0';
 
-	probe = ltt_probe_get(event_name);
-	if (!probe) {
+	event_desc = ltt_event_get(event_name);
+	if (!event_desc) {
 		ret = -ENOENT;
-		goto probe_error;
+		goto get_error;
 	}
 	event_fd = get_unused_fd();
 	if (event_fd < 0) {
@@ -384,7 +378,7 @@ int lttng_abi_create_event(struct file *channel_file,
 	 * invariant for the rest of the session.
 	 */
 	event = ltt_event_create(channel, event_name, event_param.itype,
-				 probe, NULL);
+				 event_desc, NULL);
 	if (!event) {
 		goto event_error;
 		ret = -EEXIST;
@@ -401,8 +395,8 @@ event_error:
 file_error:
 	put_unused_fd(event_fd);
 fd_error:
-	ltt_probe_put(probe);
-probe_error:
+	ltt_event_put(event_desc);
+get_error:
 name_error:
 	kfree(event_name);
 	return ret;
@@ -538,7 +532,7 @@ int __init ltt_debugfs_abi_init(void)
 {
 	int ret = 0;
 
-	vmalloc_sync_all();
+	wrapper_vmalloc_sync_all();
 	lttng_dentry = debugfs_create_file("lttng", S_IWUSR, NULL, NULL,
 					   &lttng_fops);
 	if (IS_ERR(lttng_dentry) || !lttng_dentry) {