aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/platform/posix/CMakeLists.txt15
-rw-r--r--src/platform/posix/posix_pollq.h32
-rw-r--r--src/platform/posix/posix_pollq_epoll.c20
-rw-r--r--src/platform/posix/posix_pollq_epoll.h38
-rw-r--r--src/platform/posix/posix_pollq_kqueue.c19
-rw-r--r--src/platform/posix/posix_pollq_kqueue.h34
-rw-r--r--src/platform/posix/posix_pollq_poll.c55
-rw-r--r--src/platform/posix/posix_pollq_poll.h37
-rw-r--r--src/platform/posix/posix_pollq_port.c17
-rw-r--r--src/platform/posix/posix_pollq_port.h38
-rw-r--r--src/platform/posix/posix_pollq_select.c18
-rw-r--r--src/platform/posix/posix_pollq_select.h33
12 files changed, 239 insertions, 117 deletions
diff --git a/src/platform/posix/CMakeLists.txt b/src/platform/posix/CMakeLists.txt
index aeedddb9..84390c00 100644
--- a/src/platform/posix/CMakeLists.txt
+++ b/src/platform/posix/CMakeLists.txt
@@ -107,13 +107,13 @@ if (NNG_PLATFORM_POSIX)
set_property(CACHE NNG_POLLQ_POLLER PROPERTY STRINGS auto ports kqueue epoll poll select)
mark_as_advanced(NNG_POLLQ_POLLER)
if (NNG_POLLQ_POLLER STREQUAL "ports")
- nng_defines(NNG_POLLQ_PORTS)
+ set(NNG_POLLQ_PORTS ON)
elseif (NNG_POLLQ_POLLER STREQUAL "kqueue")
- nng_defines(NNG_POLLQ_KQUEUE)
+ set(NNG_POLLQ_KQUEUE ON)
elseif (NNG_POLLQ_POLLER STREQUAL "epoll")
- nng_defines(NNG_POLLQ_EPOLL)
+ set(NNG_POLLQ_EPOLL ON)
elseif (NNG_POLLQ_POLLER STREQUAL "poll")
- nng_defines(NNG_POLLQ_POLL)
+ set(NNG_POLLQ_POLL ON)
elseif (NNG_POLLQ_POLLER STREQUAL "select")
set(NNG_POLLQ_SELECT ON)
elseif (NNG_HAVE_PORT_CREATE)
@@ -125,23 +125,28 @@ if (NNG_PLATFORM_POSIX)
elseif (NNG_HAVE_POLL)
set(NNG_POLLQ_POLL ON)
elseif (NNG_HAVE_SELECT)
- set(NNG_POLLQ_SELECT TRUE)
+ set(NNG_POLLQ_SELECT ON)
endif()
if (NNG_POLLQ_PORTS)
message(STATUS "Using port events for multiplexing I/O.")
+ nng_defines(NNG_POLLQ_PORTS)
nng_sources(posix_pollq_port.c)
elseif (NNG_POLLQ_KQUEUE)
message(STATUS "Using kqueue for multiplexing I/O.")
+ nng_defines(NNG_POLLQ_KQUEUE)
nng_sources(posix_pollq_kqueue.c)
elseif (NNG_POLLQ_EPOLL)
message(DEBUG "Using epoll for multiplexing I/O.")
+ nng_defines(NNG_POLLQ_EPOLL)
nng_sources(posix_pollq_epoll.c)
elseif (NNG_POLLQ_POLL)
message(STATUS "Using poll for multiplexing I/O.")
+ nng_defines(NNG_POLLQ_POLL)
nng_sources(posix_pollq_poll.c)
elseif (NNG_POLLQ_SELECT)
message(STATUS "Using select for multiplexing I/O.")
+ nng_defines(NNG_POLLQ_SELECT)
nng_sources(posix_pollq_select.c)
else()
message(FATAL_ERROR "No suitable poller found for multiplexing I/O.")
diff --git a/src/platform/posix/posix_pollq.h b/src/platform/posix/posix_pollq.h
index 8dc92fb1..c79a3e18 100644
--- a/src/platform/posix/posix_pollq.h
+++ b/src/platform/posix/posix_pollq.h
@@ -1,5 +1,5 @@
//
-// Copyright 2019 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
// Copyright 2018 Capitar IT Group BV <info@capitar.com>
//
// This software is supplied under the terms of the MIT License, a
@@ -20,11 +20,24 @@
// one of several possible different backends.
#include "core/nng_impl.h"
-#include <poll.h>
typedef struct nni_posix_pfd nni_posix_pfd;
typedef void (*nni_posix_pfd_cb)(nni_posix_pfd *, unsigned, void *);
+#if defined(NNG_POLLQ_KQUEUE)
+#include "posix_pollq_kqueue.h"
+#elif defined(NNG_POLLQ_PORTS)
+#include "posix_pollq_port.h"
+#elif defined(NNG_POLLQ_EPOLL)
+#include "posix_pollq_epoll.h"
+#elif defined(NNG_POLLQ_POLL)
+#include "posix_pollq_epoll.h"
+#elif defined(NNG_POLLQ_SELECT)
+#include "posix_pollq_epoll.h"
+#else
+#error "No suitable poller defined"
+#endif
+
extern int nni_posix_pfd_init(nni_posix_pfd **, int);
extern void nni_posix_pfd_fini(nni_posix_pfd *);
extern int nni_posix_pfd_arm(nni_posix_pfd *, unsigned);
@@ -32,21 +45,6 @@ extern int nni_posix_pfd_fd(nni_posix_pfd *);
extern void nni_posix_pfd_close(nni_posix_pfd *);
extern void nni_posix_pfd_set_cb(nni_posix_pfd *, nni_posix_pfd_cb, void *);
-#ifdef POLLIN
-#define NNI_POLL_IN ((unsigned) POLLIN)
-#define NNI_POLL_OUT ((unsigned) POLLOUT)
-#define NNI_POLL_HUP ((unsigned) POLLHUP)
-#define NNI_POLL_ERR ((unsigned) POLLERR)
-#define NNI_POLL_INVAL ((unsigned) POLLNVAL)
-#else
-// maybe using select
-#define NNI_POLL_IN (0x0001)
-#define NNI_POLL_OUT (0x0010)
-#define NNI_POLL_HUP (0x0004)
-#define NNI_POLL_ERR (0x0008)
-#define NNI_POLL_INVAL (0x0020)
-#endif // POLLIN
-
#endif // NNG_PLATFORM_POSIX
#endif // PLATFORM_POSIX_POLLQ_H
diff --git a/src/platform/posix/posix_pollq_epoll.c b/src/platform/posix/posix_pollq_epoll.c
index a5c8d8c9..d09289e4 100644
--- a/src/platform/posix/posix_pollq_epoll.c
+++ b/src/platform/posix/posix_pollq_epoll.c
@@ -23,8 +23,6 @@
#include "core/nng_impl.h"
#include "platform/posix/posix_pollq.h"
-typedef struct nni_posix_pollq nni_posix_pollq;
-
#ifndef EFD_CLOEXEC
#define EFD_CLOEXEC 0
#endif
@@ -51,28 +49,14 @@ typedef struct nni_posix_pollq nni_posix_pollq;
// nni_posix_pollq is a work structure that manages state for the epoll-based
// pollq implementation
-struct nni_posix_pollq {
+typedef struct nni_posix_pollq {
nni_mtx mtx;
int epfd; // epoll handle
int evfd; // event fd (to wake us for other stuff)
bool close; // request for worker to exit
nni_thr thr; // worker thread
nni_list reapq;
-};
-
-struct nni_posix_pfd {
- nni_list_node node;
- nni_posix_pollq *pq;
- int fd;
- nni_posix_pfd_cb cb;
- void *arg;
- bool closed;
- bool closing;
- bool reap;
- unsigned events;
- nni_mtx mtx;
- nni_cv cv;
-};
+} nni_posix_pollq;
// single global instance for now.
static nni_posix_pollq nni_posix_global_pollq;
diff --git a/src/platform/posix/posix_pollq_epoll.h b/src/platform/posix/posix_pollq_epoll.h
new file mode 100644
index 00000000..ee60dc56
--- /dev/null
+++ b/src/platform/posix/posix_pollq_epoll.h
@@ -0,0 +1,38 @@
+//
+// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2018 Capitar IT Group BV <info@capitar.com>
+//
+// This software is supplied under the terms of the MIT License, a
+// copy of which should be located in the distribution where this
+// file was obtained (LICENSE.txt). A copy of the license may also be
+// found online at https://opensource.org/licenses/MIT.
+//
+
+#ifndef PLATFORM_POSIX_POLLQ_EPOLL_H
+#define PLATFORM_POSIX_POLLQ_EPOLL_H
+
+#include <poll.h>
+
+// nni_posix_pfd is the handle used by the poller. It's internals are private
+// to the poller.
+struct nni_posix_pfd {
+ nni_list_node node;
+ struct nni_posix_pollq *pq;
+ int fd;
+ nni_posix_pfd_cb cb;
+ void *arg;
+ bool closed;
+ bool closing;
+ bool reap;
+ unsigned events;
+ nni_mtx mtx;
+ nni_cv cv;
+};
+
+#define NNI_POLL_IN ((unsigned) POLLIN)
+#define NNI_POLL_OUT ((unsigned) POLLOUT)
+#define NNI_POLL_HUP ((unsigned) POLLHUP)
+#define NNI_POLL_ERR ((unsigned) POLLERR)
+#define NNI_POLL_INVAL ((unsigned) POLLNVAL)
+
+#endif // PLATFORM_POSIX_POLLQ_EPOLL_H
diff --git a/src/platform/posix/posix_pollq_kqueue.c b/src/platform/posix/posix_pollq_kqueue.c
index e78b89a8..e3727ed3 100644
--- a/src/platform/posix/posix_pollq_kqueue.c
+++ b/src/platform/posix/posix_pollq_kqueue.c
@@ -9,7 +9,6 @@
// found online at https://opensource.org/licenses/MIT.
//
-#include "core/defs.h"
#ifdef NNG_HAVE_KQUEUE
#include <errno.h>
@@ -24,11 +23,9 @@
#include "core/nng_impl.h"
#include "platform/posix/posix_pollq.h"
-typedef struct nni_posix_pollq nni_posix_pollq;
-
// nni_posix_pollq is a work structure that manages state for the kqueue-based
// pollq implementation
-struct nni_posix_pollq {
+typedef struct nni_posix_pollq {
nni_mtx mtx;
int wake_wfd; // write side of wake pipe
int wake_rfd; // read side of wake pipe
@@ -36,19 +33,7 @@ struct nni_posix_pollq {
int kq; // kqueue handle
nni_thr thr; // worker thread
nni_list reapq; // items to reap
-};
-
-struct nni_posix_pfd {
- nni_list_node node; // linkage into the reap list
- nni_posix_pollq *pq; // associated pollq
- int fd; // file descriptor to poll
- void *arg; // user data
- nni_posix_pfd_cb cb; // user callback on event
- bool closed;
- unsigned events;
- nni_cv cv; // signaled when poller has unregistered
- nni_mtx mtx;
-};
+} nni_posix_pollq;
#define NNI_MAX_KQUEUE_EVENTS 64
diff --git a/src/platform/posix/posix_pollq_kqueue.h b/src/platform/posix/posix_pollq_kqueue.h
new file mode 100644
index 00000000..74f8d9f8
--- /dev/null
+++ b/src/platform/posix/posix_pollq_kqueue.h
@@ -0,0 +1,34 @@
+//
+// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2018 Capitar IT Group BV <info@capitar.com>
+//
+// This software is supplied under the terms of the MIT License, a
+// copy of which should be located in the distribution where this
+// file was obtained (LICENSE.txt). A copy of the license may also be
+// found online at https://opensource.org/licenses/MIT.
+//
+
+#ifndef PLATFORM_POSIX_POLLQ_KQUEUE_H
+#define PLATFORM_POSIX_POLLQ_KQUEUE_H
+
+// nni_posix_pfd is the handle used by the poller. It's internals are private
+// to the poller.
+struct nni_posix_pfd {
+ nni_list_node node; // linkage into the reap list
+ struct nni_posix_pollq *pq; // associated pollq
+ int fd; // file descriptor to poll
+ void *arg; // user data
+ nni_posix_pfd_cb cb; // user callback on event
+ bool closed;
+ unsigned events;
+ nni_cv cv; // signaled when poller has unregistered
+ nni_mtx mtx;
+};
+
+#define NNI_POLL_IN (0x0001)
+#define NNI_POLL_OUT (0x0010)
+#define NNI_POLL_HUP (0x0004)
+#define NNI_POLL_ERR (0x0008)
+#define NNI_POLL_INVAL (0x0020)
+
+#endif // PLATFORM_POSIX_POLLQ_KQUEUE_H
diff --git a/src/platform/posix/posix_pollq_poll.c b/src/platform/posix/posix_pollq_poll.c
index 302f97ca..f5a4e153 100644
--- a/src/platform/posix/posix_pollq_poll.c
+++ b/src/platform/posix/posix_pollq_poll.c
@@ -42,9 +42,7 @@
// (Btw, pfd->fd is not guarded, because it is set at pfd creation and
// persists until the pfd is destroyed.)
-typedef struct nni_posix_pollq nni_posix_pollq;
-
-struct nni_posix_pollq {
+typedef struct nni_posix_pollq {
nni_mtx mtx;
int nfds;
int wakewfd; // write side of waker pipe
@@ -54,18 +52,7 @@ struct nni_posix_pollq {
nni_thr thr; // worker thread
nni_list pollq; // armed nodes
nni_list reapq;
-};
-
-struct nni_posix_pfd {
- nni_posix_pollq *pq;
- int fd;
- nni_list_node node;
- nni_cv cv;
- nni_mtx mtx;
- unsigned events;
- nni_posix_pfd_cb cb;
- void *arg;
-};
+} nni_posix_pollq;
static nni_posix_pollq nni_posix_global_pollq;
@@ -223,11 +210,11 @@ nni_posix_poll_thr(void *arg)
// The waker pipe is set up so that we will be woken
// when it is written (this allows us to be signaled).
- fds[0].fd = pq->wakerfd;
- fds[0].events = POLLIN;
- fds[0].revents = 0;
- pfds[0] = NULL;
- nfds = 1;
+ fds[0].fd = pq->wakerfd;
+ fds[0].events = POLLIN;
+ fds[0].revents = 0;
+ pfds[pq->wakerfd] = NULL;
+ nfds = 1;
// Also lets reap anything that was in the reaplist!
while ((pfd = nni_list_first(&pq->reapq)) != NULL) {
@@ -255,7 +242,7 @@ nni_posix_poll_thr(void *arg)
fds[nfds].fd = pfd->fd;
fds[nfds].events = events;
fds[nfds].revents = 0;
- pfds[nfds] = pfd;
+ pfds[pfd->fd] = pfd;
nfds++;
}
}
@@ -270,18 +257,28 @@ nni_posix_poll_thr(void *arg)
(void) poll(fds, nfds, -1);
// If the waker pipe was signaled, read from it.
- if (fds[0].revents & POLLIN) {
- NNI_ASSERT(fds[0].fd == pq->wakerfd);
- nni_plat_pipe_clear(pq->wakerfd);
- }
- for (int i = 1; i < nfds; i++) {
- if ((events = fds[i].revents) != 0) {
+ for (int i = 0; i < nfds; i++) {
+ int fd = fds[i].fd;
+ events = fds[i].revents;
+ pfd = pfds[fd];
+ if (events == 0) {
+ continue;
+ }
+ if (pfd == NULL || fd == pq->wakerfd) {
+ nni_plat_pipe_clear(pq->wakerfd);
+ if (events & POLLHUP) {
+ return;
+ }
+ } else {
nni_posix_pfd_cb cb;
void *arg;
- pfd = pfds[i];
-
+ if ((events & (POLLIN | POLLOUT)) != 0) {
+ // don't emit pollhup yet, we want
+ // to finish reading.
+ events &= ~POLLHUP;
+ }
nni_mtx_lock(&pfd->mtx);
cb = pfd->cb;
arg = pfd->arg;
diff --git a/src/platform/posix/posix_pollq_poll.h b/src/platform/posix/posix_pollq_poll.h
new file mode 100644
index 00000000..6ad3cc5b
--- /dev/null
+++ b/src/platform/posix/posix_pollq_poll.h
@@ -0,0 +1,37 @@
+//
+// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2018 Capitar IT Group BV <info@capitar.com>
+//
+// This software is supplied under the terms of the MIT License, a
+// copy of which should be located in the distribution where this
+// file was obtained (LICENSE.txt). A copy of the license may also be
+// found online at https://opensource.org/licenses/MIT.
+//
+
+#ifndef PLATFORM_POSIX_POLLQ_POLL_H
+#define PLATFORM_POSIX_POLLQ_POLL_H
+
+#include <poll.h>
+
+typedef struct nni_posix_pollq nni_posix_pollq;
+
+// nni_posix_pfd is the handle used by the poller. It's internals are private
+// to the poller.
+struct nni_posix_pfd {
+ nni_posix_pollq *pq;
+ int fd;
+ nni_list_node node;
+ nni_cv cv;
+ nni_mtx mtx;
+ unsigned events;
+ nni_posix_pfd_cb cb;
+ void *arg;
+};
+
+#define NNI_POLL_IN ((unsigned) POLLIN)
+#define NNI_POLL_OUT ((unsigned) POLLOUT)
+#define NNI_POLL_HUP ((unsigned) POLLHUP)
+#define NNI_POLL_ERR ((unsigned) POLLERR)
+#define NNI_POLL_INVAL ((unsigned) POLLNVAL)
+
+#endif // PLATFORM_POSIX_POLLQ_POLL_H
diff --git a/src/platform/posix/posix_pollq_port.c b/src/platform/posix/posix_pollq_port.c
index 23b4f074..86732e17 100644
--- a/src/platform/posix/posix_pollq_port.c
+++ b/src/platform/posix/posix_pollq_port.c
@@ -23,27 +23,14 @@
#include "platform/posix/posix_pollq.h"
#define NNI_MAX_PORTEV 64
-typedef struct nni_posix_pollq nni_posix_pollq;
// nni_posix_pollq is a work structure that manages state for the port-event
// based pollq implementation. We only really need to keep track of the
// single thread, and the associated port itself.
-struct nni_posix_pollq {
+typedef struct nni_posix_pollq {
int port; // port id (from port_create)
nni_thr thr; // worker thread
-};
-
-struct nni_posix_pfd {
- nni_posix_pollq *pq;
- int fd;
- nni_mtx mtx;
- nni_cv cv;
- unsigned events;
- bool closed;
- bool closing;
- nni_posix_pfd_cb cb;
- void *data;
-};
+} nni_posix_pollq;
// single global instance for now
static nni_posix_pollq nni_posix_global_pollq;
diff --git a/src/platform/posix/posix_pollq_port.h b/src/platform/posix/posix_pollq_port.h
new file mode 100644
index 00000000..cbeab694
--- /dev/null
+++ b/src/platform/posix/posix_pollq_port.h
@@ -0,0 +1,38 @@
+//
+// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2018 Capitar IT Group BV <info@capitar.com>
+//
+// This software is supplied under the terms of the MIT License, a
+// copy of which should be located in the distribution where this
+// file was obtained (LICENSE.txt). A copy of the license may also be
+// found online at https://opensource.org/licenses/MIT.
+//
+
+#ifndef PLATFORM_POSIX_POLLQ_PORT_H
+#define PLATFORM_POSIX_POLLQ_PORT_H
+
+#include <poll.h>
+
+typedef struct nni_posix_pollq nni_posix_pollq;
+
+// nni_posix_pfd is the handle used by the poller. It's internals are private
+// to the poller.
+struct nni_posix_pfd {
+ nni_posix_pollq *pq;
+ int fd;
+ nni_mtx mtx;
+ nni_cv cv;
+ unsigned events;
+ bool closed;
+ bool closing;
+ nni_posix_pfd_cb cb;
+ void *data;
+};
+
+#define NNI_POLL_IN ((unsigned) POLLIN)
+#define NNI_POLL_OUT ((unsigned) POLLOUT)
+#define NNI_POLL_HUP ((unsigned) POLLHUP)
+#define NNI_POLL_ERR ((unsigned) POLLERR)
+#define NNI_POLL_INVAL ((unsigned) POLLNVAL)
+
+#endif // PLATFORM_POSIX_POLLQ_PORT_H
diff --git a/src/platform/posix/posix_pollq_select.c b/src/platform/posix/posix_pollq_select.c
index 3213aa11..211c9328 100644
--- a/src/platform/posix/posix_pollq_select.c
+++ b/src/platform/posix/posix_pollq_select.c
@@ -8,7 +8,6 @@
// found online at https://opensource.org/licenses/MIT.
//
-#include "core/defs.h"
#include "core/nng_impl.h"
#include "platform/posix/posix_pollq.h"
@@ -32,9 +31,7 @@
// systems that are not likely to have many open files anyway.
//
-typedef struct nni_posix_pollq nni_posix_pollq;
-
-struct nni_posix_pollq {
+typedef struct nni_posix_pollq {
nni_mtx mtx;
int wakewfd; // write side of waker pipe
int wakerfd; // read side of waker pipe
@@ -43,18 +40,7 @@ struct nni_posix_pollq {
nni_thr thr; // worker thread
int maxfd;
struct nni_posix_pfd *pfds[FD_SETSIZE];
-};
-
-struct nni_posix_pfd {
- nni_posix_pollq *pq;
- int fd;
- nni_cv cv;
- nni_mtx mtx;
- unsigned events;
- nni_posix_pfd_cb cb;
- void *arg;
- bool reap;
-};
+} nni_posix_pollq;
static nni_posix_pollq nni_posix_global_pollq;
diff --git a/src/platform/posix/posix_pollq_select.h b/src/platform/posix/posix_pollq_select.h
new file mode 100644
index 00000000..3a1d48e3
--- /dev/null
+++ b/src/platform/posix/posix_pollq_select.h
@@ -0,0 +1,33 @@
+//
+// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2018 Capitar IT Group BV <info@capitar.com>
+//
+// This software is supplied under the terms of the MIT License, a
+// copy of which should be located in the distribution where this
+// file was obtained (LICENSE.txt). A copy of the license may also be
+// found online at https://opensource.org/licenses/MIT.
+//
+
+#ifndef PLATFORM_POSIX_POLLQ_SELECT_H
+#define PLATFORM_POSIX_POLLQ_SELECT_H
+
+// nni_posix_pfd is the handle used by the poller. It's internals are private
+// to the poller.
+struct nni_posix_pfd {
+ struct nni_posix_pollq *pq;
+ int fd;
+ nni_cv cv;
+ nni_mtx mtx;
+ unsigned events;
+ nni_posix_pfd_cb cb;
+ void *arg;
+ bool reap;
+};
+
+#define NNI_POLL_IN (0x0001)
+#define NNI_POLL_OUT (0x0010)
+#define NNI_POLL_HUP (0x0004)
+#define NNI_POLL_ERR (0x0008)
+#define NNI_POLL_INVAL (0x0020)
+
+#endif // PLATFORM_POSIX_POLLQ_SELECT_H
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-01-18 18:51:08 +0000