kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-08 00:09:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix highest allocated page for arena unload

Browse source
This commit is contained in:
daanx 2025-01-22 12:25:02 -08:00
parent 7b8a710774
commit a7370dcbd2
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/arena.c
View file

@ -1834,8 +1834,13 @@ mi_decl_export bool mi_arena_unload(mi_arena_id_t arena_id, void** base, size_t*
size_t asize; size_t asize;
// scan the commit map for the highest entry // scan the commit map for the highest entry
size_t idx; size_t idx;
if (mi_bitmap_bsr(arena->slices_committed, &idx)) { //if (mi_bitmap_bsr(arena->slices_committed, &idx)) {
asize = (idx + 1)* MI_ARENA_SLICE_SIZE; // asize = (idx + 1)* MI_ARENA_SLICE_SIZE;
//}
if (mi_bitmap_bsr(arena->pages, &idx)) {
mi_page_t* page = (mi_page_t*)mi_arena_slice_start(arena, idx);
const size_t page_slice_count = page->memid.mem.arena.slice_count;
asize = mi_size_of_slices(idx + page_slice_count);
} }
else { else {
asize = mi_arena_info_slices(arena) * MI_ARENA_SLICE_SIZE; asize = mi_arena_info_slices(arena) * MI_ARENA_SLICE_SIZE;

10
test/main-override-dep.cpp
View file

@ -12,4 +12,14 @@ std::string TestAllocInDll::GetString()
std::string r = test; std::string r = test;
delete[] test; delete[] test;
return r; return r;
}
#include <windows.h>
void TestAllocInDll::TestHeapAlloc()
{
HANDLE heap = GetProcessHeap();
int* p = (int*)HeapAlloc(heap, 0, sizeof(int));
*p = 42;
HeapFree(heap, 0, p);
} }

1
test/main-override-dep.h
View file

@ -8,4 +8,5 @@ class TestAllocInDll
{ {
public: public:
__declspec(dllexport) std::string GetString(); __declspec(dllexport) std::string GetString();
__declspec(dllexport) void TestHeapAlloc();
}; };

10
test/main-override.cpp
View file

@ -37,7 +37,7 @@ static void test_thread_local(); // issue #944
static void test_mixed1(); // issue #942 static void test_mixed1(); // issue #942
static void test_stl_allocators(); static void test_stl_allocators();
#if x_WIN32 #if _WIN32
#include "main-override-dep.h" #include "main-override-dep.h"
static void test_dep(); // issue #981: test overriding in another DLL static void test_dep(); // issue #981: test overriding in another DLL
#else #else
@ -46,8 +46,8 @@ static void test_dep() { };
int main() { int main() {
mi_stats_reset(); // ignore earlier allocations mi_stats_reset(); // ignore earlier allocations
various_tests(); //various_tests();
test_mixed1(); //test_mixed1();
test_dep(); test_dep();
@ -145,11 +145,13 @@ static bool test_stl_allocator1() {
struct some_struct { int i; int j; double z; }; struct some_struct { int i; int j; double z; };
#if x_WIN32 #if _WIN32
static void test_dep() static void test_dep()
{ {
TestAllocInDll t; TestAllocInDll t;
std::string s = t.GetString(); std::string s = t.GetString();
t.TestHeapAlloc();
} }
#endif #endif