From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 29 17:26:38 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 95FA4106566C;
	Fri, 29 Jun 2012 17:26:38 +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 815818FC14;
	Fri, 29 Jun 2012 17:26:38 +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 q5THQcpK059259;
	Fri, 29 Jun 2012 17:26:38 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5THQcdP059257;
	Fri, 29 Jun 2012 17:26:38 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201206291726.q5THQcdP059257@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Fri, 29 Jun 2012 17:26:38 +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: r237807 - projects/calloutng/sys/kern
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: Fri, 29 Jun 2012 17:26:38 -0000

Author: davide
Date: Fri Jun 29 17:26:37 2012
New Revision: 237807
URL: http://svn.freebsd.org/changeset/base/237807

Log:
  Take in account that time_t is not 64 bits long on all the architectures
  supported. Remove an unneeded check.
  
  Reported by:		bde [1], mav [2]
  Reviewed by:		mav

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

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Fri Jun 29 17:21:46 2012	(r237806)
+++ projects/calloutng/sys/kern/kern_timeout.c	Fri Jun 29 17:26:37 2012	(r237807)
@@ -144,6 +144,9 @@ struct callout_cpu cc_cpu;
         (bt)->frac = ((uint64_t)0x8000000000000000  / (freq)) << 1;     \
 }
 
+#define	TIME_T_MAX							\
+	(sizeof(time_t) == (sizeof(int64_t)) ? INT64_MAX : INT32_MAX)		
+
 static int timeout_cpu;
 void (*callout_new_inserted)(int cpu, struct bintime bt) = NULL;
 
@@ -394,8 +397,8 @@ callout_process(void)
 		first = (first + 1) & callwheelmask;
 	}
 	future = ((last + hz/4) & callwheelmask); 
-	max.sec = max.frac = INT_MAX;
-	min.sec = min.frac = INT_MAX;
+	max.sec = min.sec = TIME_T_MAX;
+	max.frac = min.frac = UINT64_MAX;
 	limit.sec = 0;
 	limit.frac = (uint64_t)1 << (64 - 2);
 	bintime_add(&limit, &now);		
@@ -432,12 +435,11 @@ callout_process(void)
 			min = (bintime_cmp(&tmp_min, &min, >)) ? tmp_min : min;
 			max = (bintime_cmp(&tmp_max, &max, >)) ? tmp_max : max;
 		}		
-		if (last == future || 
-		    (max.sec != INT_MAX && min.sec != INT_MAX))
+		if (last == future || max.sec != TIME_T_MAX) 
 			break;
 		last = (last + 1) & callwheelmask;
 	}
-	if (max.sec == INT_MAX && min.sec == INT_MAX) { 
+	if (max.sec == TIME_T_MAX) { 
 		next.sec = 0;	
 		next.frac = (uint64_t)1 << (64 - 2);	
 		bintime_add(&next, &now);