From owner-svn-src-user@FreeBSD.ORG  Sat Jan 10 06:36:28 2009
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 7B9E8106564A;
	Sat, 10 Jan 2009 06:36:28 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6ACE18FC12;
	Sat, 10 Jan 2009 06:36:28 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0A6aS8R082452;
	Sat, 10 Jan 2009 06:36:28 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0A6aS2w082451;
	Sat, 10 Jan 2009 06:36:28 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200901100636.n0A6aS2w082451@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 10 Jan 2009 06:36:28 +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: r187012 - user/kmacy/HEAD_fast_net/sys/net
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: Sat, 10 Jan 2009 06:36:28 -0000

Author: kmacy
Date: Sat Jan 10 06:36:28 2009
New Revision: 187012
URL: http://svn.freebsd.org/changeset/base/187012

Log:
  fix rn_mpath_count and reduce frequency of printing

Modified:
  user/kmacy/HEAD_fast_net/sys/net/radix_mpath.c

Modified: user/kmacy/HEAD_fast_net/sys/net/radix_mpath.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/net/radix_mpath.c	Sat Jan 10 06:18:26 2009	(r187011)
+++ user/kmacy/HEAD_fast_net/sys/net/radix_mpath.c	Sat Jan 10 06:36:28 2009	(r187012)
@@ -83,10 +83,12 @@ rn_mpath_count(struct radix_node *rn)
 	uint32_t i = 0;
 	struct rtentry *rt;
 	
-	while ((rn = rn_mpath_next(rn)) != NULL) {
+	while (rn != NULL) {
+		
 		rt = (struct rtentry *)rn;
 		if ((rt->rt_flags & RTF_SHUTDOWN) == 0)
 			i += rt->rt_rmx.rmx_weight;
+		rn = rn_mpath_next(rn);
 	}
 	return (i);
 }
@@ -298,7 +300,7 @@ rtalloc_mpath_fib(struct route *ro, uint
 	/* gw selection by Modulo-N Hash (RFC2991) XXX need improvement? */
 	hash += hashjitter;
 	hash %= n;
-	if ((lookup_count % 500) == 0)
+	if ((lookup_count % 50000) == 0)
 		printf("hash=%d ", hash);
 	while (rn) {
 		rt = (struct rtentry *)rn;
@@ -306,7 +308,7 @@ rtalloc_mpath_fib(struct route *ro, uint
 			continue;
 
 		total_weight += rt->rt_rmx.rmx_weight;
-		if ((lookup_count % 500) == 0)
+		if ((lookup_count % 50000) == 0)
 			printf("rmx_weight=%ld ", rt->rt_rmx.rmx_weight);
 		
 		if (total_weight >= hash)
@@ -317,7 +319,7 @@ rtalloc_mpath_fib(struct route *ro, uint
 			break;
 		rn = rn->rn_dupedkey;
 	}
-	if ((lookup_count % 500) == 0)
+	if ((lookup_count % 50000) == 0)
 		printf("\n");
 	lookup_count++;