X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-abi.c;h=5bd7621f13ff5c503a55a4e57ada5b5e5678a451;hb=refs%2Fheads%2Fstable-2.5;hp=c2560e0573c2a9a5827a8bfb10d18b7642c96f1a;hpb=3b731ab1a88c60e0a3a8eeddd225f751e821b1f3;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index c2560e05..5bd7621f 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -43,6 +43,7 @@
 #include <linux/file.h>
 #include <linux/uaccess.h>
 #include <linux/slab.h>
+#include <linux/err.h>
 #include "wrapper/vmalloc.h"	/* for wrapper_vmalloc_sync_all() */
 #include "wrapper/ringbuffer/vfs.h"
 #include "wrapper/ringbuffer/backend.h"
@@ -540,31 +541,16 @@ unsigned int lttng_metadata_ring_buffer_poll(struct file *filp,
 		if (finalized)
 			mask |= POLLHUP;
 
+		mutex_lock(&stream->metadata_cache->lock);
 		if (stream->metadata_cache->metadata_written >
 				stream->metadata_out)
 			mask |= POLLIN;
+		mutex_unlock(&stream->metadata_cache->lock);
 	}
 
 	return mask;
 }
 
-static
-int lttng_metadata_ring_buffer_ioctl_get_next_subbuf(struct file *filp,
-		unsigned int cmd, unsigned long arg)
-{
-	struct lttng_metadata_stream *stream = filp->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
-	struct channel *chan = buf->backend.chan;
-	int ret;
-
-	ret = lttng_metadata_output_channel(stream, chan);
-	if (ret > 0) {
-		lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE);
-		ret = 0;
-	}
-	return ret;
-}
-
 static
 void lttng_metadata_ring_buffer_ioctl_put_next_subbuf(struct file *filp,
 		unsigned int cmd, unsigned long arg)
@@ -585,9 +571,15 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 	switch (cmd) {
 	case RING_BUFFER_GET_NEXT_SUBBUF:
 	{
-		ret = lttng_metadata_ring_buffer_ioctl_get_next_subbuf(filp,
-				cmd, arg);
-		if (ret < 0)
+		struct lttng_metadata_stream *stream = filp->private_data;
+		struct lib_ring_buffer *buf = stream->priv;
+		struct channel *chan = buf->backend.chan;
+
+		ret = lttng_metadata_output_channel(stream, chan);
+		if (ret > 0) {
+			lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE);
+			ret = 0;
+		} else if (ret < 0)
 			goto err;
 		break;
 	}
@@ -598,6 +590,21 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 		 */
 		return -ENOSYS;
 	}
+	case RING_BUFFER_FLUSH:
+	{
+		struct lttng_metadata_stream *stream = filp->private_data;
+		struct lib_ring_buffer *buf = stream->priv;
+		struct channel *chan = buf->backend.chan;
+
+		/*
+		 * Before doing the actual ring buffer flush, write up to one
+		 * packet of metadata in the ring buffer.
+		 */
+		ret = lttng_metadata_output_channel(stream, chan);
+		if (ret < 0)
+			goto err;
+		break;
+	}
 	default:
 		break;
 	}
@@ -634,9 +641,15 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 	switch (cmd) {
 	case RING_BUFFER_GET_NEXT_SUBBUF:
 	{
-		ret = lttng_metadata_ring_buffer_ioctl_get_next_subbuf(filp,
-				cmd, arg);
-		if (ret < 0)
+		struct lttng_metadata_stream *stream = filp->private_data;
+		struct lib_ring_buffer *buf = stream->priv;
+		struct channel *chan = buf->backend.chan;
+
+		ret = lttng_metadata_output_channel(stream, chan);
+		if (ret > 0) {
+			lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE);
+			ret = 0;
+		} else if (ret < 0)
 			goto err;
 		break;
 	}
