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

Fix incorrect usage of cassert.

Browse Source
This commit is contained in:
Qi Wang 2019-11-21 14:10:03 -08:00 committed by Qi Wang
parent 45836d7fd3
commit 1decf958d1
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tcache.c
View File

@ -402,7 +402,7 @@ tsd_tcache_enabled_data_init(tsd_t *tsd) {
static bool static bool
tcache_bin_init(cache_bin_t *bin, szind_t ind, uintptr_t *stack_cur) { tcache_bin_init(cache_bin_t *bin, szind_t ind, uintptr_t *stack_cur) {
cassert(sizeof(bin->cur_ptr) == sizeof(void *)); assert(sizeof(bin->cur_ptr) == sizeof(void *));
/* /*
* The full_position points to the lowest available space. Allocations * The full_position points to the lowest available space. Allocations
* will access the slots toward higher addresses (for the benefit of * will access the slots toward higher addresses (for the benefit of

3
src/thread_event.c
View File

@ -189,8 +189,7 @@ thread_event_trigger(tsd_t *tsd, bool delay_event) {
thread_allocated_last_event_get(tsd); thread_allocated_last_event_get(tsd);
/* Make sure that accumbytes cannot overflow uint64_t. */ /* Make sure that accumbytes cannot overflow uint64_t. */
cassert(THREAD_EVENT_MAX_INTERVAL <= assert(THREAD_EVENT_MAX_INTERVAL <= UINT64_MAX - SC_LARGE_MAXCLASS + 1);
UINT64_MAX - SC_LARGE_MAXCLASS + 1);
thread_allocated_last_event_set(tsd, thread_allocated_after); thread_allocated_last_event_set(tsd, thread_allocated_after);
bool allow_event_trigger = !delay_event && tsd_nominal(tsd) && bool allow_event_trigger = !delay_event && tsd_nominal(tsd) &&

2
test/unit/cache_bin.c
View File

@ -4,7 +4,7 @@ cache_bin_t test_bin;
TEST_BEGIN(test_cache_bin) { TEST_BEGIN(test_cache_bin) {
cache_bin_t *bin = &test_bin; cache_bin_t *bin = &test_bin;
cassert(PAGE > TCACHE_NSLOTS_SMALL_MAX * sizeof(void *)); assert(PAGE > TCACHE_NSLOTS_SMALL_MAX * sizeof(void *));
/* Page aligned to make sure lowbits not overflowable. */ /* Page aligned to make sure lowbits not overflowable. */
void **stack = mallocx(PAGE, MALLOCX_TCACHE_NONE | MALLOCX_ALIGN(PAGE)); void **stack = mallocx(PAGE, MALLOCX_TCACHE_NONE | MALLOCX_ALIGN(PAGE));