The branch, master has been updated
via 88c1eb4 Add Solaris ports as a tevent backend.
from 6f41a78 messaging4: Enable POOL_USAGE
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 88c1eb4ae10a9f69d2e828b4e5543915c1d990c6
Author: Jeremy Allison <j...@samba.org>
Date: Mon Jul 22 14:23:33 2013 -0700
Add Solaris ports as a tevent backend.
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: David Disseldorp <dd...@samba.org>
Autobuild-User(master): David Disseldorp <dd...@samba.org>
Autobuild-Date(master): Sun Feb 15 23:25:07 CET 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/replace/system/select.h | 4 +
lib/replace/wscript | 5 +
lib/tevent/tevent.c | 5 +-
lib/tevent/tevent_internal.h | 3 +
lib/tevent/tevent_port.c | 779 +++++++++++++++++++++++++++++++++++++++++++
lib/tevent/wscript | 3 +
6 files changed, 798 insertions(+), 1 deletion(-)
create mode 100644 lib/tevent/tevent_port.c
Changeset truncated at 500 lines:
diff --git a/lib/replace/system/select.h b/lib/replace/system/select.h
index 11c5390..9e945c3 100644
--- a/lib/replace/system/select.h
+++ b/lib/replace/system/select.h
@@ -34,6 +34,10 @@
#include <sys/epoll.h>
#endif
+#ifdef HAVE_SOLARIS_PORTS
+#include <port.h>
+#endif
+
#ifndef SELECT_CAST
#define SELECT_CAST
#endif
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 4d4d182..f8a0179 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -38,6 +38,7 @@ def configure(conf):
conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h')
conf.CHECK_HEADERS('shadow.h sys/acl.h')
conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h
sys/dir.h sys/epoll.h')
+ conf.CHECK_HEADERS('port.h')
conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h
sys/fs/vx/quota.h')
conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h
sys/ndir.h sys/priv.h')
conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h
sys/statvfs.h sys/termio.h')
@@ -283,6 +284,7 @@ def configure(conf):
conf.CHECK_FUNCS('timegm getifaddrs freeifaddrs mmap setgroups syscall
setsid')
conf.CHECK_FUNCS('getgrent_r getgrgid_r getgrnam_r getgrouplist
getpagesize')
conf.CHECK_FUNCS('getpwent_r getpwnam_r getpwuid_r epoll_create')
+ conf.CHECK_FUNCS('port_create')
conf.SET_TARGET_TYPE('attr', 'EMPTY')
@@ -487,6 +489,9 @@ removeea setea
if conf.CONFIG_SET('HAVE_EPOLL_CREATE') and
conf.CONFIG_SET('HAVE_SYS_EPOLL_H'):
conf.DEFINE('HAVE_EPOLL', 1)
+ if conf.CONFIG_SET('HAVE_PORT_CREATE') and conf.CONFIG_SET('HAVE_PORT_H'):
+ conf.DEFINE('HAVE_SOLARIS_PORTS', 1)
+
conf.CHECK_HEADERS('poll.h')
conf.CHECK_FUNCS('poll')
diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
index be0afd4..843cf05 100644
--- a/lib/tevent/tevent.c
+++ b/lib/tevent/tevent.c
@@ -123,9 +123,12 @@ static void tevent_backend_init(void)
tevent_select_init();
tevent_poll_init();
tevent_poll_mt_init();
-#ifdef HAVE_EPOLL
+#if defined(HAVE_EPOLL)
tevent_epoll_init();
+#elif defined(HAVE_SOLARIS_PORTS)
+ tevent_port_init();
#endif
+
tevent_standard_init();
}
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index d25dc05..10cc4a4 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -351,6 +351,9 @@ void tevent_epoll_set_panic_fallback(struct tevent_context
*ev,
bool (*panic_fallback)(struct tevent_context *ev,
bool replay));
#endif
+#ifdef HAVE_SOLARIS_PORTS
+bool tevent_port_init(void);
+#endif
void tevent_trace_point_callback(struct tevent_context *ev,
diff --git a/lib/tevent/tevent_port.c b/lib/tevent/tevent_port.c
new file mode 100644
index 0000000..93e94b2
--- /dev/null
+++ b/lib/tevent/tevent_port.c
@@ -0,0 +1,779 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Main select loop and event handling - Solaris port implementation.
+ Losely based on the Linux epoll backend.
+
+ Copyright (C) Jeremy Allison 2013
+
+ ** NOTE! The following LGPL license applies to the tevent
+ ** library. This does NOT imply that all of Samba is released
+ ** under the LGPL
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "replace.h"
+#include "system/filesys.h"
+#include "system/select.h"
+#include "tevent.h"
+#include "tevent_internal.h"
+#include "tevent_util.h"
+
+struct port_associate_vals {
+ struct port_associate_vals *prev, *next;
+ struct port_event_context *port_ev;
+ int events;
+ struct tevent_fd *fde;
+ bool associated_event;
+};
+
+struct port_event_context {
+ /* a pointer back to the generic event_context */
+ struct tevent_context *ev;
+
+ /* This is the handle from port_create */
+ int port_fd;
+
+ pid_t pid;
+
+ /* List of associations. */
+ struct port_associate_vals *po_vals;
+};
+
+#define PORT_ADDITIONAL_FD_FLAG_HAS_ASSOCIATION (1<<0)
+#define PORT_ADDITIONAL_FD_FLAG_REPORT_ERROR (1<<1)
+#define PORT_ADDITIONAL_FD_FLAG_GOT_ERROR (1<<2)
+#define PORT_ADDITIONAL_FD_FLAG_HAS_MPX (1<<3)
+
+/*
+ Map from TEVENT_FD_* to POLLIN/POLLOUT
+*/
+static int port_map_flags(uint16_t flags)
+{
+ int ret = 0;
+ if (flags & TEVENT_FD_READ) ret |= (POLLIN | POLLERR | POLLHUP);
+ if (flags & TEVENT_FD_WRITE) ret |= (POLLOUT | POLLERR | POLLHUP);
+ return ret;
+}
+
+/*
+ Free the port fd
+*/
+static int port_ctx_destructor(struct port_event_context *port_ev)
+{
+ close(port_ev->port_fd);
+ port_ev->port_fd = -1;
+ return 0;
+}
+
+/*
+ Init the port fd
+*/
+static int port_init_ctx(struct port_event_context *port_ev)
+{
+ port_ev->port_fd = port_create();
+ if (port_ev->port_fd == -1) {
+ tevent_debug(port_ev->ev, TEVENT_DEBUG_FATAL,
+ "Failed to create port handle.\n");
+ return -1;
+ }
+
+ if (!ev_set_close_on_exec(port_ev->port_fd)) {
+ tevent_debug(port_ev->ev, TEVENT_DEBUG_WARNING,
+ "Failed to set close-on-exec, file descriptor may
be leaked to children.\n");
+ }
+
+ port_ev->pid = getpid();
+ talloc_set_destructor(port_ev, port_ctx_destructor);
+
+ return 0;
+}
+
+/*
+ Functions to manage the lower level cache of associated events on the port_fd.
+*/
+
+static int port_associate_vals_destructor(struct port_associate_vals *val)
+{
+ DLIST_REMOVE(val->port_ev->po_vals, val);
+ memset(val, '\0', sizeof(struct port_associate_vals));
+ return 0;
+}
+
+/*
+ * TODO: As the port_association is per-fde, it should be possible to store it
+ * directly in fde->additional_data, alongside any multiplexed-fde. That way
the
+ * lookup on store and delete would be avoided, and associate_all_events()
could
+ * walk the ev->fd_events list.
+ */
+static bool store_port_association(struct port_event_context *port_ev,
+ struct tevent_fd *fde,
+ int events)
+{
+ struct port_associate_vals *val;
+
+ for (val = port_ev->po_vals; val; val = val->next) {
+ if (val->fde->fd == fde->fd) {
+ /* Association already attached to fd. */
+ if (val->events != events) {
+ val->events = events;
+ val->associated_event = false;
+ }
+ return true;
+ }
+ }
+
+ val = talloc_zero(port_ev, struct port_associate_vals);
+ if (val == NULL) {
+ return false;
+ }
+
+ val->port_ev = port_ev;
+ val->fde = fde;
+ val->events = events;
+ val->associated_event = false;
+
+ DLIST_ADD(port_ev->po_vals, val);
+ talloc_set_destructor(val, port_associate_vals_destructor);
+
+ return true;
+}
+
+static void delete_port_association(struct port_event_context *port_ev,
+ struct tevent_fd *fde)
+{
+ struct port_associate_vals *val;
+
+ for (val = port_ev->po_vals; val; val = val->next) {
+ if (val->fde == fde) {
+ if (val->associated_event) {
+ (void)port_dissociate(port_ev->port_fd,
+ PORT_SOURCE_FD,
+ fde->fd);
+ }
+ talloc_free(val);
+ return;
+ }
+ }
+}
+
+static int associate_all_events(struct port_event_context *port_ev)
+{
+ struct port_associate_vals *val;
+
+ for (val = port_ev->po_vals; val; val = val->next) {
+ if (val->associated_event) {
+ continue;
+ }
+ int ret = port_associate(port_ev->port_fd,
+ PORT_SOURCE_FD,
+ (uintptr_t)val->fde->fd,
+ val->events,
+ (void *)val);
+ if (ret != 0) {
+ return -1;
+ }
+ val->associated_event = true;
+ }
+ return 0;
+}
+
+static int port_update_event(struct port_event_context *port_ev, struct
tevent_fd *fde);
+
+/*
+ Reopen the port handle when our pid changes.
+ */
+static int port_check_reopen(struct port_event_context *port_ev)
+{
+ struct tevent_fd *fde;
+
+ if (port_ev->pid == getpid()) {
+ return 0;
+ }
+
+ close(port_ev->port_fd);
+ port_ev->port_fd = port_create();
+ if (port_ev->port_fd == -1) {
+ tevent_debug(port_ev->ev, TEVENT_DEBUG_FATAL,
+ "port_create() failed");
+ return -1;
+ }
+
+ if (!ev_set_close_on_exec(port_ev->port_fd)) {
+ tevent_debug(port_ev->ev, TEVENT_DEBUG_WARNING,
+ "Failed to set close-on-exec, file descriptor may
be leaked to children.\n");
+ }
+
+ port_ev->pid = getpid();
+ for (fde=port_ev->ev->fd_events;fde;fde=fde->next) {
+ fde->additional_flags &=
PORT_ADDITIONAL_FD_FLAG_HAS_ASSOCIATION;
+ if (port_update_event(port_ev, fde) != 0) {
+ return -1;
+ }
+ }
+ return 0;
+}
+
+/*
+ * Solaris ports cannot add the same file descriptor twice, once
+ * with read, once with write which is allowed by the tevent backend.
+ * Multiplex the existing fde, flag it as such so we can search for the
+ * correct fde on event triggering.
+ */
+
+static void port_setup_multiplex_fd(struct port_event_context *port_ev,
+ struct tevent_fd *add_fde,
+ struct tevent_fd *mpx_fde)
+{
+ /*
+ * Make each fde->additional_data pointers point at each other
+ * so we can look them up from each other. They are now paired.
+ */
+ mpx_fde->additional_data = add_fde;
+ add_fde->additional_data = mpx_fde;
+
+ /* Now flag both fde's as being multiplexed. */
+ mpx_fde->additional_flags |= PORT_ADDITIONAL_FD_FLAG_HAS_MPX;
+ add_fde->additional_flags |= PORT_ADDITIONAL_FD_FLAG_HAS_MPX;
+
+ /* We need to keep the GOT_ERROR flag. */
+ if (mpx_fde->additional_flags & PORT_ADDITIONAL_FD_FLAG_GOT_ERROR) {
+ add_fde->additional_flags |= PORT_ADDITIONAL_FD_FLAG_GOT_ERROR;
+ }
+}
+
+/*
+ Add the port event to the given fd_event,
+ Or modify an existing event.
+*/
+
+static int port_add_event(struct port_event_context *port_ev, struct tevent_fd
*fde)
+{
+ int flags = port_map_flags(fde->flags);
+ struct tevent_fd *mpx_fde = NULL;
+
+ fde->additional_flags &= ~PORT_ADDITIONAL_FD_FLAG_HAS_ASSOCIATION;
+ fde->additional_flags &= ~PORT_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+
+ if (fde->additional_flags & PORT_ADDITIONAL_FD_FLAG_HAS_MPX) {
+ /*
+ * This is already a multiplexed fde, we need to include both
+ * flags in the modified event.
+ */
+ mpx_fde = talloc_get_type_abort(fde->additional_data,
+ struct tevent_fd);
+
+ mpx_fde->additional_flags &=
~PORT_ADDITIONAL_FD_FLAG_HAS_ASSOCIATION;
+ mpx_fde->additional_flags &=
~PORT_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+
+ flags |= port_map_flags(mpx_fde->flags);
+ } else {
+ /*
+ * Not (yet) a multiplexed event. See if there
+ * is already an event with the same fd.
+ */
+ for (mpx_fde = port_ev->ev->fd_events; mpx_fde; mpx_fde =
mpx_fde->next) {
+ if (mpx_fde->fd != fde->fd) {
+ continue;
+ }
+ if (mpx_fde == fde) {
+ continue;
+ }
+ /* Same fd. */
+ break;
+ }
+ if (mpx_fde) {
+ if (mpx_fde->additional_flags &
PORT_ADDITIONAL_FD_FLAG_HAS_MPX) {
+ /* Logic error. Can't have more then 2
multiplexed fde's. */
+ tevent_debug(port_ev->ev, TEVENT_DEBUG_FATAL,
+ "multiplex fde for fd[%d] is already
multiplexed\n",
+ mpx_fde->fd);
+ return -1;
+ }
+ flags |= port_map_flags(mpx_fde->flags);
+ }
+ }
+
+ if (!store_port_association(port_ev,
+ fde,
+ flags)) {
+ tevent_debug(port_ev->ev, TEVENT_DEBUG_FATAL,
+ "store_port_association failed for fd[%d]\n",
+ fde->fd);
+ return -1;
+ }
+
+ /* Note we have an association now. */
+ fde->additional_flags |= PORT_ADDITIONAL_FD_FLAG_HAS_ASSOCIATION;
+ /* Only if we want to read do we tell the event handler about errors. */
+ if (fde->flags & TEVENT_FD_READ) {
+ fde->additional_flags |= PORT_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+ }
+ if (mpx_fde == NULL) {
+ return 0;
+ }
+ /* Set up the multiplex pointer. Does no harm if already multiplexed. */
+ port_setup_multiplex_fd(port_ev,
+ fde,
+ mpx_fde);
+
+ mpx_fde->additional_flags |= PORT_ADDITIONAL_FD_FLAG_HAS_ASSOCIATION;
+ /* Only if we want to read do we tell the event handler about errors. */
+ if (mpx_fde->flags & TEVENT_FD_READ) {
+ mpx_fde->additional_flags |=
PORT_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+ }
+
+ return 0;
+}
+
+/*
+ Delete the port association for the given fd_event.
+*/
+
+static void port_del_event(struct port_event_context *port_ev, struct
tevent_fd *fde)
+{
+ struct tevent_fd *mpx_fde = NULL;
+
+ fde->additional_flags &= ~PORT_ADDITIONAL_FD_FLAG_HAS_ASSOCIATION;
+ fde->additional_flags &= ~PORT_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+
+ if (fde->additional_flags & PORT_ADDITIONAL_FD_FLAG_HAS_MPX) {
+ /*
+ * This is a multiplexed fde, we need to remove
+ * both associations.
+ */
+ mpx_fde = talloc_get_type_abort(fde->additional_data,
+ struct tevent_fd);
+
+ mpx_fde->additional_flags &=
~PORT_ADDITIONAL_FD_FLAG_HAS_ASSOCIATION;
+ mpx_fde->additional_flags &=
~PORT_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+ mpx_fde->additional_data = NULL;
+
+ fde->additional_data = NULL;
+ }
+ delete_port_association(port_ev, fde);
+}
+
+/*
+ Add or remove the port event from the given fd_event
+*/
+static int port_update_event(struct port_event_context *port_ev, struct
tevent_fd *fde)
+{
+ bool got_error = (fde->additional_flags &
PORT_ADDITIONAL_FD_FLAG_GOT_ERROR);
+ bool want_read = (fde->flags & TEVENT_FD_READ);
+ bool want_write = (fde->flags & TEVENT_FD_WRITE);
+ struct tevent_fd *mpx_fde = NULL;
+
+ if (fde->additional_flags & PORT_ADDITIONAL_FD_FLAG_HAS_MPX) {
+ /*
+ * work out what the multiplexed fde wants.
+ */
+ mpx_fde = talloc_get_type_abort(fde->additional_data,
+ struct tevent_fd);
+ if (mpx_fde->flags & TEVENT_FD_READ) {
+ want_read = true;
+ }
+ if (mpx_fde->flags & TEVENT_FD_WRITE) {
+ want_write = true;
+ }
+ }
+
+ if (fde->additional_flags & PORT_ADDITIONAL_FD_FLAG_HAS_ASSOCIATION) {
+ /* There's already an association. */
+ if (want_read || (want_write && !got_error)) {
+ return port_add_event(port_ev, fde);
+ }
+ /*
+ * If we want to match the select behavior, we need to remove
the port event
+ * when the caller isn't interested in events.
+ */
+ port_del_event(port_ev, fde);
+ return 0;
+ }
+
+ /* There's no port event attached to the fde. */
+ if (want_read || (want_write && !got_error)) {
+ return port_add_event(port_ev, fde);
+ }
+ return 0;
+}
+
+/*
+ Cope with port_get returning EPOLLHP|EPOLLERR on an association.
+ Return true if there's nothing else to do, false if this event
+ needs further handling.
+*/
--
Samba Shared Repository
