Skip to content

Commit 0fadf4a

Browse files
interwqinterwq
committed
Add UNUSED to avoid compiler warnings.
1 parent 2a80d6f commit 0fadf4a

File tree

9 files changed

+43
-44
lines changed

9 files changed

+43
-44
lines changed

‎include/jemalloc/internal/arena_inlines_b.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ arena_prof_tctx_get(tsdn_t *tsdn, const void *ptr, alloc_ctx_t *alloc_ctx) {
2828
}
2929

3030
JEMALLOC_ALWAYS_INLINE void
31-
arena_prof_tctx_set(tsdn_t *tsdn, const void *ptr, size_t usize,
31+
arena_prof_tctx_set(tsdn_t *tsdn, const void *ptr, UNUSED size_t usize,
3232
alloc_ctx_t *alloc_ctx, prof_tctx_t *tctx) {
3333
cassert(config_prof);
3434
assert(ptr != NULL);
@@ -47,7 +47,7 @@ arena_prof_tctx_set(tsdn_t *tsdn, const void *ptr, size_t usize,
4747
}
4848

4949
static inline void
50-
arena_prof_tctx_reset(tsdn_t *tsdn, const void *ptr, prof_tctx_t *tctx) {
50+
arena_prof_tctx_reset(tsdn_t *tsdn, const void *ptr, UNUSED prof_tctx_t *tctx) {
5151
cassert(config_prof);
5252
assert(ptr != NULL);
5353

‎include/jemalloc/internal/arena_stats.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ struct arena_stats_s {
9595
};
9696

9797
static inline bool
98-
arena_stats_init(tsdn_t *tsdn, arena_stats_t *arena_stats) {
98+
arena_stats_init(UNUSED tsdn_t *tsdn, arena_stats_t *arena_stats) {
9999
if (config_debug) {
100100
for (size_t i = 0; i < sizeof(arena_stats_t); i++) {
101101
assert(((char *)arena_stats)[i] == 0);

‎include/jemalloc/internal/extent_inlines.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ extent_addr_set(extent_t *extent, void *addr) {
190190
}
191191

192192
static inline void
193-
extent_addr_randomize(tsdn_t *tsdn, extent_t *extent, size_t alignment) {
193+
extent_addr_randomize(UNUSED tsdn_t *tsdn, extent_t *extent, size_t alignment) {
194194
assert(extent_base_get(extent) == extent_addr_get(extent));
195195

196196
if (alignment < PAGE) {

‎include/jemalloc/internal/rtree.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ rtree_leaf_elm_bits_slab_get(uintptr_t bits) {
208208
# endif
209209

210210
JEMALLOC_ALWAYS_INLINE extent_t *
211-
rtree_leaf_elm_extent_read(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
212-
bool dependent) {
211+
rtree_leaf_elm_extent_read(UNUSED tsdn_t *tsdn, UNUSED rtree_t *rtree,
212+
rtree_leaf_elm_t *elm, bool dependent) {
213213
#ifdef RTREE_LEAF_COMPACT
214214
uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent);
215215
return rtree_leaf_elm_bits_extent_get(bits);
@@ -221,8 +221,8 @@ rtree_leaf_elm_extent_read(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
221221
}
222222

223223
JEMALLOC_ALWAYS_INLINE szind_t
224-
rtree_leaf_elm_szind_read(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
225-
bool dependent) {
224+
rtree_leaf_elm_szind_read(UNUSED tsdn_t *tsdn, UNUSED rtree_t *rtree,
225+
rtree_leaf_elm_t *elm, bool dependent) {
226226
#ifdef RTREE_LEAF_COMPACT
227227
uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent);
228228
return rtree_leaf_elm_bits_szind_get(bits);
@@ -233,8 +233,8 @@ rtree_leaf_elm_szind_read(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
233233
}
234234

235235
JEMALLOC_ALWAYS_INLINE bool
236-
rtree_leaf_elm_slab_read(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
237-
bool dependent) {
236+
rtree_leaf_elm_slab_read(UNUSED tsdn_t *tsdn, UNUSED rtree_t *rtree,
237+
rtree_leaf_elm_t *elm, bool dependent) {
238238
#ifdef RTREE_LEAF_COMPACT
239239
uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent);
240240
return rtree_leaf_elm_bits_slab_get(bits);
@@ -245,8 +245,8 @@ rtree_leaf_elm_slab_read(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
245245
}
246246

247247
static inline void
248-
rtree_leaf_elm_extent_write(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
249-
extent_t *extent) {
248+
rtree_leaf_elm_extent_write(UNUSED tsdn_t *tsdn, UNUSED rtree_t *rtree,
249+
rtree_leaf_elm_t *elm, extent_t *extent) {
250250
#ifdef RTREE_LEAF_COMPACT
251251
uintptr_t old_bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, true);
252252
uintptr_t bits = ((uintptr_t)rtree_leaf_elm_bits_szind_get(old_bits) <<
@@ -259,8 +259,8 @@ rtree_leaf_elm_extent_write(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
259259
}
260260

261261
static inline void
262-
rtree_leaf_elm_szind_write(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
263-
szind_t szind) {
262+
rtree_leaf_elm_szind_write(UNUSED tsdn_t *tsdn, UNUSED rtree_t *rtree,
263+
rtree_leaf_elm_t *elm, szind_t szind) {
264264
assert(szind <= NSIZES);
265265

266266
#ifdef RTREE_LEAF_COMPACT
@@ -277,8 +277,8 @@ rtree_leaf_elm_szind_write(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
277277
}
278278

279279
static inline void
280-
rtree_leaf_elm_slab_write(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm,
281-
bool slab) {
280+
rtree_leaf_elm_slab_write(UNUSED tsdn_t *tsdn, UNUSED rtree_t *rtree,
281+
rtree_leaf_elm_t *elm, bool slab) {
282282
#ifdef RTREE_LEAF_COMPACT
283283
uintptr_t old_bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm,
284284
true);

‎include/jemalloc/internal/tcache_inlines.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ tcache_event(tsd_t *tsd, tcache_t *tcache) {
3939
}
4040

4141
JEMALLOC_ALWAYS_INLINE void *
42-
tcache_alloc_small(tsd_t *tsd, arena_t *arena, tcache_t *tcache, size_t size,
43-
szind_t binind, bool zero, bool slow_path) {
42+
tcache_alloc_small(tsd_t *tsd, arena_t *arena, tcache_t *tcache,
43+
UNUSED size_t size, szind_t binind, bool zero, bool slow_path) {
4444
void *ret;
4545
cache_bin_t *bin;
4646
bool tcache_success;

‎include/jemalloc/internal/tsd_tls.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ tsd_get_allocates(void) {
3939

4040
/* Get/set. */
4141
JEMALLOC_ALWAYS_INLINE tsd_t *
42-
tsd_get(bool init) {
42+
tsd_get(UNUSED bool init) {
4343
assert(tsd_booted);
4444
return &tsd_tls;
4545
}

‎src/arena.c‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static void arena_bin_lower_slab(tsdn_t *tsdn, arena_t *arena, extent_t *slab,
6161
/******************************************************************************/
6262

6363
void
64-
arena_basic_stats_merge(tsdn_t *tsdn, arena_t *arena, unsigned *nthreads,
64+
arena_basic_stats_merge(UNUSED tsdn_t *tsdn, arena_t *arena, unsigned *nthreads,
6565
const char **dss, ssize_t *dirty_decay_ms, ssize_t *muzzy_decay_ms,
6666
size_t *nactive, size_t *ndirty, size_t *nmuzzy) {
6767
*nthreads += arena_nthreads_get(arena, false);
@@ -221,7 +221,7 @@ arena_extents_dirty_dalloc(tsdn_t *tsdn, arena_t *arena,
221221
}
222222

223223
static void *
224-
arena_slab_reg_alloc(tsdn_t *tsdn, extent_t *slab, const bin_info_t *bin_info) {
224+
arena_slab_reg_alloc(extent_t *slab, const bin_info_t *bin_info) {
225225
void *ret;
226226
arena_slab_data_t *slab_data = extent_slab_data_get(slab);
227227
size_t regind;
@@ -261,8 +261,7 @@ arena_slab_regind(extent_t *slab, szind_t binind, const void *ptr) {
261261
}
262262

263263
static void
264-
arena_slab_reg_dalloc(tsdn_t *tsdn, extent_t *slab,
265-
arena_slab_data_t *slab_data, void *ptr) {
264+
arena_slab_reg_dalloc(extent_t *slab, arena_slab_data_t *slab_data, void *ptr) {
266265
szind_t binind = extent_szind_get(slab);
267266
const bin_info_t *bin_info = &bin_infos[binind];
268267
size_t regind = arena_slab_regind(slab, binind, ptr);
@@ -561,7 +560,7 @@ arena_decay_epoch_advance(tsdn_t *tsdn, arena_t *arena, arena_decay_t *decay,
561560
}
562561

563562
static void
564-
arena_decay_reinit(arena_decay_t *decay, extents_t *extents, ssize_t decay_ms) {
563+
arena_decay_reinit(arena_decay_t *decay, ssize_t decay_ms) {
565564
arena_decay_ms_write(decay, decay_ms);
566565
if (decay_ms > 0) {
567566
nstime_init(&decay->interval, (uint64_t)decay_ms *
@@ -578,7 +577,7 @@ arena_decay_reinit(arena_decay_t *decay, extents_t *extents, ssize_t decay_ms) {
578577
}
579578

580579
static bool
581-
arena_decay_init(arena_decay_t *decay, extents_t *extents, ssize_t decay_ms,
580+
arena_decay_init(arena_decay_t *decay, ssize_t decay_ms,
582581
arena_stats_decay_t *stats) {
583582
if (config_debug) {
584583
for (size_t i = 0; i < sizeof(arena_decay_t); i++) {
@@ -591,7 +590,7 @@ arena_decay_init(arena_decay_t *decay, extents_t *extents, ssize_t decay_ms,
591590
return true;
592591
}
593592
decay->purging = false;
594-
arena_decay_reinit(decay, extents, decay_ms);
593+
arena_decay_reinit(decay, decay_ms);
595594
/* Memory is zeroed, so there is no need to clear stats. */
596595
if (config_stats) {
597596
decay->stats = stats;
@@ -700,7 +699,7 @@ arena_decay_ms_set(tsdn_t *tsdn, arena_t *arena, arena_decay_t *decay,
700699
* infrequent, either between the {-1, 0, >0} states, or a one-time
701700
* arbitrary change during initial arena configuration.
702701
*/
703-
arena_decay_reinit(decay, extents, decay_ms);
702+
arena_decay_reinit(decay, decay_ms);
704703
arena_maybe_decay(tsdn, arena, decay, extents, false);
705704
malloc_mutex_unlock(tsdn, &decay->mtx);
706705

@@ -1210,7 +1209,7 @@ arena_bin_malloc_hard(tsdn_t *tsdn, arena_t *arena, bin_t *bin,
12101209
* bin lock in arena_bin_nonfull_slab_get().
12111210
*/
12121211
if (extent_nfree_get(bin->slabcur) > 0) {
1213-
void *ret = arena_slab_reg_alloc(tsdn, bin->slabcur,
1212+
void *ret = arena_slab_reg_alloc(bin->slabcur,
12141213
bin_info);
12151214
if (slab != NULL) {
12161215
/*
@@ -1244,7 +1243,7 @@ arena_bin_malloc_hard(tsdn_t *tsdn, arena_t *arena, bin_t *bin,
12441243

12451244
assert(extent_nfree_get(bin->slabcur) > 0);
12461245

1247-
return arena_slab_reg_alloc(tsdn, slab, bin_info);
1246+
return arena_slab_reg_alloc(slab, bin_info);
12481247
}
12491248

12501249
void
@@ -1266,8 +1265,7 @@ arena_tcache_fill_small(tsdn_t *tsdn, arena_t *arena, tcache_t *tcache,
12661265
void *ptr;
12671266
if ((slab = bin->slabcur) != NULL && extent_nfree_get(slab) >
12681267
0) {
1269-
ptr = arena_slab_reg_alloc(tsdn, slab,
1270-
&bin_infos[binind]);
1268+
ptr = arena_slab_reg_alloc(slab, &bin_infos[binind]);
12711269
} else {
12721270
ptr = arena_bin_malloc_hard(tsdn, arena, bin, binind);
12731271
}
@@ -1328,7 +1326,7 @@ arena_malloc_small(tsdn_t *tsdn, arena_t *arena, szind_t binind, bool zero) {
13281326

13291327
malloc_mutex_lock(tsdn, &bin->lock);
13301328
if ((slab = bin->slabcur) != NULL && extent_nfree_get(slab) > 0) {
1331-
ret = arena_slab_reg_alloc(tsdn, slab, &bin_infos[binind]);
1329+
ret = arena_slab_reg_alloc(slab, &bin_infos[binind]);
13321330
} else {
13331331
ret = arena_bin_malloc_hard(tsdn, arena, bin, binind);
13341332
}
@@ -1501,7 +1499,8 @@ arena_dalloc_bin_slab(tsdn_t *tsdn, arena_t *arena, extent_t *slab,
15011499
}
15021500

15031501
static void
1504-
arena_bin_lower_slab(tsdn_t *tsdn, arena_t *arena, extent_t *slab, bin_t *bin) {
1502+
arena_bin_lower_slab(UNUSED tsdn_t *tsdn, arena_t *arena, extent_t *slab,
1503+
bin_t *bin) {
15051504
assert(extent_nfree_get(slab) > 0);
15061505

15071506
/*
@@ -1538,7 +1537,7 @@ arena_dalloc_bin_locked_impl(tsdn_t *tsdn, arena_t *arena, extent_t *slab,
15381537
arena_dalloc_junk_small(ptr, bin_info);
15391538
}
15401539

1541-
arena_slab_reg_dalloc(tsdn, slab, slab_data, ptr);
1540+
arena_slab_reg_dalloc(slab, slab_data, ptr);
15421541
unsigned nfree = extent_nfree_get(slab);
15431542
if (nfree == bin_info->nregs) {
15441543
arena_dissociate_bin_slab(arena, slab, bin);
@@ -1856,11 +1855,11 @@ arena_new(tsdn_t *tsdn, unsigned ind, extent_hooks_t *extent_hooks) {
18561855
goto label_error;
18571856
}
18581857

1859-
if (arena_decay_init(&arena->decay_dirty, &arena->extents_dirty,
1858+
if (arena_decay_init(&arena->decay_dirty,
18601859
arena_dirty_decay_ms_default_get(), &arena->stats.decay_dirty)) {
18611860
goto label_error;
18621861
}
1863-
if (arena_decay_init(&arena->decay_muzzy, &arena->extents_muzzy,
1862+
if (arena_decay_init(&arena->decay_muzzy,
18641863
arena_muzzy_decay_ms_default_get(), &arena->stats.decay_muzzy)) {
18651864
goto label_error;
18661865
}

‎src/base.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ base_extent_bump_alloc_helper(extent_t *extent, size_t *gap_size, size_t size,
195195
}
196196

197197
static void
198-
base_extent_bump_alloc_post(tsdn_t *tsdn, base_t *base, extent_t *extent,
199-
size_t gap_size, void *addr, size_t size) {
198+
base_extent_bump_alloc_post(base_t *base, extent_t *extent, size_t gap_size,
199+
void *addr, size_t size) {
200200
if (extent_bsize_get(extent) > 0) {
201201
/*
202202
* Compute the index for the largest size class that does not
@@ -229,13 +229,13 @@ base_extent_bump_alloc_post(tsdn_t *tsdn, base_t *base, extent_t *extent,
229229
}
230230

231231
static void *
232-
base_extent_bump_alloc(tsdn_t *tsdn, base_t *base, extent_t *extent,
233-
size_t size, size_t alignment) {
232+
base_extent_bump_alloc(base_t *base, extent_t *extent, size_t size,
233+
size_t alignment) {
234234
void *ret;
235235
size_t gap_size;
236236

237237
ret = base_extent_bump_alloc_helper(extent, &gap_size, size, alignment);
238-
base_extent_bump_alloc_post(tsdn, base, extent, gap_size, ret, size);
238+
base_extent_bump_alloc_post(base, extent, gap_size, ret, size);
239239
return ret;
240240
}
241241

@@ -386,7 +386,7 @@ base_new(tsdn_t *tsdn, unsigned ind, extent_hooks_t *extent_hooks) {
386386
assert(base->resident <= base->mapped);
387387
assert(base->n_thp << LG_HUGEPAGE <= base->mapped);
388388
}
389-
base_extent_bump_alloc_post(tsdn, base, &block->extent, gap_size, base,
389+
base_extent_bump_alloc_post(base, &block->extent, gap_size, base,
390390
base_size);
391391

392392
return base;
@@ -443,7 +443,7 @@ base_alloc_impl(tsdn_t *tsdn, base_t *base, size_t size, size_t alignment,
443443
goto label_return;
444444
}
445445

446-
ret = base_extent_bump_alloc(tsdn, base, extent, usize, alignment);
446+
ret = base_extent_bump_alloc(base, extent, usize, alignment);
447447
if (esn != NULL) {
448448
*esn = extent_sn_get(extent);
449449
}

‎src/jemalloc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2893,7 +2893,7 @@ je_xallocx(void *ptr, size_t size, size_t extra, int flags) {
28932893

28942894
JEMALLOC_EXPORT size_t JEMALLOC_NOTHROW
28952895
JEMALLOC_ATTR(pure)
2896-
je_sallocx(const void *ptr, int flags) {
2896+
je_sallocx(const void *ptr, UNUSED int flags) {
28972897
size_t usize;
28982898
tsdn_t *tsdn;
28992899

0 commit comments

Comments
 (0)