svn commit: r296334 - head/contrib/jemalloc/src

[Adrian Chadd]

Hi!

Thanks for your quick fix. I'm sorry for being terse/grumpy with you.
It wasn't deserved. I'll try to be less grumpy in the future.



-adrian


On 2 March 2016 at 17:43, Jason Evans <jasone at freebsd.org> wrote:
> 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
>