From owner-svn-src-projects@FreeBSD.ORG  Thu May 15 18:02:08 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 A2A4A756;
 Thu, 15 May 2014 18:02:08 +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 906812217;
 Thu, 15 May 2014 18:02:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4FI28F7022617;
 Thu, 15 May 2014 18:02:08 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4FI28uh022616;
 Thu, 15 May 2014 18:02:08 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201405151802.s4FI28uh022616@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 15 May 2014 18:02:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r266163 - projects/numa/sys/vm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 May 2014 18:02:08 -0000

Author: attilio
Date: Thu May 15 18:02:08 2014
New Revision: 266163
URL: http://svnweb.freebsd.org/changeset/base/266163

Log:
  Use vm_domain_select_next() when needed.
  For this we need to define the inlined function a bit earlier.

Modified:
  projects/numa/sys/vm/vm_domain.h

Modified: projects/numa/sys/vm/vm_domain.h
==============================================================================
--- projects/numa/sys/vm/vm_domain.h	Thu May 15 17:53:42 2014	(r266162)
+++ projects/numa/sys/vm/vm_domain.h	Thu May 15 18:02:08 2014	(r266163)
@@ -73,37 +73,37 @@ extern struct vm_domain_select vm_sel_ft
 extern struct vm_domain_select vm_sel_dom[MAXMEMDOM];	/* specific domain */
 
 static inline int
-vm_domain_select_first(struct vm_domain_select *sel)
+vm_domain_select_next(struct vm_domain_select *sel, int domain)
 {
-	int domain;
 
 	switch (sel->ds_policy) {
 	case FIRSTTOUCH:
-		domain = PCPU_GET(domain);
-		if (VM_DOMAIN_ISSET(domain, &sel->ds_mask))
-			break;
 		/* FALLTHROUGH */
 	case ROUNDROBIN:
-		domain = atomic_fetchadd_int(&sel->ds_cursor, 1) % vm_ndomains;
-		while (!VM_DOMAIN_ISSET(domain, &sel->ds_mask))
+		do {
 			domain = (domain + 1) % vm_ndomains;
+		} while (!VM_DOMAIN_ISSET(domain, &sel->ds_mask));
 	}
-	return (domain);
+	return domain;
 }
 
 static inline int
-vm_domain_select_next(struct vm_domain_select *sel, int domain)
+vm_domain_select_first(struct vm_domain_select *sel)
 {
+	int domain;
 
 	switch (sel->ds_policy) {
 	case FIRSTTOUCH:
+		domain = PCPU_GET(domain);
+		if (VM_DOMAIN_ISSET(domain, &sel->ds_mask))
+			break;
 		/* FALLTHROUGH */
 	case ROUNDROBIN:
-		do {
-			domain = (domain + 1) % vm_ndomains;
-		} while (!VM_DOMAIN_ISSET(domain, &sel->ds_mask));
+		domain = atomic_fetchadd_int(&sel->ds_cursor, 1) % vm_ndomains;
+		if (!VM_DOMAIN_ISSET(domain, &sel->ds_mask))
+			domain = vm_domain_select_next(sel, domain);
 	}
-	return domain;
+	return (domain);
 }
 
 #endif /* _KERNEL */