Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply some of FreeBSD libc/stdlib/malloc.c rev 1.162 

to fix sign-compare issues.
This commit is contained in:
lukem 2009-02-12 03:11:01 +00:00
parent d6232854b7
commit 2360d0845a
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/libc/stdlib/jemalloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: jemalloc.c,v 1.19 2008/06/23 10:46:25 ad Exp $ */
/* $NetBSD: jemalloc.c,v 1.20 2009/02/12 03:11:01 lukem Exp $ */
/*-
* Copyright (C) 2006,2007 Jason Evans <jasone@FreeBSD.org>.
@ -118,7 +118,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */
__RCSID("$NetBSD: jemalloc.c,v 1.19 2008/06/23 10:46:25 ad Exp $");
__RCSID("$NetBSD: jemalloc.c,v 1.20 2009/02/12 03:11:01 lukem Exp $");
#ifdef __FreeBSD__
#include "libc_private.h"
@ -1029,7 +1029,8 @@ base_pages_alloc(size_t minsize)
*/
incr = (intptr_t)chunksize
- (intptr_t)CHUNK_ADDR2OFFSET(brk_cur);
if (incr < minsize)
assert(incr >= 0);
if ((size_t)incr < minsize)
incr += csize;
brk_prev = sbrk(incr);
@ -1364,7 +1365,7 @@ chunk_alloc(size_t size)
*/
incr = (intptr_t)size
- (intptr_t)CHUNK_ADDR2OFFSET(brk_cur);
if (incr == size) {
if (incr == (intptr_t)size) {
ret = brk_cur;
} else {
ret = (void *)((intptr_t)brk_cur + incr);
@ -3430,14 +3431,8 @@ malloc_init_hard(void)
opt_chunk_2pow--;
break;
case 'K':
/*
* There must be fewer pages in a chunk than
* can be recorded by the pos field of
* arena_chunk_map_t, in order to make POS_FREE
* special.
*/
if (opt_chunk_2pow - pagesize_2pow
< (sizeof(uint32_t) << 3) - 1)
if (opt_chunk_2pow + 1 <
(int)(sizeof(size_t) << 3))
opt_chunk_2pow++;
break;
case 'n':