 @@ -1,14 +1,14 @@
-/*	$NetBSD: rpc_commondata.c,v 1.10 2015/11/06 23:05:09 joerg Exp $	*/
+/*	$NetBSD: rpc_commondata.c,v 1.11 2015/11/06 23:11:09 christos Exp $	*/
 /*
  * Copyright (c) 2010, Oracle America, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  *       copyright notice, this list of conditions and the following
  *       disclaimer in the documentation and/or other materials
 @@ -28,30 +28,32 @@
  *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #define SVC_LEGACY
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char *sccsid = "@(#)rpc_commondata.c	2.1 88/07/29 4.0 RPCSRC";
 #else
-__RCSID("$NetBSD: rpc_commondata.c,v 1.10 2015/11/06 23:05:09 joerg Exp $");
+__RCSID("$NetBSD: rpc_commondata.c,v 1.11 2015/11/06 23:11:09 christos Exp $");
 #endif
 #endif
 #include <rpc/rpc.h>
 /*
  * This file should only contain common data (global data) that is exported
  * by public interfaces
  */
 struct opaque_auth _null_auth;
 #undef svc_fdset
 fd_set svc_fdset;
 #undef svc_maxfd
 int svc_maxfd = -1;
 #ifndef _REENTRANT
 #undef rpc_createerr
 struct rpc_createerr rpc_createerr;
 #endif

 @@ -1,300 +1,309 @@
-/*	$NetBSD: svc_fdset.c,v 1.3 2015/11/06 23:05:09 joerg Exp $	*/
+/*	$NetBSD: svc_fdset.c,v 1.4 2015/11/06 23:11:09 christos Exp $	*/
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights resefdsed.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: svc_fdset.c,v 1.3 2015/11/06 23:05:09 joerg Exp $");
+__RCSID("$NetBSD: svc_fdset.c,v 1.4 2015/11/06 23:11:09 christos Exp $");
 #include "reentrant.h"
 #include <sys/fd_set.h>
 #include <rpc/rpc.h>
 #include <stdlib.h>
 #include <string.h>
