From owner-svn-src-projects@FreeBSD.ORG  Tue Jun 26 19:07:06 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 20258106566C;
	Tue, 26 Jun 2012 19:07:06 +0000 (UTC)
	(envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E6DC48FC27;
	Tue, 26 Jun 2012 19:07:05 +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 q5QJ755F057241;
	Tue, 26 Jun 2012 19:07:05 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5QJ75XH057239;
	Tue, 26 Jun 2012 19:07:05 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201206261907.q5QJ75XH057239@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Tue, 26 Jun 2012 19:07:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237606 - projects/calloutng/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 26 Jun 2012 19:07:06 -0000

Author: davide
Date: Tue Jun 26 19:07:05 2012
New Revision: 237606
URL: http://svn.freebsd.org/changeset/base/237606

Log:
  Don't call binuptime() more than needed. Replace it with getbinuptime() as
  far as we don't need so much precision in this piece of code.
  
  Reviewed by:		mav

Modified:
  projects/calloutng/sys/netinet/tcp_timer.c

Modified: projects/calloutng/sys/netinet/tcp_timer.c
==============================================================================
--- projects/calloutng/sys/netinet/tcp_timer.c	Tue Jun 26 18:08:03 2012	(r237605)
+++ projects/calloutng/sys/netinet/tcp_timer.c	Tue Jun 26 19:07:05 2012	(r237606)
@@ -670,45 +670,43 @@ void
 tcp_timer_to_xtimer(struct tcpcb *tp, struct tcp_timer *timer, struct xtcp_timer *xtimer)
 {
 	struct bintime now;
-	struct bintime tmp;
+	struct bintime bt;
 	
 	bzero(xtimer, sizeof(struct xtcp_timer));
 	if (timer == NULL)
 		return;
-	
+	getbinuptime(&now);	
+	bt.sec = 0;
+	bt.frac = 0;
+
 	if (callout_active(&timer->tt_delack)) {
-		binuptime(&now);
-		tmp = timer->tt_delack.c_time;		
-		bintime_sub(&tmp,&now);
-		xtimer->tt_delack = bintime_to_msecs(tmp);
+		bt = timer->tt_delack.c_time;		
+		bintime_sub(&bt,&now);
+		xtimer->tt_delack = bintime_to_msecs(bt);
 	}
 	
 	if (callout_active(&timer->tt_rexmt)) {
-		binuptime(&now);
-		tmp = timer->tt_rexmt.c_time;
-		bintime_sub(&tmp,&now);
-		xtimer->tt_rexmt = bintime_to_msecs(tmp);
+		bt = timer->tt_rexmt.c_time;
+		bintime_sub(&bt,&now);
+		xtimer->tt_rexmt = bintime_to_msecs(bt);
 	}
 	
 	if (callout_active(&timer->tt_persist)) {
-		binuptime(&now);
-		tmp = timer->tt_persist.c_time;
-		bintime_sub(&tmp,&now);
-		xtimer->tt_persist = bintime_to_msecs(tmp);
+		bt = timer->tt_persist.c_time;
+		bintime_sub(&bt,&now);
+		xtimer->tt_persist = bintime_to_msecs(bt);
 	}
 	
 	if (callout_active(&timer->tt_keep)) {
-		binuptime(&now);
-		tmp = timer->tt_keep.c_time;
-		bintime_sub(&tmp,&now); 
-		xtimer->tt_keep = bintime_to_msecs(tmp);
+		bt = timer->tt_keep.c_time;
+		bintime_sub(&bt,&now); 
+		xtimer->tt_keep = bintime_to_msecs(bt);
 	}
 
 	if (callout_active(&timer->tt_2msl)) {
-		binuptime(&now);
-		tmp = timer->tt_2msl.c_time;
-		bintime_sub(&tmp,&now);
-		xtimer->tt_2msl = bintime_to_msecs(tmp);
+		bt = timer->tt_2msl.c_time;
+		bintime_sub(&bt,&now);
+		xtimer->tt_2msl = bintime_to_msecs(bt);
 	}
 
 	xtimer->t_rcvtime = ticks_to_msecs(ticks - tp->t_rcvtime);