summaryrefslogtreecommitdiffstats
path: root/contrib/jemalloc
diff options
context:
space:
mode:
authorjasone <jasone@FreeBSD.org>2016-03-03 01:43:36 +0000
committerjasone <jasone@FreeBSD.org>2016-03-03 01:43:36 +0000
commita07ada0d1f528f8501ec0c3fd48055abc678701a (patch)
tree46d093ca47607d308ce9169bff8972982d5feb8d /contrib/jemalloc
parent048dbd1d8a23a6b4380e4e06816524eea66f4fea (diff)
downloadFreeBSD-src-a07ada0d1f528f8501ec0c3fd48055abc678701a.zip
FreeBSD-src-a07ada0d1f528f8501ec0c3fd48055abc678701a.tar.gz
Restore support for decay time of -1 (no decay).
Diffstat (limited to 'contrib/jemalloc')
-rw-r--r--contrib/jemalloc/src/arena.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/jemalloc/src/arena.c b/contrib/jemalloc/src/arena.c
index e0462e4..8e4b042 100644
--- a/contrib/jemalloc/src/arena.c
+++ b/contrib/jemalloc/src/arena.c
@@ -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
OpenPOWER on IntegriCloud