From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Apr 2020 18:08:04 +0000 (-0400)
Subject: wrapper: remove poll wrapper
X-Git-Tag: for-upstreaming-review-1~95
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=12528a82c68296e003358cca0c35d269973780cf;hp=2d70eed13e3c9a656eec50677940f8ef99eccabf;p=lttng-modules.git

wrapper: remove poll wrapper
---

diff --git a/lib/ringbuffer/ring_buffer_vfs.c b/lib/ringbuffer/ring_buffer_vfs.c
index af753b9b..5468d350 100644
--- a/lib/ringbuffer/ring_buffer_vfs.c
+++ b/lib/ringbuffer/ring_buffer_vfs.c
@@ -14,7 +14,6 @@
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
 #include <wrapper/ringbuffer/vfs.h>
-#include <wrapper/poll.h>
 #include <lttng-tracer.h>
 
 static int put_ulong(unsigned long val, unsigned long arg)
@@ -106,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);
diff --git a/lttng-abi.c b/lttng-abi.c
index 3be91fcf..724d4f42 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -34,7 +34,6 @@
 #include <wrapper/ringbuffer/vfs.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
-#include <wrapper/poll.h>
 #include <wrapper/file.h>
 #include <lttng-string-utils.h>
 #include <lttng-abi.h>
@@ -777,7 +776,6 @@ unsigned int lttng_metadata_ring_buffer_poll(struct file *filp,
 	unsigned int mask = 0;
 
 	if (filp->f_mode & FMODE_READ) {
-		poll_wait_set_exclusive(wait);
 		poll_wait(filp, &stream->read_wait, wait);
 
 		finalized = stream->finalized;
@@ -1505,7 +1503,6 @@ unsigned int lttng_channel_poll(struct file *file, poll_table *wait)
 	unsigned int mask = 0;
 
 	if (file->f_mode & FMODE_READ) {
-		poll_wait_set_exclusive(wait);
 		poll_wait(file, channel->ops->get_hp_wait_queue(channel->chan),
 			  wait);
 
diff --git a/wrapper/poll.h b/wrapper/poll.h
deleted file mode 100644
index a97bb6b8..00000000
--- a/wrapper/poll.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/poll.h
- *
- * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_POLL_H
-#define _LTTNG_WRAPPER_POLL_H
-
-#include <linux/poll.h>
-
-/*
- * Note: poll_wait_set_exclusive() is defined as no-op. Thundering herd
- * effect can be noticed with large number of consumer threads.
- */
-
-#define poll_wait_set_exclusive(poll_table)
-
-#endif /* _LTTNG_WRAPPER_POLL_H */