From owner-svn-src-user@FreeBSD.ORG  Mon Jul 25 06:31:31 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D77E9106566B;
	Mon, 25 Jul 2011 06:31:31 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AE7398FC16;
	Mon, 25 Jul 2011 06:31:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6P6VV8N041368;
	Mon, 25 Jul 2011 06:31:31 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6P6VV22041366;
	Mon, 25 Jul 2011 06:31:31 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201107250631.p6P6VV22041366@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 25 Jul 2011 06:31:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224304 - user/hrs/ipv6/usr.sbin/rtadvd
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jul 2011 06:31:31 -0000

Author: hrs
Date: Mon Jul 25 06:31:31 2011
New Revision: 224304
URL: http://svn.freebsd.org/changeset/base/224304

Log:
  Use poll() to wait for the control message socket instead of a spin loop.

Modified:
  user/hrs/ipv6/usr.sbin/rtadvd/control.c

Modified: user/hrs/ipv6/usr.sbin/rtadvd/control.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/control.c	Mon Jul 25 06:31:04 2011	(r224303)
+++ user/hrs/ipv6/usr.sbin/rtadvd/control.c	Mon Jul 25 06:31:31 2011	(r224304)
@@ -41,6 +41,7 @@
 #include <errno.h>
 #include <netdb.h>
 #include <unistd.h>
+#include <poll.h>
 #include <signal.h>
 #include <string.h>
 #include <stdarg.h>
@@ -53,12 +54,16 @@
 #include "pathnames.h"
 #include "control.h"
 
+#define	CMSG_RECV_TIMEOUT	30
+
 int
 cmsg_recv(int fd, char *buf)
 {
 	int n;
 	struct ctrl_msg_hdr	*cm;
 	char *msg;
+	struct pollfd pfds[1];
+	int i;
 
 	syslog(LOG_DEBUG, "<%s> enter, fd=%d", __func__, fd);
 
@@ -66,14 +71,31 @@ cmsg_recv(int fd, char *buf)
 	cm = (struct ctrl_msg_hdr *)buf;
 	msg = (char *)buf + sizeof(*cm);
 
+	pfds[0].fd = fd;
+	pfds[0].events = POLLIN;
+
 	for (;;) {
-		n = read(fd, cm, sizeof(*cm));
-		if (n < 0 && errno == EAGAIN) {
-			syslog(LOG_DEBUG,
-			    "<%s> waiting...", __func__);
+		i = poll(pfds, sizeof(pfds)/sizeof(pfds[0]),
+		    CMSG_RECV_TIMEOUT);
+
+		if (i == 0)
+			continue;
+
+		if (i < 0) {
+			syslog(LOG_ERR, "<%s> poll error: %s",
+			    __func__, strerror(errno));
 			continue;
 		}
-		break;
+
+		if (pfds[0].revents & POLLIN) {
+			n = read(fd, cm, sizeof(*cm));
+			if (n < 0 && errno == EAGAIN) {
+				syslog(LOG_DEBUG,
+				    "<%s> waiting...", __func__);
+				continue;
+			}
+			break;
+		}
 	}
 
 	if (n != sizeof(*cm)) {
@@ -109,12 +131,26 @@ cmsg_recv(int fd, char *buf)
 		    msglen);
 
 		for (;;) {
-			n = read(fd, msg, msglen);
-			if (n < 0 && errno == EAGAIN) {
-				syslog(LOG_DEBUG,
-				    "<%s> waiting...", __func__);
+			i = poll(pfds, sizeof(pfds)/sizeof(pfds[0]),
+			    CMSG_RECV_TIMEOUT);
+
+			if (i == 0)
+				continue;
+
+			if (i < 0) {
+				syslog(LOG_ERR, "<%s> poll error: %s",
+				    __func__, strerror(errno));
 				continue;
 			}
+
+			if (pfds[0].revents & POLLIN) {
+				n = read(fd, msg, msglen);
+				if (n < 0 && errno == EAGAIN) {
+					syslog(LOG_DEBUG,
+					    "<%s> waiting...", __func__);
+					continue;
+				}
+			}
 			break;
 		}
 		if (n != msglen) {