project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove assertions on extent_hooks being default.

Browse Source 
It's possible to customize the extent_hooks while still using part of the
default implementation.
This commit is contained in:
Qi Wang 2017-06-03 17:00:48 -07:00 committed by Qi Wang
parent 3a813946fb
commit 29c2577ee0
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/extent.c
View File

@ -1013,8 +1013,6 @@ extent_alloc_default(extent_hooks_t *extent_hooks, void *new_addr, size_t size,
tsdn_t *tsdn; tsdn_t *tsdn;
arena_t *arena; arena_t *arena;
assert(extent_hooks == &extent_hooks_default);
tsdn = tsdn_fetch(); tsdn = tsdn_fetch();
arena = arena_get(tsdn, arena_ind, false); arena = arena_get(tsdn, arena_ind, false);
/* /*
@ -1457,8 +1455,6 @@ extent_dalloc_default_impl(void *addr, size_t size) {
static bool static bool
extent_dalloc_default(extent_hooks_t *extent_hooks, void *addr, size_t size, extent_dalloc_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
bool committed, unsigned arena_ind) { bool committed, unsigned arena_ind) {
assert(extent_hooks == &extent_hooks_default);
return extent_dalloc_default_impl(addr, size); return extent_dalloc_default_impl(addr, size);
} }
@ -1551,8 +1547,6 @@ extent_destroy_default_impl(void *addr, size_t size) {
static void static void
extent_destroy_default(extent_hooks_t *extent_hooks, void *addr, size_t size, extent_destroy_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
bool committed, unsigned arena_ind) { bool committed, unsigned arena_ind) {
assert(extent_hooks == &extent_hooks_default);
extent_destroy_default_impl(addr, size); extent_destroy_default_impl(addr, size);
} }
@ -1587,8 +1581,6 @@ extent_destroy_wrapper(tsdn_t *tsdn, arena_t *arena,
static bool static bool
extent_commit_default(extent_hooks_t *extent_hooks, void *addr, size_t size, extent_commit_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
size_t offset, size_t length, unsigned arena_ind) { 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), return pages_commit((void *)((uintptr_t)addr + (uintptr_t)offset),
length); length);
} }
@ -1619,8 +1611,6 @@ extent_commit_wrapper(tsdn_t *tsdn, arena_t *arena,
static bool static bool
extent_decommit_default(extent_hooks_t *extent_hooks, void *addr, size_t size, extent_decommit_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
size_t offset, size_t length, unsigned arena_ind) { 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), return pages_decommit((void *)((uintptr_t)addr + (uintptr_t)offset),
length); length);
} }
@ -1646,7 +1636,6 @@ extent_decommit_wrapper(tsdn_t *tsdn, arena_t *arena,
static bool static bool
extent_purge_lazy_default(extent_hooks_t *extent_hooks, void *addr, size_t size, extent_purge_lazy_default(extent_hooks_t *extent_hooks, void *addr, size_t size,
size_t offset, size_t length, unsigned arena_ind) { size_t offset, size_t length, unsigned arena_ind) {
assert(extent_hooks == &extent_hooks_default);
assert(addr != NULL); assert(addr != NULL);
assert((offset & PAGE_MASK) == 0); assert((offset & PAGE_MASK) == 0);
assert(length != 0); assert(length != 0);
@ -1683,7 +1672,6 @@ extent_purge_lazy_wrapper(tsdn_t *tsdn, arena_t *arena,
static bool static bool
extent_purge_forced_default(extent_hooks_t *extent_hooks, void *addr, extent_purge_forced_default(extent_hooks_t *extent_hooks, void *addr,
size_t size, size_t offset, size_t length, unsigned arena_ind) { size_t size, size_t offset, size_t length, unsigned arena_ind) {
assert(extent_hooks == &extent_hooks_default);
assert(addr != NULL); assert(addr != NULL);
assert((offset & PAGE_MASK) == 0); assert((offset & PAGE_MASK) == 0);
assert(length != 0); assert(length != 0);
@ -1720,8 +1708,6 @@ extent_purge_forced_wrapper(tsdn_t *tsdn, arena_t *arena,
static bool static bool
extent_split_default(extent_hooks_t *extent_hooks, void *addr, size_t size, 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) { size_t size_a, size_t size_b, bool committed, unsigned arena_ind) {
assert(extent_hooks == &extent_hooks_default);
return !maps_coalesce; return !maps_coalesce;
} }
#endif #endif
@ -1825,8 +1811,6 @@ extent_merge_default_impl(void *addr_a, void *addr_b) {
static bool static bool
extent_merge_default(extent_hooks_t *extent_hooks, void *addr_a, size_t size_a, 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) { 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); return extent_merge_default_impl(addr_a, addr_b);
} }
#endif #endif