From owner-svn-src-head@FreeBSD.ORG  Sun Jun  8 10:18:23 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 72106A32;
 Sun,  8 Jun 2014 10:18:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5F1CB26D0;
 Sun,  8 Jun 2014 10:18:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s58AINLx084923;
 Sun, 8 Jun 2014 10:18:23 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s58AIMaO084916;
 Sun, 8 Jun 2014 10:18:22 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201406081018.s58AIMaO084916@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 8 Jun 2014 10:18:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267223 - head/sys/rpc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Jun 2014 10:18:23 -0000

Author: mav
Date: Sun Jun  8 10:18:22 2014
New Revision: 267223
URL: http://svnweb.freebsd.org/changeset/base/267223

Log:
  Remove st_idle variable, duplicating st_xprt.
  
  MFC after:	2 weeks

Modified:
  head/sys/rpc/svc.c
  head/sys/rpc/svc.h

Modified: head/sys/rpc/svc.c
==============================================================================
--- head/sys/rpc/svc.c	Sun Jun  8 09:49:42 2014	(r267222)
+++ head/sys/rpc/svc.c	Sun Jun  8 10:18:22 2014	(r267223)
@@ -340,7 +340,6 @@ xprt_assignthread(SVCXPRT *xprt)
 	st = LIST_FIRST(&pool->sp_idlethreads);
 	if (st) {
 		LIST_REMOVE(st, st_ilink);
-		st->st_idle = FALSE;
 		SVC_ACQUIRE(xprt);
 		xprt->xp_thread = st;
 		st->st_xprt = xprt;
@@ -1138,7 +1137,6 @@ svc_run_internal(SVCPOOL *pool, bool_t i
 			}
 
 			LIST_INSERT_HEAD(&pool->sp_idlethreads, st, st_ilink);
-			st->st_idle = TRUE;
 			if (ismaster || (!ismaster &&
 			    pool->sp_threadcount > pool->sp_minthreads))
 				error = cv_timedwait_sig(&st->st_cond,
@@ -1146,10 +1144,8 @@ svc_run_internal(SVCPOOL *pool, bool_t i
 			else
 				error = cv_wait_sig(&st->st_cond,
 				    &pool->sp_lock);
-			if (st->st_idle) {
+			if (st->st_xprt == NULL)
 				LIST_REMOVE(st, st_ilink);
-				st->st_idle = FALSE;
-			}
 
 			/*
 			 * Reduce worker thread count when idle.

Modified: head/sys/rpc/svc.h
==============================================================================
--- head/sys/rpc/svc.h	Sun Jun  8 09:49:42 2014	(r267222)
+++ head/sys/rpc/svc.h	Sun Jun  8 10:18:22 2014	(r267223)
@@ -295,7 +295,6 @@ typedef struct __rpc_svcthread {
 	struct __rpc_svcpool	*st_pool;
 	SVCXPRT			*st_xprt; /* transport we are processing */
 	struct svc_reqlist	st_reqs;  /* RPC requests to execute */
-	int			st_idle; /* thread is on idle list */
 	struct cv		st_cond; /* sleeping for work */
 	LIST_ENTRY(__rpc_svcthread) st_link; /* all threads list */
 	LIST_ENTRY(__rpc_svcthread) st_ilink; /* idle threads list */