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

- add unconst

Browse Source 
- fixes for shadowing
This commit is contained in:
christos 2019-03-04 17:21:31 +00:00
parent fddb6fbee8
commit 00b1aa6315
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
external/bsd/jemalloc/dist/src/ckh.c vendored
View File

@ -356,14 +356,14 @@ ckh_shrink(tsd_t *tsd, ckh_t *ckh) {
} }
bool bool
ckh_new(tsd_t *tsd, ckh_t *ckh, size_t minitems, ckh_hash_t *hash, ckh_new(tsd_t *tsd, ckh_t *ckh, size_t minitems, ckh_hash_t *hashp,
ckh_keycomp_t *keycomp) { ckh_keycomp_t *keycomp) {
bool ret; bool ret;
size_t mincells, usize; size_t mincells, usize;
unsigned lg_mincells; unsigned lg_mincells;
assert(minitems > 0); assert(minitems > 0);
assert(hash != NULL); assert(hashp != NULL);
assert(keycomp != NULL); assert(keycomp != NULL);
#ifdef CKH_COUNT #ifdef CKH_COUNT
@ -392,7 +392,7 @@ ckh_new(tsd_t *tsd, ckh_t *ckh, size_t minitems, ckh_hash_t *hash,
} }
ckh->lg_minbuckets = lg_mincells - LG_CKH_BUCKET_CELLS; ckh->lg_minbuckets = lg_mincells - LG_CKH_BUCKET_CELLS;
ckh->lg_curbuckets = lg_mincells - LG_CKH_BUCKET_CELLS; ckh->lg_curbuckets = lg_mincells - LG_CKH_BUCKET_CELLS;
ckh->hash = hash; ckh->hash = hashp;
ckh->keycomp = keycomp; ckh->keycomp = keycomp;
usize = sz_sa2u(sizeof(ckhc_t) << lg_mincells, CACHELINE); usize = sz_sa2u(sizeof(ckhc_t) << lg_mincells, CACHELINE);
@ -449,10 +449,10 @@ ckh_iter(ckh_t *ckh, size_t *tabind, void **key, void **data) {
LG_CKH_BUCKET_CELLS)); i < ncells; i++) { LG_CKH_BUCKET_CELLS)); i < ncells; i++) {
if (ckh->tab[i].key != NULL) { if (ckh->tab[i].key != NULL) {
if (key != NULL) { if (key != NULL) {
*key = (void *)ckh->tab[i].key; *key = (void *)__UNCONST(ckh->tab[i].key);
} }
if (data != NULL) { if (data != NULL) {
*data = (void *)ckh->tab[i].data; *data = (void *)__UNCONST(ckh->tab[i].data);
} }
*tabind = i + 1; *tabind = i + 1;
return false; return false;
@ -495,10 +495,10 @@ ckh_remove(tsd_t *tsd, ckh_t *ckh, const void *searchkey, void **key,
cell = ckh_isearch(ckh, searchkey); cell = ckh_isearch(ckh, searchkey);
if (cell != SIZE_T_MAX) { if (cell != SIZE_T_MAX) {
if (key != NULL) { if (key != NULL) {
*key = (void *)ckh->tab[cell].key; *key = (void *)__UNCONST(ckh->tab[cell].key);
} }
if (data != NULL) { if (data != NULL) {
*data = (void *)ckh->tab[cell].data; *data = (void *)__UNCONST(ckh->tab[cell].data);
} }
ckh->tab[cell].key = NULL; ckh->tab[cell].key = NULL;
ckh->tab[cell].data = NULL; /* Not necessary. */ ckh->tab[cell].data = NULL; /* Not necessary. */
@ -527,10 +527,10 @@ ckh_search(ckh_t *ckh, const void *searchkey, void **key, void **data) {
cell = ckh_isearch(ckh, searchkey); cell = ckh_isearch(ckh, searchkey);
if (cell != SIZE_T_MAX) { if (cell != SIZE_T_MAX) {
if (key != NULL) { if (key != NULL) {
*key = (void *)ckh->tab[cell].key; *key = (void *)__UNCONST(ckh->tab[cell].key);
} }
if (data != NULL) { if (data != NULL) {
*data = (void *)ckh->tab[cell].data; *data = (void *)__UNCONST(ckh->tab[cell].data);
} }
return false; return false;
} }
@ -548,7 +548,7 @@ ckh_string_keycomp(const void *k1, const void *k2) {
assert(k1 != NULL); assert(k1 != NULL);
assert(k2 != NULL); assert(k2 != NULL);
return !strcmp((char *)k1, (char *)k2); return !strcmp((const char *)k1, (const char *)k2);
} }
void void

22
external/bsd/jemalloc/dist/src/ctl.c vendored
View File

@ -234,7 +234,7 @@ CTL_PROTO(stats_mutexes_reset)
#define NAME(n) {true}, n #define NAME(n) {true}, n
#define CHILD(t, c) \ #define CHILD(t, c) \
sizeof(c##_node) / sizeof(ctl_##t##_node_t), \ sizeof(c##_node) / sizeof(ctl_##t##_node_t), \
(ctl_node_t *)c##_node, \ (const ctl_node_t *)c##_node, \
NULL NULL
#define CTL(c) 0, NULL, c##_ctl #define CTL(c) 0, NULL, c##_ctl
@ -1299,14 +1299,14 @@ ctl_postfork_child(tsdn_t *tsdn) {
ret = EPERM; \ ret = EPERM; \
goto label_return; \ goto label_return; \
} \ } \
} while (0) } while (/*CONSTCOND*/0)
#define WRITEONLY() do { \ #define WRITEONLY() do { \
if (oldp != NULL || oldlenp != NULL) { \ if (oldp != NULL || oldlenp != NULL) { \
ret = EPERM; \ ret = EPERM; \
goto label_return; \ goto label_return; \
} \ } \
} while (0) } while (/*CONSTCOND*/0)
#define READ_XOR_WRITE() do { \ #define READ_XOR_WRITE() do { \
if ((oldp != NULL && oldlenp != NULL) && (newp != NULL || \ if ((oldp != NULL && oldlenp != NULL) && (newp != NULL || \
@ -1314,7 +1314,7 @@ ctl_postfork_child(tsdn_t *tsdn) {
ret = EPERM; \ ret = EPERM; \
goto label_return; \ goto label_return; \
} \ } \
} while (0) } while (/*CONSTCOND*/0)
#define READ(v, t) do { \ #define READ(v, t) do { \
if (oldp != NULL && oldlenp != NULL) { \ if (oldp != NULL && oldlenp != NULL) { \
@ -1327,7 +1327,7 @@ ctl_postfork_child(tsdn_t *tsdn) {
} \ } \
*(t *)oldp = (v); \ *(t *)oldp = (v); \
} \ } \
} while (0) } while (/*CONSTCOND*/0)
#define WRITE(v, t) do { \ #define WRITE(v, t) do { \
if (newp != NULL) { \ if (newp != NULL) { \
@ -1337,7 +1337,7 @@ ctl_postfork_child(tsdn_t *tsdn) {
} \ } \
(v) = *(t *)newp; \ (v) = *(t *)newp; \
} \ } \
} while (0) } while (/*CONSTCOND*/0)
#define MIB_UNSIGNED(v, i) do { \ #define MIB_UNSIGNED(v, i) do { \
if (mib[i] > UINT_MAX) { \ if (mib[i] > UINT_MAX) { \
@ -1345,7 +1345,7 @@ ctl_postfork_child(tsdn_t *tsdn) {
goto label_return; \ goto label_return; \
} \ } \
v = (unsigned)mib[i]; \ v = (unsigned)mib[i]; \
} while (0) } while (/*CONSTCOND*/0)
/* /*
* There's a lot of code duplication in the following macros due to limitations * There's a lot of code duplication in the following macros due to limitations
@ -2262,7 +2262,7 @@ arena_i_extent_hooks_ctl(tsd_t *tsd, const size_t *mib, size_t miblen,
goto label_return; goto label_return;
} }
old_extent_hooks = old_extent_hooks =
(extent_hooks_t *)&extent_hooks_default; (extent_hooks_t *)__UNCONST(&extent_hooks_default);
READ(old_extent_hooks, extent_hooks_t *); READ(old_extent_hooks, extent_hooks_t *);
if (newp != NULL) { if (newp != NULL) {
/* Initialize a new arena as a side effect. */ /* Initialize a new arena as a side effect. */
@ -2459,7 +2459,7 @@ arenas_create_ctl(tsd_t *tsd, const size_t *mib, size_t miblen, void *oldp,
malloc_mutex_lock(tsd_tsdn(tsd), &ctl_mtx); malloc_mutex_lock(tsd_tsdn(tsd), &ctl_mtx);
extent_hooks = (extent_hooks_t *)&extent_hooks_default; extent_hooks = (extent_hooks_t *)__UNCONST(&extent_hooks_default);
WRITE(extent_hooks, extent_hooks_t *); WRITE(extent_hooks, extent_hooks_t *);
if ((arena_ind = ctl_arena_init(tsd, extent_hooks)) == UINT_MAX) { if ((arena_ind = ctl_arena_init(tsd, extent_hooks)) == UINT_MAX) {
ret = EAGAIN; ret = EAGAIN;
@ -2806,8 +2806,8 @@ stats_mutexes_reset_ctl(tsd_t *tsd, const size_t *mib, size_t miblen,
MUTEX_PROF_RESET(arena->tcache_ql_mtx); MUTEX_PROF_RESET(arena->tcache_ql_mtx);
MUTEX_PROF_RESET(arena->base->mtx); MUTEX_PROF_RESET(arena->base->mtx);
for (szind_t i = 0; i < NBINS; i++) { for (szind_t j = 0; j < NBINS; j++) {
bin_t *bin = &arena->bins[i]; bin_t *bin = &arena->bins[j];
MUTEX_PROF_RESET(bin->lock); MUTEX_PROF_RESET(bin->lock);
} }
} }