X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_vfs.c;h=896543e3c8d357f289f15df7debafebe5f3eff93;hb=refs%2Ftags%2Ffor-upstreaming-review-1;hp=b4e18aaf9a9557f56ccc6704f177dac6421e508e;hpb=492e35e1332fb484dddb9ac7dc06a54adaacc596;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_vfs.c b/lib/ringbuffer/ring_buffer_vfs.c
index b4e18aaf..896543e3 100644
--- a/lib/ringbuffer/ring_buffer_vfs.c
+++ b/lib/ringbuffer/ring_buffer_vfs.c
@@ -1,34 +1,20 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only)
+ *
  * ring_buffer_vfs.c
  *
  * Ring Buffer VFS file operations.
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/compat.h>
 
-#include <wrapper/ringbuffer/backend.h>
-#include <wrapper/ringbuffer/frontend.h>
-#include <wrapper/ringbuffer/vfs.h>
-#include <wrapper/poll.h>
-#include <lttng-tracer.h>
+#include <ringbuffer/backend.h>
+#include <ringbuffer/frontend.h>
+#include <ringbuffer/vfs.h>
+#include <lttng/lttng-tracer.h>
 
 static int put_ulong(unsigned long val, unsigned long arg)
 {
@@ -119,7 +105,6 @@ unsigned int lib_ring_buffer_poll(struct file *filp, poll_table *wait,
 	int finalized, disabled;
 
 	if (filp->f_mode & FMODE_READ) {
-		poll_wait_set_exclusive(wait);
 		poll_wait(filp, &buf->read_wait, wait);
 
 		finalized = lib_ring_buffer_is_finalized(config, buf);
@@ -273,6 +258,12 @@ long lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd,
 	case RING_BUFFER_FLUSH:
 		lib_ring_buffer_switch_remote(buf);
 		return 0;
+	case RING_BUFFER_FLUSH_EMPTY:
+		lib_ring_buffer_switch_remote_empty(buf);
+		return 0;
+	case RING_BUFFER_CLEAR:
+		lib_ring_buffer_clear(buf);
+		return 0;
 	default:
 		return -ENOIOCTLCMD;
 	}
@@ -421,6 +412,12 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 	case RING_BUFFER_COMPAT_FLUSH:
 		lib_ring_buffer_switch_remote(buf);
 		return 0;
+	case RING_BUFFER_COMPAT_FLUSH_EMPTY:
+		lib_ring_buffer_switch_remote_empty(buf);
+		return 0;
+	case RING_BUFFER_COMPAT_CLEAR:
+		lib_ring_buffer_clear(buf);
+		return 0;
 	default:
 		return -ENOIOCTLCMD;
 	}
@@ -453,8 +450,8 @@ const struct file_operations lib_ring_buffer_file_operations = {
 EXPORT_SYMBOL_GPL(lib_ring_buffer_file_operations);
 
 MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Ring Buffer Library VFS");
+MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
+MODULE_DESCRIPTION("LTTng ring buffer library");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
 	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)