From: Yannick Lamarre Date: Thu, 25 Apr 2019 22:23:29 +0000 (-0400) Subject: Change LTTNG_POLL_GETNB behaviour for poll flavor X-Git-Tag: v2.11.0-rc2~8 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=30e83b586ce4672db58401f68113c9ae45f78ef2;p=lttng-tools.git Change LTTNG_POLL_GETNB behaviour for poll flavor Modify LTTNG_POLL_GETNB to provide compatibility with the epoll flavor. Since it is only used after a lttng_poll_wait call with no modification (add, del, mod) between, this change does not modify the behaviour in its current usage while ensuring similar API behavior between compatibility layer implementations. Signed-off-by: Yannick Lamarre Signed-off-by: Jérémie Galarneau --- diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h index fde54ddb9..5eb7ff9c5 100644 --- a/src/common/compat/poll.h +++ b/src/common/compat/poll.h @@ -315,10 +315,12 @@ static inline int __lttng_poll_get_prev_fd(struct lttng_poll_event *events, /* * For the following calls, consider 'e' to be a lttng_poll_event pointer and i * being the index of the events array. + * LTTNG_POLL_GETNB is always used after lttng_poll_wait, thus we can use the + * current list for test compatibility purposes. */ #define LTTNG_POLL_GETFD(e, i) LTTNG_REF(e)->wait.events[i].fd #define LTTNG_POLL_GETEV(e, i) LTTNG_REF(e)->wait.events[i].revents -#define LTTNG_POLL_GETNB(e) LTTNG_REF(e)->wait.nb_fd +#define LTTNG_POLL_GETNB(e) LTTNG_REF(e)->current.nb_fd #define LTTNG_POLL_GETSZ(e) LTTNG_REF(e)->wait.events_size #define LTTNG_POLL_GET_PREV_FD(e, i, nb_fd) \ __lttng_poll_get_prev_fd(LTTNG_REF(e), i, nb_fd)