From owner-svn-src-projects@FreeBSD.ORG  Wed Feb 27 20:20:22 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 473D98E1;
 Wed, 27 Feb 2013 20:20:22 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 37269D21;
 Wed, 27 Feb 2013 20:20:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RKKLPC089978;
 Wed, 27 Feb 2013 20:20:21 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RKKLPD089977;
 Wed, 27 Feb 2013 20:20:21 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201302272020.r1RKKLPD089977@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 27 Feb 2013 20:20:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247418 - projects/calloutng/sys/kern
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.14
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: Wed, 27 Feb 2013 20:20:22 -0000

Author: mav
Date: Wed Feb 27 20:20:21 2013
New Revision: 247418
URL: http://svnweb.freebsd.org/changeset/base/247418

Log:
  Use INT64_MAX for unset cc_firstevent to remove extra comparison.

Modified:
  projects/calloutng/sys/kern/kern_timeout.c

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Wed Feb 27 20:16:30 2013	(r247417)
+++ projects/calloutng/sys/kern/kern_timeout.c	Wed Feb 27 20:20:21 2013	(r247418)
@@ -128,7 +128,7 @@ struct cc_exec {
 };
 
 /*
- * There is one struct callou_cpu per cpu, holding all relevant
+ * There is one struct callout_cpu per cpu, holding all relevant
  * state for the callout processing thread on the individual CPU.
  */
 struct callout_cpu {
@@ -277,6 +277,7 @@ callout_cpu_init(struct callout_cpu *cc)
 		TAILQ_INIT(&cc->cc_callwheel[i]);
 	}
 	TAILQ_INIT(&cc->cc_expireq);
+	cc->cc_firstevent = INT64_MAX;
 	for (i = 0; i < 2; i++)
 		cc_cme_cleanup(cc, i);
 	if (cc->cc_callout == NULL)
@@ -560,7 +561,7 @@ callout_cc_add(struct callout *c, struct
 	 * that has been inserted, but only if really required.
 	 */
 	sbt = c->c_time + c->c_precision;
-	if (sbt < cc->cc_firstevent || cc->cc_firstevent == 0) {
+	if (sbt < cc->cc_firstevent) {
 		cc->cc_firstevent = sbt;
 		cpu_new_callout(cpu, sbt, c->c_time);
 	}