X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=lttng-abi.c;h=4dd9273f1eb9a0551d343dfd7706b0893f45fb2d;hb=7fd92151444abb6e64e6d8e4eb3ff4cf9828b074;hp=54988b79d0821da9ef71d02f845c2345b1ea730f;hpb=9c1f4643eb4a11d451a979d81389f0c2ff666af2;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index 54988b79..4dd9273f 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -44,18 +44,18 @@
 #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"
-#include "wrapper/ringbuffer/frontend.h"
-#include "wrapper/poll.h"
-#include "wrapper/file.h"
-#include "wrapper/kref.h"
-#include "lttng-abi.h"
-#include "lttng-abi-old.h"
-#include "lttng-events.h"
-#include "lttng-tracer.h"
-#include "lib/ringbuffer/frontend_types.h"
+#include <wrapper/vmalloc.h>	/* for wrapper_vmalloc_sync_all() */
+#include <wrapper/ringbuffer/vfs.h>
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/poll.h>
+#include <wrapper/file.h>
+#include <wrapper/kref.h>
+#include <lttng-abi.h>
+#include <lttng-abi-old.h>
+#include <lttng-events.h>
+#include <lttng-tracer.h>
+#include <lib/ringbuffer/frontend_types.h>
 
 /*
  * This is LTTng's own personal way to create a system call as an external
@@ -702,6 +702,18 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 
 		return put_u64(stream->version, arg);
 	}
+	case RING_BUFFER_SNAPSHOT:
+	{
+		/*
+		 * Force the buffer to quiescent so the ring buffer
+		 * don't attempt to perform a SWITCH_FLUSH, which would
+		 * desynchronize the client accounting of the amount of
+		 * data available in the buffer from the ring buffer
+		 * view.
+		 */
+		buf->quiescent = true;
+		break;
+	}
 	default:
 		break;
 	}
@@ -757,6 +769,39 @@ long lttng_metadata_ring_buffer_compat_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;
+	}
+	case RING_BUFFER_GET_METADATA_VERSION:
+	{
+		struct lttng_metadata_stream *stream = filp->private_data;
+
+		return put_u64(stream->version, arg);
+	}
+	case RING_BUFFER_SNAPSHOT:
+	{
+		/*
+		 * Force the buffer to quiescent so the ring buffer
+		 * don't attempt to perform a SWITCH_FLUSH, which would
+		 * desynchronize the client accounting of the amount of
+		 * data available in the buffer from the ring buffer
+		 * view.
+		 */
+		buf->quiescent = true;
+		break;
+	}
 	default:
 		break;
 	}
@@ -774,12 +819,6 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 				cmd, arg);
 		break;
 	}
-	case RING_BUFFER_GET_METADATA_VERSION:
-	{
-		struct lttng_metadata_stream *stream = filp->private_data;
-
-		return put_u64(stream->version, arg);
-	}
 	default:
 		break;
 	}
@@ -1017,6 +1056,7 @@ int lttng_abi_create_event(struct file *channel_file,
 	/* The event holds a reference on the channel */
 	if (atomic_long_add_unless(&channel_file->f_count,
 		1, INT_MAX) == INT_MAX) {
+		ret = -EOVERFLOW;
 		goto refcount_error;
 	}
 	if (event_param->instrumentation == LTTNG_KERNEL_TRACEPOINT