projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: liblttng-ctl: poll compatibility symbols inadvertently exported
[lttng-tools.git]
/
src
/
common
/
compat
/
compat-poll.c
diff --git
a/src/common/compat/compat-poll.c
b/src/common/compat/compat-poll.c
index 0220b27854ab776294404c6c80e9a5608bfdeb54..79756f5731fa48dd41ac2c646333c4f1080278b3 100644
(file)
--- a/
src/common/compat/compat-poll.c
+++ b/
src/common/compat/compat-poll.c
@@
-30,7
+30,14
@@
#include "poll.h"
#include "poll.h"
-unsigned int poll_max_size;
+
+/*
+ * Maximum number of fd we can monitor.
+ *
+ * For poll(2), the max fds must not exceed RLIMIT_NOFILE given by
+ * getrlimit(2).
+ */
+static unsigned int poll_max_size;
/*
* Resize the epoll events structure of the new size.
/*
* Resize the epoll events structure of the new size.
@@
-103,6
+110,7
@@
error:
/*
* Create pollfd data structure.
*/
/*
* Create pollfd data structure.
*/
+LTTNG_HIDDEN
int compat_poll_create(struct lttng_poll_event *events, int size)
{
struct compat_poll_event_array *current, *wait;
int compat_poll_create(struct lttng_poll_event *events, int size)
{
struct compat_poll_event_array *current, *wait;
@@
-155,6
+163,7
@@
error:
/*
* Add fd to pollfd data structure with requested events.
*/
/*
* Add fd to pollfd data structure with requested events.
*/
+LTTNG_HIDDEN
int compat_poll_add(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
int compat_poll_add(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
@@
-201,6
+210,7
@@
error:
/*
* Modify an fd's events..
*/
/*
* Modify an fd's events..
*/
+LTTNG_HIDDEN
int compat_poll_mod(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
int compat_poll_mod(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
@@
-237,6
+247,7
@@
error:
/*
* Remove a fd from the pollfd structure.
*/
/*
* Remove a fd from the pollfd structure.
*/
+LTTNG_HIDDEN
int compat_poll_del(struct lttng_poll_event *events, int fd)
{
int i, count = 0, ret;
int compat_poll_del(struct lttng_poll_event *events, int fd)
{
int i, count = 0, ret;
@@
-291,7
+302,9
@@
error:
/*
* Wait on poll() with timeout. Blocking call.
*/
/*
* Wait on poll() with timeout. Blocking call.
*/
-int compat_poll_wait(struct lttng_poll_event *events, int timeout)
+LTTNG_HIDDEN
+int compat_poll_wait(struct lttng_poll_event *events, int timeout,
+ bool interruptible)
{
int ret, active_fd_count;
int idle_pfd_index = 0;
{
int ret, active_fd_count;
int idle_pfd_index = 0;
@@
-320,10
+333,11
@@
int compat_poll_wait(struct lttng_poll_event *events, int timeout)
do {
ret = poll(events->wait.events, events->wait.nb_fd, timeout);
do {
ret = poll(events->wait.events, events->wait.nb_fd, timeout);
- } while (ret == -1 && errno == EINTR);
+ } while (
!interruptible &&
ret == -1 && errno == EINTR);
if (ret < 0) {
if (ret < 0) {
- /* At this point, every error is fatal */
- PERROR("poll wait");
+ if (errno != EINTR) {
+ PERROR("poll wait");
+ }
goto error;
}
goto error;
}
@@
-350,7
+364,7
@@
int compat_poll_wait(struct lttng_poll_event *events, int timeout)
struct pollfd *idle_pfd = &events->wait.events[idle_pfd_index];
struct pollfd *current_pfd = &events->wait.events[i];
struct pollfd *idle_pfd = &events->wait.events[idle_pfd_index];
struct pollfd *current_pfd = &events->wait.events[i];
- if (ipfd->revents != 0) {
+ if (i
dle_
pfd->revents != 0) {
swap_pfd = *current_pfd;
*current_pfd = *idle_pfd;
*idle_pfd = swap_pfd;
swap_pfd = *current_pfd;
*current_pfd = *idle_pfd;
*idle_pfd = swap_pfd;
@@
-368,6
+382,7
@@
error:
/*
* Setup poll set maximum size.
*/
/*
* Setup poll set maximum size.
*/
+LTTNG_HIDDEN
int compat_poll_set_max_size(void)
{
int ret, retval = 0;
int compat_poll_set_max_size(void)
{
int ret, retval = 0;
This page took
0.041655 seconds
and
5
git commands to generate.