@@ -902,8 +915,9 @@ int lttng_abi_create_event(struct file *channel_file,
 		 * will stay invariant for the rest of the session.
 		 */
 		event = lttng_event_create(channel, event_param, NULL, NULL);
-		if (!event) {
-			ret = -EINVAL;
+		WARN_ON_ONCE(!event);
+		if (IS_ERR(event)) {
+			ret = PTR_ERR(event);
 			goto event_error;
 		}
 		event_file->private_data = event;
@@ -1184,8 +1198,8 @@ int lttng_metadata_channel_release(struct inode *inode, struct file *file)
 	struct lttng_channel *channel = file->private_data;
 
 	if (channel) {
-		lttng_metadata_channel_destroy(channel);
 		fput(channel->session->file);
+		lttng_metadata_channel_destroy(channel);
 	}
 
 	return 0;
@@ -1335,7 +1349,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
 	struct lib_ring_buffer *buf = filp->private_data;
 	struct channel *chan = buf->backend.chan;
 	const struct lib_ring_buffer_config *config = &chan->backend.config;
-	struct lttng_channel *lttng_chan = channel_get_private(chan);
+	const struct lttng_channel_ops *ops = chan->backend.priv_ops;
 	int ret;
 
 	if (atomic_read(&chan->record_disabled))
@@ -1346,9 +1360,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
 	{
 		uint64_t ts;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->timestamp_begin(config, buf, &ts);
+		ret = ops->timestamp_begin(config, buf, &ts);
 		if (ret < 0)
 			goto error;
 		return put_u64(ts, arg);
@@ -1357,9 +1369,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
 	{
 		uint64_t ts;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->timestamp_end(config, buf, &ts);
+		ret = ops->timestamp_end(config, buf, &ts);
 		if (ret < 0)
 			goto error;
 		return put_u64(ts, arg);
@@ -1368,9 +1378,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
 	{
 		uint64_t ed;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->events_discarded(config, buf, &ed);
+		ret = ops->events_discarded(config, buf, &ed);
 		if (ret < 0)
 			goto error;
 		return put_u64(ed, arg);
@@ -1379,9 +1387,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
 	{
 		uint64_t cs;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->content_size(config, buf, &cs);
+		ret = ops->content_size(config, buf, &cs);
 		if (ret < 0)
 			goto error;
 		return put_u64(cs, arg);
@@ -1390,9 +1396,7 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
 	{
 		uint64_t ps;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->packet_size(config, buf, &ps);
+		ret = ops->packet_size(config, buf, &ps);
 		if (ret < 0)
 			goto error;
 		return put_u64(ps, arg);
@@ -1401,13 +1405,20 @@ static long lttng_stream_ring_buffer_ioctl(struct file *filp,
 	{
 		uint64_t si;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->stream_id(config, buf, &si);
+		ret = ops->stream_id(config, buf, &si);
 		if (ret < 0)
 			goto error;
 		return put_u64(si, arg);
 	}
+	case LTTNG_RING_BUFFER_GET_CURRENT_TIMESTAMP:
+	{
+		uint64_t ts;
+
+		ret = ops->current_timestamp(config, buf, &ts);
+		if (ret < 0)
+			goto error;
+		return put_u64(ts, arg);
+	}
 	default:
 		return lib_ring_buffer_file_operations.unlocked_ioctl(filp,
 				cmd, arg);
@@ -1424,7 +1435,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
 	struct lib_ring_buffer *buf = filp->private_data;
 	struct channel *chan = buf->backend.chan;
 	const struct lib_ring_buffer_config *config = &chan->backend.config;
-	struct lttng_channel *lttng_chan = channel_get_private(chan);
+	const struct lttng_channel_ops *ops = chan->backend.priv_ops;
 	int ret;
 
 	if (atomic_read(&chan->record_disabled))
@@ -1435,9 +1446,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
 	{
 		uint64_t ts;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->timestamp_begin(config, buf, &ts);
+		ret = ops->timestamp_begin(config, buf, &ts);
 		if (ret < 0)
 			goto error;
 		return put_u64(ts, arg);
@@ -1446,9 +1455,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
 	{
 		uint64_t ts;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->timestamp_end(config, buf, &ts);
+		ret = ops->timestamp_end(config, buf, &ts);
 		if (ret < 0)
 			goto error;
 		return put_u64(ts, arg);
@@ -1457,9 +1464,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
 	{
 		uint64_t ed;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->events_discarded(config, buf, &ed);
+		ret = ops->events_discarded(config, buf, &ed);
 		if (ret < 0)
 			goto error;
 		return put_u64(ed, arg);
@@ -1468,9 +1473,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
 	{
 		uint64_t cs;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->content_size(config, buf, &cs);
+		ret = ops->content_size(config, buf, &cs);
 		if (ret < 0)
 			goto error;
 		return put_u64(cs, arg);
@@ -1479,9 +1482,7 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
 	{
 		uint64_t ps;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->packet_size(config, buf, &ps);
+		ret = ops->packet_size(config, buf, &ps);
 		if (ret < 0)
 			goto error;
 		return put_u64(ps, arg);
@@ -1490,13 +1491,20 @@ static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
 	{
 		uint64_t si;
 
-		if (!lttng_chan->ops)
-			goto error;
-		ret = lttng_chan->ops->stream_id(config, buf, &si);
+		ret = ops->stream_id(config, buf, &si);
 		if (ret < 0)
 			goto error;
 		return put_u64(si, arg);
 	}
+	case LTTNG_RING_BUFFER_GET_CURRENT_TIMESTAMP:
+	{
+		uint64_t ts;
+
+		ret = ops->current_timestamp(config, buf, &ts);
+		if (ret < 0)
+			goto error;
+		return put_u64(ts, arg);
+	}
 	default:
 		return lib_ring_buffer_file_operations.compat_ioctl(filp,
 				cmd, arg);
@@ -1549,7 +1557,8 @@ error:
 	return ret;
 }
 
-void __exit lttng_abi_exit(void)
+/* No __exit annotation because used by init error path too. */
+void lttng_abi_exit(void)
 {
 	if (lttng_proc_dentry)
 		remove_proc_entry("lttng", NULL);