mirrors/mimalloc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge from remote

Browse Source
This commit is contained in:
daan 2019-08-21 11:35:09 -07:00
commit 5c912f16d4
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mimalloc-types.h
View File

@ -105,7 +105,6 @@ terms of the MIT license. A copy of the license can be found in the file
// Maximum number of size classes. (spaced exponentially in 12.5% increments) // Maximum number of size classes. (spaced exponentially in 12.5% increments)
#define MI_BIN_HUGE (73U) #define MI_BIN_HUGE (73U)
#if (MI_MEDIUM_OBJ_WSIZE_MAX >= 655360) #if (MI_MEDIUM_OBJ_WSIZE_MAX >= 655360)
#error "define more bins" #error "define more bins"
#endif #endif

4
src/segment.c
View File

@ -140,7 +140,7 @@ static void mi_page_queue_delete(mi_page_queue_t* pq, mi_page_t* page) {
----------------------------------------------------------- */ ----------------------------------------------------------- */
#if (MI_DEBUG > 1) #if (MI_DEBUG > 1)
static bool mi_page_queue_contains(mi_page_queue_t* pq, mi_page_t* page) { static bool mi_segment_page_queue_contains(mi_page_queue_t* pq, mi_page_t* page) {
for (mi_page_t* p = pq->first; p != NULL; p = p->next) { for (mi_page_t* p = pq->first; p != NULL; p = p->next) {
if (p==page) return true; if (p==page) return true;
} }
@ -176,7 +176,7 @@ static bool mi_segment_is_valid(mi_segment_t* segment, mi_segments_tld_t* tld) {
mi_assert_internal(end->block_size == 0); mi_assert_internal(end->block_size == 0);
if (segment->kind == MI_SEGMENT_NORMAL && segment->thread_id != 0) { if (segment->kind == MI_SEGMENT_NORMAL && segment->thread_id != 0) {
pq = mi_page_queue_for(slice->slice_count,tld); pq = mi_page_queue_for(slice->slice_count,tld);
mi_assert_internal(mi_page_queue_contains(pq,mi_slice_to_page(slice))); mi_assert_internal(mi_segment_page_queue_contains(pq,mi_slice_to_page(slice)));
} }
} }
slice = &segment->slices[maxindex+1]; slice = &segment->slices[maxindex+1];