summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQi Wang <interwq@gwu.edu>2017-06-04 00:00:48 (GMT)
committerQi Wang <interwq@gmail.com>2017-06-05 17:56:40 (GMT)
commit29c2577ee0bfa57009a5827bd44cab04b738a914 (patch)
tree686ad594340741ea5645b37963ce7b677095c575
parent3a813946fb9b0ad93279ea30834df917b261a5a5 (diff)
downloadjemalloc-29c2577ee0bfa57009a5827bd44cab04b738a914.zip
jemalloc-29c2577ee0bfa57009a5827bd44cab04b738a914.tar.gz
jemalloc-29c2577ee0bfa57009a5827bd44cab04b738a914.tar.bz2
Remove assertions on extent_hooks being default.
It's possible to customize the extent_hooks while still using part of the default implementation.
-rw-r--r--src/extent.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/extent.c b/src/extent.c
index e95858e..386a7ce 100644
--- a/src/extent.c
+++ b/src/extent.c
@@ -1013,8 +1013,6 @@ extent_alloc_default(extent_hooks_t *extent_hooks, void *new_addr, size_t size,
tsdn_t *tsdn;
arena_t *arena;
- assert(extent_hooks == &extent_hooks_default);
-
tsdn = tsdn_fetch();
arena = arena_get(tsdn, arena_ind, false);
/*
@@ -1457,8 +1455,6 @@ extent_dalloc_default_impl(void *addr, size_t size) {
static bool
extent_dalloc_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
bool committed, unsigned arena_ind) {
- assert(extent_hooks == &extent_hooks_default);
-
return extent_dalloc_default_impl(addr, size);
}
@@ -1551,8 +1547,6 @@ extent_destroy_default_impl(void *addr, size_t size) {
static void
extent_destroy_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
bool committed, unsigned arena_ind) {
- assert(extent_hooks == &extent_hooks_default);
-
extent_destroy_default_impl(addr, size);
}
@@ -1587,8 +1581,6 @@ extent_destroy_wrapper(tsdn_t *tsdn, arena_t *arena,
static bool
extent_commit_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
size_t offset, size_t length, unsigned arena_ind) {
- assert(extent_hooks == &extent_hooks_default);
-
return pages_commit((void *)((uintptr_t)addr + (uintptr_t)offset),
length);
}
@@ -1619,8 +1611,6 @@ extent_commit_wrapper(tsdn_t *tsdn, arena_t *arena,
static bool
extent_decommit_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
size_t offset, size_t length, unsigned arena_ind) {
- assert(extent_hooks == &extent_hooks_default);
-
return pages_decommit((void *)((uintptr_t)addr + (uintptr_t)offset),
length);
}
@@ -1646,7 +1636,6 @@ extent_decommit_wrapper(tsdn_t *tsdn, arena_t *arena,
static bool
extent_purge_lazy_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
size_t offset, size_t length, unsigned arena_ind) {
- assert(extent_hooks == &extent_hooks_default);
assert(addr != NULL);
assert((offset & PAGE_MASK) == 0);
assert(length != 0);
@@ -1683,7 +1672,6 @@ extent_purge_lazy_wrapper(tsdn_t *tsdn, arena_t *arena,
static bool
extent_purge_forced_default(extent_hooks_t *extent_hooks, void *addr,
size_t size, size_t offset, size_t length, unsigned arena_ind) {
- assert(extent_hooks == &extent_hooks_default);
assert(addr != NULL);
assert((offset & PAGE_MASK) == 0);
assert(length != 0);
@@ -1720,8 +1708,6 @@ extent_purge_forced_wrapper(tsdn_t *tsdn, arena_t *arena,
static bool
extent_split_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
size_t size_a, size_t size_b, bool committed, unsigned arena_ind) {
- assert(extent_hooks == &extent_hooks_default);
-
return !maps_coalesce;
}
#endif
@@ -1825,8 +1811,6 @@ extent_merge_default_impl(void *addr_a, void *addr_b) {
static bool
extent_merge_default(extent_hooks_t *extent_hooks, void *addr_a, size_t size_a,
void *addr_b, size_t size_b, bool committed, unsigned arena_ind) {
- assert(extent_hooks == &extent_hooks_default);
-
return extent_merge_default_impl(addr_a, addr_b);
}
#endif