From owner-svn-src-all@freebsd.org  Thu Mar  3 01:43:37 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3C32AC2111;
 Thu,  3 Mar 2016 01:43:37 +0000 (UTC)
 (envelope-from jasone@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 9441814E5;
 Thu,  3 Mar 2016 01:43:37 +0000 (UTC)
 (envelope-from jasone@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u231haiR038689;
 Thu, 3 Mar 2016 01:43:36 GMT (envelope-from jasone@FreeBSD.org)
Received: (from jasone@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u231ha5V038688;
 Thu, 3 Mar 2016 01:43:36 GMT (envelope-from jasone@FreeBSD.org)
Message-Id: <201603030143.u231ha5V038688@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jasone set sender to
 jasone@FreeBSD.org using -f
From: Jason Evans <jasone@FreeBSD.org>
Date: Thu, 3 Mar 2016 01:43:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296334 - head/contrib/jemalloc/src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Mar 2016 01:43:37 -0000

Author: jasone
Date: Thu Mar  3 01:43:36 2016
New Revision: 296334
URL: https://svnweb.freebsd.org/changeset/base/296334

Log:
  Restore support for decay time of -1 (no decay).

Modified:
  head/contrib/jemalloc/src/arena.c

Modified: head/contrib/jemalloc/src/arena.c
==============================================================================
--- head/contrib/jemalloc/src/arena.c	Thu Mar  3 01:41:53 2016	(r296333)
+++ head/contrib/jemalloc/src/arena.c	Thu Mar  3 01:43:36 2016	(r296334)
@@ -1352,7 +1352,11 @@ static bool
 arena_decay_time_valid(ssize_t decay_time)
 {
 
-	return (decay_time >= -1 && (uint64_t)decay_time <= NSTIME_SEC_MAX);
+	if (decay_time < -1)
+		return (false);
+	if (decay_time == -1 || (uint64_t)decay_time <= NSTIME_SEC_MAX)
+		return (true);
+	return (false);
 }
 
 ssize_t