Skip to content

Commit 29c2577

Browse files
committed
Remove assertions on extent_hooks being default.
It's possible to customize the extent_hooks while still using part of the default implementation.
1 parent 3a81394 commit 29c2577

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

src/extent.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,8 +1013,6 @@ extent_alloc_default(extent_hooks_t *extent_hooks, void *new_addr, size_t size,
10131013
tsdn_t *tsdn;
10141014
arena_t *arena;
10151015

1016-
assert(extent_hooks == &extent_hooks_default);
1017-
10181016
tsdn = tsdn_fetch();
10191017
arena = arena_get(tsdn, arena_ind, false);
10201018
/*
@@ -1457,8 +1455,6 @@ extent_dalloc_default_impl(void *addr, size_t size) {
14571455
static bool
14581456
extent_dalloc_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
14591457
bool committed, unsigned arena_ind) {
1460-
assert(extent_hooks == &extent_hooks_default);
1461-
14621458
return extent_dalloc_default_impl(addr, size);
14631459
}
14641460

@@ -1551,8 +1547,6 @@ extent_destroy_default_impl(void *addr, size_t size) {
15511547
static void
15521548
extent_destroy_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
15531549
bool committed, unsigned arena_ind) {
1554-
assert(extent_hooks == &extent_hooks_default);
1555-
15561550
extent_destroy_default_impl(addr, size);
15571551
}
15581552

@@ -1587,8 +1581,6 @@ extent_destroy_wrapper(tsdn_t *tsdn, arena_t *arena,
15871581
static bool
15881582
extent_commit_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
15891583
size_t offset, size_t length, unsigned arena_ind) {
1590-
assert(extent_hooks == &extent_hooks_default);
1591-
15921584
return pages_commit((void *)((uintptr_t)addr + (uintptr_t)offset),
15931585
length);
15941586
}
@@ -1619,8 +1611,6 @@ extent_commit_wrapper(tsdn_t *tsdn, arena_t *arena,
16191611
static bool
16201612
extent_decommit_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
16211613
size_t offset, size_t length, unsigned arena_ind) {
1622-
assert(extent_hooks == &extent_hooks_default);
1623-
16241614
return pages_decommit((void *)((uintptr_t)addr + (uintptr_t)offset),
16251615
length);
16261616
}
@@ -1646,7 +1636,6 @@ extent_decommit_wrapper(tsdn_t *tsdn, arena_t *arena,
16461636
static bool
16471637
extent_purge_lazy_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
16481638
size_t offset, size_t length, unsigned arena_ind) {
1649-
assert(extent_hooks == &extent_hooks_default);
16501639
assert(addr != NULL);
16511640
assert((offset & PAGE_MASK) == 0);
16521641
assert(length != 0);
@@ -1683,7 +1672,6 @@ extent_purge_lazy_wrapper(tsdn_t *tsdn, arena_t *arena,
16831672
static bool
16841673
extent_purge_forced_default(extent_hooks_t *extent_hooks, void *addr,
16851674
size_t size, size_t offset, size_t length, unsigned arena_ind) {
1686-
assert(extent_hooks == &extent_hooks_default);
16871675
assert(addr != NULL);
16881676
assert((offset & PAGE_MASK) == 0);
16891677
assert(length != 0);
@@ -1720,8 +1708,6 @@ extent_purge_forced_wrapper(tsdn_t *tsdn, arena_t *arena,
17201708
static bool
17211709
extent_split_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
17221710
size_t size_a, size_t size_b, bool committed, unsigned arena_ind) {
1723-
assert(extent_hooks == &extent_hooks_default);
1724-
17251711
return !maps_coalesce;
17261712
}
17271713
#endif
@@ -1825,8 +1811,6 @@ extent_merge_default_impl(void *addr_a, void *addr_b) {
18251811
static bool
18261812
extent_merge_default(extent_hooks_t *extent_hooks, void *addr_a, size_t size_a,
18271813
void *addr_b, size_t size_b, bool committed, unsigned arena_ind) {
1828-
assert(extent_hooks == &extent_hooks_default);
1829-
18301814
return extent_merge_default_impl(addr_a, addr_b);
18311815
}
18321816
#endif

0 commit comments

Comments
 (0)