X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-debugfs-abi.c;h=0ac886113c35c5711dfb6c1060aeda22ee1df0dc;hb=681cc3bb4f00fd63ad65920ea6e201fcaed300c0;hp=a10236134a287a47207825fbb3bd49d831168600;hpb=11b5a3c23711e1119185011f791f599713914d67;p=lttng-modules.git

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index a1023613..0ac88611 100644
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -53,7 +53,7 @@ int lttng_abi_create_session(void)
 	session = ltt_session_create();
 	if (!session)
 		return -ENOMEM;
-	session_fd = get_unused_fd_flags(O_RDWR);
+	session_fd = get_unused_fd();
 	if (session_fd < 0) {
 		ret = session_fd;
 		goto fd_error;
@@ -119,7 +119,7 @@ int lttng_abi_create_channel(struct file *session_file,
 
 	if (copy_from_user(&chan_param, uchan_param, sizeof(chan_param)))
 		return -EFAULT;
-	chan_fd = get_unused_fd_flags(O_RDWR);
+	chan_fd = get_unused_fd();
 	if (chan_fd < 0) {
 		ret = chan_fd;
 		goto fd_error;
@@ -141,14 +141,14 @@ int lttng_abi_create_channel(struct file *session_file,
 				  chan_param.switch_timer_interval,
 				  chan_param.read_timer_interval);
 	if (!chan) {
-		ret = -ENOMEM;
+		ret = -EINVAL;
 		goto chan_error;
 	}
 	chan->file = chan_file;
 	chan_file->private_data = chan;
 	fd_install(chan_fd, chan_file);
 	/* The channel created holds a reference on the session */
-	atomic_inc(&session_file->f_count);
+	atomic_long_inc(&session_file->f_count);
 
 	return chan_fd;
 
@@ -202,7 +202,9 @@ static
 int lttng_session_release(struct inode *inode, struct file *file)
 {
 	struct ltt_session *session = file->private_data;
-	ltt_session_destroy(session);
+
+	if (session)
+		ltt_session_destroy(session);
 	return 0;
 }
 
@@ -226,7 +228,7 @@ int lttng_abi_open_stream(struct file *channel_file)
 	if (!buf)
 		return -ENOENT;
 
-	stream_fd = get_unused_fd_flags(O_RDWR);
+	stream_fd = get_unused_fd();
 	if (stream_fd < 0) {
 		ret = stream_fd;
 		goto fd_error;
@@ -239,8 +241,11 @@ int lttng_abi_open_stream(struct file *channel_file)
 		goto file_error;
 	}
 	fd_install(stream_fd, stream_file);
-	/* The stream holds a reference on the channel */
-	atomic_inc(&channel_file->f_count);
+	/*
+	 * The stream holds a reference to the channel within the generic ring
+	 * buffer library, so no need to hold a refcount on the channel and
+	 * session files here.
+	 */
 	return stream_fd;
 
 file_error:
@@ -260,18 +265,25 @@ int lttng_abi_create_event(struct file *channel_file,
 	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;
 	event_name = kmalloc(PATH_MAX, GFP_KERNEL);
 	if (!event_name)
 		return -ENOMEM;
-	if (strncpy_from_user(event_name, uevent_param->name, PATH_MAX)) {
+	if (strncpy_from_user(event_name, uevent_param->name, PATH_MAX) < 0) {
 		ret = -EFAULT;
 		goto name_error;
 	}
 	event_name[PATH_MAX - 1] = '\0';
-	event_fd = get_unused_fd_flags(O_RDWR);
+
+	probe = ltt_probe_get(event_name);
+	if (!probe) {
+		ret = -ENOENT;
+		goto probe_error;
+	}
+	event_fd = get_unused_fd();
 	if (event_fd < 0) {
 		ret = event_fd;
 		goto fd_error;
@@ -288,7 +300,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,
-				 NULL, NULL);	/* TODO non-null probe */
+				 probe, NULL);
 	if (!event) {
 		goto event_error;
 		ret = -EEXIST;
@@ -296,7 +308,7 @@ int lttng_abi_create_event(struct file *channel_file,
 	event_file->private_data = event;
 	fd_install(event_fd, event_file);
 	/* The event holds a reference on the channel */
-	atomic_inc(&channel_file->f_count);
+	atomic_long_inc(&channel_file->f_count);
 	kfree(event_name);
 	return event_fd;
 
@@ -305,6 +317,8 @@ event_error:
 file_error:
 	put_unused_fd(event_fd);
 fd_error:
+	ltt_probe_put(probe);
+probe_error:
 name_error:
 	kfree(event_name);
 	return ret;
@@ -372,7 +386,9 @@ static
 int lttng_channel_release(struct inode *inode, struct file *file)
 {
 	struct ltt_channel *channel = file->private_data;
-	fput(channel->session->file);
+
+	if (channel)
+		fput(channel->session->file);
 	return 0;
 }
 
@@ -392,7 +408,9 @@ static
 int lttng_event_release(struct inode *inode, struct file *file)
 {
 	struct ltt_event *event = file->private_data;
-	fput(event->chan->file);
+
+	if (event)
+		fput(event->chan->file);
 	return 0;
 }
 
@@ -401,12 +419,12 @@ static const struct file_operations lttng_event_fops = {
 	.release = lttng_event_release,
 };
 
-static int __init ltt_debugfs_abi_init(void)
+int __init ltt_debugfs_abi_init(void)
 {
 	int ret = 0;
 
 	lttng_dentry = debugfs_create_file("lttng", S_IWUSR, NULL, NULL,
-					   &lttng_session_fops);
+					   &lttng_fops);
 	if (IS_ERR(lttng_dentry) || !lttng_dentry) {
 		printk(KERN_ERR "Error creating LTTng control file\n");
 		ret = -ENOMEM;
@@ -416,15 +434,7 @@ error:
 	return ret;
 }
 
-module_init(ltt_debugfs_abi_init);
-
-static void __exit ltt_debugfs_abi_exit(void)
+void __exit ltt_debugfs_abi_exit(void)
 {
 	debugfs_remove(lttng_dentry);
 }
-
-module_exit(ltt_debugfs_abi_exit);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Next Generation DebugFS ABI");