X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fpoll.h;h=b019b42c09ff12f81dfc92a12c6872e318f678ea;hb=cfa9a5a2b4a96e0d6a9eeddd2622a6d7c173b7ac;hp=9e889767f8321a05ea23f97c211086cf0c6e3836;hpb=0e428499a49b2335f4859058739fa2b20f4c410f;p=lttng-tools.git

diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h
index 9e889767f..b019b42c0 100644
--- a/src/common/compat/poll.h
+++ b/src/common/compat/poll.h
@@ -158,6 +158,17 @@ static inline void lttng_poll_reset(struct lttng_poll_event *events)
 	}
 }
 
+/*
+ * Initialize an already allocated poll event data structure. For epoll(), the
+ * epfd is set to -1 to indicate that it's not usable.
+ */
+static inline void lttng_poll_init(struct lttng_poll_event *events)
+{
+	memset(events, 0, sizeof(struct lttng_poll_event));
+	/* Set fd to -1 so if clean before created, we don't close 0. */
+	events->epfd = -1;
+}
+
 /*
  * Clean the events structure of a lttng_poll_event. It's the caller
  * responsability to free the lttng_poll_event memory.
@@ -166,13 +177,18 @@ static inline void lttng_poll_clean(struct lttng_poll_event *events)
 {
 	int ret;
 
-	if (events) {
+	if (!events) {
+		return;
+	}
+
+	if (events->epfd >= 0) {
 		ret = close(events->epfd);
 		if (ret) {
 			perror("close");
 		}
-		__lttng_poll_free((void *) events->events);
 	}
+
+	__lttng_poll_free((void *) events->events);
 }
 
 #else	/* HAVE_EPOLL */
@@ -312,6 +328,14 @@ extern void compat_poll_set_max_size(void);
 static inline void lttng_poll_reset(struct lttng_poll_event *events)
 {}
 
+/*
+ * Initialize an already allocated poll event data structure.
+ */
+static inline void lttng_poll_init(struct lttng_poll_event *events)
+{
+	memset(events, 0, sizeof(struct lttng_poll_event));
+}
+
 /*
  * Clean the events structure of a lttng_poll_event. It's the caller
  * responsability to free the lttng_poll_event memory.