X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fpoll.h;h=5f45da2b3b04cf3330c02236ef13793a71f02d21;hp=f892c832333eb10bdfcc4cf64d66918c17d3ab02;hb=edf0e3336bd37e4d26a0d22575dccc626a96a942;hpb=f263b7fd113e51d0737554e8232b8669e142a260 diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h index f892c8323..5f45da2b3 100644 --- a/src/common/compat/poll.h +++ b/src/common/compat/poll.h @@ -174,7 +174,7 @@ extern int compat_epoll_del(struct lttng_poll_event *events, int fd); /* * Set up the poll set limits variable poll_max_size */ -extern void compat_epoll_set_max_size(void); +extern int compat_epoll_set_max_size(void); #define lttng_poll_set_max_size() \ compat_epoll_set_max_size() @@ -217,7 +217,7 @@ static inline void lttng_poll_clean(struct lttng_poll_event *events) if (events->epfd >= 0) { ret = close(events->epfd); if (ret) { - perror("close"); + PERROR("close"); } } @@ -254,7 +254,7 @@ enum { #if __linux__ LPOLLMSG = POLLMSG, LPOLLRDHUP = POLLRDHUP, -#elif (defined(__FreeBSD__) || defined(__CYGWIN__)) +#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__)) LPOLLMSG = 0, LPOLLRDHUP = 0, #else @@ -285,8 +285,7 @@ struct compat_poll_event { * execution before a poll wait is done. */ struct compat_poll_event_array current; - /* Indicate if wait.events needs to be realloc. */ - int need_realloc:1; + /* Indicate if wait.events need to be updated from current. */ int need_update:1; }; @@ -351,7 +350,7 @@ extern int compat_poll_del(struct lttng_poll_event *events, int fd); /* * Set up the poll set limits variable poll_max_size */ -extern void compat_poll_set_max_size(void); +extern int compat_poll_set_max_size(void); #define lttng_poll_set_max_size() \ compat_poll_set_max_size()