-struct my_svc_fdset {
+#undef svc_fdset
 #undef svc_maxfd
 extern fd_set svc_fdset;
 extern int svc_maxfd;
 struct svc_fdset {
 	fd_set *fdset;
 	int	fdmax;
 	int	fdsize;
 };
 /* The single threaded, one global fd_set version */
-static fd_set *__svc_fdset;
+static struct svc_fdset __svc_fdset;
 static int svc_fdsize = 0;
 /*
  * Update the old global svc_fdset if needed for binary compatibility
  */
 #define COMPAT_UPDATE(a)				\
 	do						\
 		if ((a) == __svc_fdset)			\
 			svc_fdset = *__svc_fdset;	\
 	while (/*CONSTCOND*/0)
 static thread_key_t fdsetkey = -2;
 #ifdef FDSET_DEBUG
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <lwp.h>
 static void  __printflike(3, 0)
 svc_header(const char *func, size_t line, const char *fmt, va_list ap)
+{
 	fprintf(stderr, "%s[%d.%d]: %s, %zu: ", getprogname(), (int)getpid(),
 	    (int)_lwp_self(), func, line);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
+}
-static void __printflike(5, 6)
+static void __printflike(4, 5)
-svc_fdset_print(const char *func, size_t line, const fd_set *fds, int fdmax,
+svc_fdset_print(const char *func, size_t line, struct svc_fdset *fds,
     const char *fmt, ...)
+{
 	va_list ap;
 	const char *did = "";
 	va_start(ap, fmt);
 	svc_header(func, line, fmt, ap);
 	va_end(ap);
-	if (fdmax == 0)
+	fprintf(stderr, "%p[%d] <", fds->fdset, fds->fdmax);
-		fdmax = FD_SETSIZE;
+	for (int i = 0; i <= fds->fdmax; i++) {
 		if (!FD_ISSET(i, fds->fdset))
 	fprintf(stderr, "%p[%d] <", fds, fdmax);
 	for (int i = 0; i <= fdmax; i++) {
 		if (!FD_ISSET(i, fds))
 			continue;
 		fprintf(stderr, "%s%d", did, i);
 		did = ", ";
+	}
 	fprintf(stderr, ">\n");
+}
 static void __printflike(3, 4)
 svc_print(const char *func, size_t line, const char *fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
 	svc_header(func, line, fmt, ap);
 	va_end(ap);
 	fprintf(stderr, "\n");
+}
 #define DPRINTF_FDSET(...)	svc_fdset_print(__func__, __LINE__, __VA_ARGS__)
 #define DPRINTF(...)		svc_print(__func__, __LINE__, __VA_ARGS__)
 #define DPRINTF_FDSET(...)	svc_fdset_print(__func__, __LINE__, __VA_ARGS__)
 #else
 #define DPRINTF_FDSET(...)
 #define DPRINTF(...)
 #define DPRINTF_FDSET(...)
 #endif
 static inline void
 svc_fdset_sanitize(struct svc_fdset *fds)
+{
 	while (fds->fdmax >= 0 && !FD_ISSET(fds->fdmax, fds->fdset))
 		fds->fdmax--;
 	/* Compat update */
 	if (fds == &__svc_fdset) {
 		svc_fdset = *__svc_fdset.fdset;
 		svc_maxfd = __svc_fdset.fdmax;
+	}
+}
 static void
 svc_fdset_free(void *v)
+{
-	struct my_svc_fdset *rv = v;
+	struct svc_fdset *fds = v;
-	DPRINTF_FDSET(rv->fdset, 0, "free");
+	DPRINTF_FDSET(fds, "free");
-	free(rv->fdset);
+	free(fds->fdset);
-	free(rv);
+	free(fds);
+}
-static fd_set *
+static struct svc_fdset *
-svc_fdset_resize(int fd, fd_set **fdset, int *fdsize)
+svc_fdset_resize(int fd, struct svc_fdset *fds)
+{
-	if (*fdset && fd < *fdsize) {
+	if (fds->fdset && fd < fds->fdsize) {
-		DPRINTF_FDSET(*fdset, 0, "keeping %d < %d",
+		DPRINTF_FDSET(fds, "keeping %d < %d", fd, fds->fdsize);
-		    fd, *fdsize);
+		return fds;
 		return *fdset;
+	}
 	fd += FD_SETSIZE;
 	if (fd == 517)
 		abort();
-	char *newfdset = realloc(*fdset, __NFD_BYTES(fd));
+	char *newfdset = realloc(fds->fdset, __NFD_BYTES(fd));
 	if (newfdset == NULL)
 		return NULL;
-	memset(newfdset + __NFD_BYTES(*fdsize), 0,
+	memset(newfdset + __NFD_BYTES(fds->fdsize), 0,
-	    __NFD_BYTES(fd) - __NFD_BYTES(*fdsize));
+	    __NFD_BYTES(fd) - __NFD_BYTES(fds->fdsize));
 	*fdset = (void *)newfdset;
 	DPRINTF_FDSET(*fdset, 0, "resize %d > %d", fd, *fdsize);
 	*fdsize = fd;
-	COMPAT_UPDATE(*fdset);
+	fds->fdset = (void *)newfdset;
 	DPRINTF_FDSET(fds, "resize %d > %d", fd, fds->fdsize);
 	fds->fdsize = fd;
-	return *fdset;
+	return fds;
+}
-static struct my_svc_fdset *
+static struct svc_fdset *
 svc_fdset_alloc(int fd)
+{
-	struct my_svc_fdset *rv;
+	struct svc_fdset *fds;
 	if (fdsetkey == -1)
 		thr_keycreate(&fdsetkey, svc_fdset_free);
-	if ((rv = thr_getspecific(fdsetkey)) == NULL) {
+	if ((fds = thr_getspecific(fdsetkey)) == NULL) {
-		rv = calloc(1, sizeof(*rv));
+		fds = calloc(1, sizeof(*fds));
-		if (rv == NULL)
+		if (fds == NULL)
 			return NULL;
-		(void)thr_setspecific(fdsetkey, rv);
+		(void)thr_setspecific(fdsetkey, fds);
 		if (svc_fdsize != 0) {
 			rv->fdset = __svc_fdset;
 			DPRINTF("switching to %p", rv->fdset);
 			rv->fdmax = svc_maxfd;
 			rv->fdsize = svc_fdsize;
-			svc_fdsize = 0;
+		if (__svc_fdset.fdsize != 0) {
 			*fds = __svc_fdset;
 			DPRINTF("switching to %p", fds->fdset);
 		} else {
-			DPRINTF("first thread time %p", rv->fdset);
+			DPRINTF("first thread time %p", fds->fdset);
+		}
 	} else {
-		DPRINTF("again for %p", rv->fdset);
+		DPRINTF("again for %p", fds->fdset);
-		if (fd < rv->fdsize)
+		if (fd < fds->fdsize)
-			return rv;
+			return fds;
+	}
 	if (svc_fdset_resize(fd, &rv->fdset, &rv->fdsize) == NULL)
-		return NULL;
+	return svc_fdset_resize(fd, fds);
 	return rv;
+}
-static fd_set *
+static struct svc_fdset *
 svc_fdset_get_internal(int fd)
+{
 	struct my_svc_fdset *rv;
 	if (!__isthreaded || fdsetkey == -2)
-		return svc_fdset_resize(fd, &__svc_fdset, &svc_fdsize);
+		return svc_fdset_resize(fd, &__svc_fdset);
-	rv = svc_fdset_alloc(fd);
+	return svc_fdset_alloc(fd);
 	if (rv == NULL)
 		return NULL;
 	return rv->fdset;
+}
 /* allow each thread to have their own copy */
 void
 svc_fdset_init(int flags)
+{
 	DPRINTF("%x", flags);
 	if ((flags & SVC_FDSET_MT) && fdsetkey == -2)
 		fdsetkey = -1;
+}
 void
 svc_fdset_zero(void)
+{
 	DPRINTF("zero");
-	fd_set *fds = svc_fdset_get_internal(0);
+	struct svc_fdset *fds = svc_fdset_get_internal(0);
-	int size = svc_fdset_getsize(0);
+	memset(fds->fdset, 0, fds->fdsize);
-	memset(fds, 0, __NFD_BYTES(size));
+	fds->fdmax = 0;
 	*svc_fdset_getmax() = 0;
 	COMPAT_UPDATE(fds);
+}
 void
 svc_fdset_set(int fd)
+{
-	fd_set *fds = svc_fdset_get_internal(fd);
+	struct svc_fdset *fds = svc_fdset_get_internal(fd);
-	int *fdmax = svc_fdset_getmax();
+	FD_SET(fd, fds->fdset);
-	FD_SET(fd, fds);
+	if (fd > fds->fdmax)
-	if (fd > *fdmax)
+		fds->fdmax = fd;
-		*fdmax = fd;
+	DPRINTF_FDSET(fds, "%d", fd);
 	DPRINTF_FDSET(fds, *fdmax, "%d", fd);
-	COMPAT_UPDATE(fds);
+	svc_fdset_sanitize(fds);
+}
 int
 svc_fdset_isset(int fd)
+{
-	fd_set *fds = svc_fdset_get_internal(fd);
+	struct svc_fdset *fds = svc_fdset_get_internal(fd);
-	DPRINTF_FDSET(fds, 0, "%d", fd);
+	svc_fdset_sanitize(fds);
-	return FD_ISSET(fd, fds);
+	DPRINTF_FDSET(fds, "%d", fd);
 	return FD_ISSET(fd, fds->fdset);
+}
 void
 svc_fdset_clr(int fd)
+{
-	fd_set *fds = svc_fdset_get_internal(fd);
+	struct svc_fdset *fds = svc_fdset_get_internal(fd);
-	FD_CLR(fd, fds);
+	FD_CLR(fd, fds->fdset);
-	/* XXX: update fdmax? */
+	svc_fdset_sanitize(fds);
-	DPRINTF_FDSET(fds, 0, "%d", fd);
+	DPRINTF_FDSET(fds, "%d", fd);
 	COMPAT_UPDATE(fds);
+}
 fd_set *
 svc_fdset_copy(const fd_set *orig)
+{
-	int len, fdmax;
+	int size = svc_fdset_getsize(0);
-	fd_set *fds;
+	fd_set *copy = calloc(1, __NFD_BYTES(size));
 	if (copy == NULL)
 	len = 0;
 	fds = 0;
 	fdmax = *svc_fdset_getmax();
 	DPRINTF_FDSET(orig, 0, "[orig]");
 	fds = svc_fdset_resize(fdmax, &fds, &len);
 	if (fds == NULL)
 		return NULL;
 	if (orig)
-		memcpy(fds, orig, __NFD_BYTES(fdmax));
+		memcpy(copy, orig, __NFD_BYTES(size));
-	DPRINTF_FDSET(fds, 0, "[copy]");
+	return copy;
 	return fds;
+}
 fd_set *
 svc_fdset_get(void)
+{
-	fd_set *fds = svc_fdset_get_internal(0);
+	struct svc_fdset *fds = svc_fdset_get_internal(0);
-	DPRINTF_FDSET(fds, 0, "get");
+	svc_fdset_sanitize(fds);
 	return fds;
 	DPRINTF_FDSET(fds, "get");
 	return fds->fdset;
+}
 int *
 svc_fdset_getmax(void)
+{
-	struct my_svc_fdset *rv;
+	struct svc_fdset *fds;
-	if (!__isthreaded || fdsetkey == -2)
+	if (!__isthreaded || fdsetkey == -2) {
-		return &svc_maxfd;
+		svc_fdset_sanitize(&__svc_fdset);
 		return &__svc_fdset.fdmax;
+	}
-	rv = svc_fdset_alloc(0);
+	fds = svc_fdset_alloc(0);
-	if (rv == NULL)
+	if (fds == NULL)
 		return NULL;
-	return &rv->fdmax;
+	return &fds->fdmax;
+}
 int
 svc_fdset_getsize(int fd)
+{
-	struct my_svc_fdset *rv;
+	struct svc_fdset *fds;
 	if (!__isthreaded || fdsetkey == -2) {
-		if (svc_fdset_resize(fd, &__svc_fdset, &svc_fdsize) == NULL)
+		if (svc_fdset_resize(fd, &__svc_fdset) == NULL)
 			return -1;
 		else
-			return svc_fdsize;
+			return __svc_fdset.fdsize;
+	}
-	rv = svc_fdset_alloc(fd);
+	fds = svc_fdset_alloc(fd);
-	if (rv == NULL)
+	if (fds == NULL)
 		return -1;
-	return rv->fdsize;
+	return fds->fdsize;
+}