From e52d205799be922db0c1c63ae48a4921707183b4 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 5 May 2018 17:21:55 -0700 Subject: fixes #393 panic on illumos - epoll assertion error This replaces the epoll support with proper illumos/SunOS port events. The port event support is structured so that it actually is superior to epoll and kqueue, because it avoids a single master lock on the poller. In the future we will explore this for macOS and Linux pollers. --- src/platform/posix/posix_pollq.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/platform/posix/posix_pollq.h') diff --git a/src/platform/posix/posix_pollq.h b/src/platform/posix/posix_pollq.h index bb441c7b..2c855da1 100644 --- a/src/platform/posix/posix_pollq.h +++ b/src/platform/posix/posix_pollq.h @@ -1,6 +1,6 @@ // -// Copyright 2017 Garrett D'Amore -// Copyright 2017 Capitar IT Group BV +// Copyright 2018 Staysail Systems, Inc. +// Copyright 2018 Capitar IT Group BV // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -35,6 +35,8 @@ struct nni_posix_pollq_node { int revents; // events received void * data; // user data nni_cb cb; // user callback on event + nni_mtx mx; + nni_cv cv; }; extern nni_posix_pollq *nni_posix_pollq_get(int); @@ -46,7 +48,6 @@ extern void nni_posix_pollq_fini(nni_posix_pollq_node *); extern int nni_posix_pollq_add(nni_posix_pollq_node *); extern void nni_posix_pollq_remove(nni_posix_pollq_node *); extern void nni_posix_pollq_arm(nni_posix_pollq_node *, int); -extern void nni_posix_pollq_disarm(nni_posix_pollq_node *, int); #endif // NNG_PLATFORM_POSIX -- cgit v1.2.3-70-g09d2