From 866ce5b89db1dbc3e66bbf89041291fd16329518 Mon Sep 17 00:00:00 2001 From: Daan Date: Mon, 13 Jan 2025 16:57:59 -0800 Subject: [PATCH 1/7] vcpkg: remove INTERFACE_INCLUDE_DIRECTORIES again --- contrib/vcpkg/vcpkg-cmake-wrapper.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/vcpkg/vcpkg-cmake-wrapper.cmake b/contrib/vcpkg/vcpkg-cmake-wrapper.cmake index 6b917347..1b355722 100644 --- a/contrib/vcpkg/vcpkg-cmake-wrapper.cmake +++ b/contrib/vcpkg/vcpkg-cmake-wrapper.cmake @@ -17,5 +17,4 @@ endif() if(TARGET mimalloc-static AND NOT TARGET mimalloc) add_library(mimalloc INTERFACE IMPORTED) set_target_properties(mimalloc PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc-static) - set_target_properties(mimalloc PROPERTIES INTERFACE_INCLUDE_DIRECTORIES mimalloc-static) endif() From 97c304dc3908f776e64a570474e9ffaa48f98bad Mon Sep 17 00:00:00 2001 From: Daan Date: Mon, 13 Jan 2025 16:59:24 -0800 Subject: [PATCH 2/7] vcpkg: bump sha --- contrib/vcpkg/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/vcpkg/portfile.cmake b/contrib/vcpkg/portfile.cmake index 058ce985..f5f39009 100644 --- a/contrib/vcpkg/portfile.cmake +++ b/contrib/vcpkg/portfile.cmake @@ -5,11 +5,11 @@ vcpkg_from_github( # The "REF" can be a commit hash, branch name (dev2), or a version (v2.2.1). # REF "v${VERSION}" - REF be05b232e8a51e076aae6d8f4a5c3049ce51cb01 + REF 866ce5b89db1dbc3e66bbf89041291fd16329518 # The sha512 is the hash of the tar.gz bundle. # (To get the sha512, run `vcpkg install mimalloc[override] --overlay-ports=` and copy the sha from the error message.) - SHA512 24f640db050d6263e557fe9d024e6c0435762118605c0d04801efbcb32e96382b0b995000715fc0c2dcd67c67825a100a6690ecf0ef097b0a3ae107a82d74f7d + SHA512 0b0e5ff823c49b9534b8c32800679806c5d7c29020af058da043c3e6e36ae3c32a1cdd5a21ece97dd60bc7dd4703967f683beac435dbb8514638a6cc55e5dea8 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS From e4befd1ce820c6988210156e291d5021e263b5d3 Mon Sep 17 00:00:00 2001 From: Daan Date: Mon, 13 Jan 2025 17:02:02 -0800 Subject: [PATCH 3/7] vcpkg: bump sha --- contrib/vcpkg/portfile.cmake | 4 ++-- contrib/vcpkg/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/vcpkg/portfile.cmake b/contrib/vcpkg/portfile.cmake index f5f39009..55f0172f 100644 --- a/contrib/vcpkg/portfile.cmake +++ b/contrib/vcpkg/portfile.cmake @@ -5,11 +5,11 @@ vcpkg_from_github( # The "REF" can be a commit hash, branch name (dev2), or a version (v2.2.1). # REF "v${VERSION}" - REF 866ce5b89db1dbc3e66bbf89041291fd16329518 + REF 6a89f8554eaab8d8d00e17b5b09f79e1d8dbf61b # The sha512 is the hash of the tar.gz bundle. # (To get the sha512, run `vcpkg install mimalloc[override] --overlay-ports=` and copy the sha from the error message.) - SHA512 0b0e5ff823c49b9534b8c32800679806c5d7c29020af058da043c3e6e36ae3c32a1cdd5a21ece97dd60bc7dd4703967f683beac435dbb8514638a6cc55e5dea8 + SHA512 32b87a3195efcc558b83a546348a8fb544fed335cdd6c9f8e7e9d0e8e64540fdcf1f4aa57fd0e783b78731518f4810292b832227d7e7665bf8426f1e6ce96f9d ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/contrib/vcpkg/vcpkg.json b/contrib/vcpkg/vcpkg.json index bdbe9ba1..95d3b15d 100644 --- a/contrib/vcpkg/vcpkg.json +++ b/contrib/vcpkg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mimalloc", - "version": "1.9.2", + "version": "3.0.2", "port-version": 2, "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", From bc10fe27c657d72fb26592f78d31e9d763165438 Mon Sep 17 00:00:00 2001 From: daanx Date: Wed, 15 Jan 2025 11:37:20 -0800 Subject: [PATCH 4/7] fix unregister from the page-map --- src/page-map.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/page-map.c b/src/page-map.c index 1cf0b07b..25f8a7ec 100644 --- a/src/page-map.c +++ b/src/page-map.c @@ -296,12 +296,16 @@ void _mi_page_map_register(mi_page_t* page) { void _mi_page_map_unregister(mi_page_t* page) { mi_assert_internal(_mi_page_map != NULL); + mi_assert_internal(page != NULL); + mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN)); + mi_assert_internal(_mi_page_map != NULL); + if mi_unlikely(_mi_page_map == NULL) return; // get index and count size_t slice_count; size_t sub_idx; const size_t idx = mi_page_map_get_idx(page, &sub_idx, &slice_count); // unset the offsets - mi_page_map_set_range(page, idx, sub_idx, slice_count); + mi_page_map_set_range(NULL, idx, sub_idx, slice_count); } void _mi_page_map_unregister_range(void* start, size_t size) { From be2cb44de44b13c5905886a16c7b46c498125321 Mon Sep 17 00:00:00 2001 From: daanx Date: Wed, 15 Jan 2025 12:02:34 -0800 Subject: [PATCH 5/7] fix NULL pointer in _mi_safe_ptr_page to return a reference to the empty page --- src/page-map.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/page-map.c b/src/page-map.c index 25f8a7ec..641ab405 100644 --- a/src/page-map.c +++ b/src/page-map.c @@ -305,7 +305,7 @@ void _mi_page_map_unregister(mi_page_t* page) { size_t sub_idx; const size_t idx = mi_page_map_get_idx(page, &sub_idx, &slice_count); // unset the offsets - mi_page_map_set_range(NULL, idx, sub_idx, slice_count); + // mi_page_map_set_range(NULL, idx, sub_idx, slice_count); } void _mi_page_map_unregister_range(void* start, size_t size) { @@ -318,6 +318,7 @@ void _mi_page_map_unregister_range(void* start, size_t size) { mi_page_t* _mi_safe_ptr_page(const void* p) { if mi_unlikely(p >= mi_page_map_max_address) return NULL; + if (p == NULL) return (mi_page_t*)&_mi_page_empty; // to match mi_free expectation size_t sub_idx; const size_t idx = _mi_page_map_index(p,&sub_idx); if mi_unlikely(!mi_page_map_is_committed(idx,NULL)) return NULL; From 5af1eb1144bf4777495f76bfff435443e8302e7f Mon Sep 17 00:00:00 2001 From: daanx Date: Wed, 15 Jan 2025 12:07:06 -0800 Subject: [PATCH 6/7] fix NULL pointer in _mi_safe_ptr_page to return a reference to the empty page --- src/page-map.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/page-map.c b/src/page-map.c index 641ab405..be99814c 100644 --- a/src/page-map.c +++ b/src/page-map.c @@ -315,10 +315,10 @@ void _mi_page_map_unregister_range(void* start, size_t size) { mi_page_map_set_range(NULL, idx, sub_idx, slice_count); // todo: avoid committing if not already committed? } - +// Return the empty page for the NULL pointer to match the behaviour of `_mi_ptr_page` mi_page_t* _mi_safe_ptr_page(const void* p) { if mi_unlikely(p >= mi_page_map_max_address) return NULL; - if (p == NULL) return (mi_page_t*)&_mi_page_empty; // to match mi_free expectation + if (p == NULL) return (mi_page_t*)&_mi_page_empty; // to match `_mi_ptr_page` (see `mi_free` as well) size_t sub_idx; const size_t idx = _mi_page_map_index(p,&sub_idx); if mi_unlikely(!mi_page_map_is_committed(idx,NULL)) return NULL; @@ -328,7 +328,7 @@ mi_page_t* _mi_safe_ptr_page(const void* p) { } mi_decl_nodiscard mi_decl_export bool mi_is_in_heap_region(const void* p) mi_attr_noexcept { - return (_mi_safe_ptr_page(p) != NULL); + return (p != NULL && _mi_safe_ptr_page(p) != NULL); } #endif From 4a14c69554f7d07cc72d8b99f4322990c9cd2696 Mon Sep 17 00:00:00 2001 From: daanx Date: Wed, 15 Jan 2025 12:11:52 -0800 Subject: [PATCH 7/7] disable using vcpkg in the VS projects --- ide/vs2022/mimalloc-lib.vcxproj | 3 +++ ide/vs2022/mimalloc-override-dll.vcxproj | 3 +++ ide/vs2022/mimalloc-override-test-dep.vcxproj | 3 +++ ide/vs2022/mimalloc-override-test.vcxproj | 3 +++ ide/vs2022/mimalloc-test-api.vcxproj | 3 +++ ide/vs2022/mimalloc-test-stress.vcxproj | 3 +++ ide/vs2022/mimalloc-test.vcxproj | 3 +++ 7 files changed, 21 insertions(+) diff --git a/ide/vs2022/mimalloc-lib.vcxproj b/ide/vs2022/mimalloc-lib.vcxproj index 3359e6c0..c6c2cb5f 100644 --- a/ide/vs2022/mimalloc-lib.vcxproj +++ b/ide/vs2022/mimalloc-lib.vcxproj @@ -164,6 +164,9 @@ .lib mimalloc + + false + Level4 diff --git a/ide/vs2022/mimalloc-override-dll.vcxproj b/ide/vs2022/mimalloc-override-dll.vcxproj index d80d0b02..133b3efa 100644 --- a/ide/vs2022/mimalloc-override-dll.vcxproj +++ b/ide/vs2022/mimalloc-override-dll.vcxproj @@ -160,6 +160,9 @@ .dll mimalloc + + false + Level3 diff --git a/ide/vs2022/mimalloc-override-test-dep.vcxproj b/ide/vs2022/mimalloc-override-test-dep.vcxproj index 606bec9c..c1b89690 100644 --- a/ide/vs2022/mimalloc-override-test-dep.vcxproj +++ b/ide/vs2022/mimalloc-override-test-dep.vcxproj @@ -148,6 +148,9 @@ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\ + + false + Level3 diff --git a/ide/vs2022/mimalloc-override-test.vcxproj b/ide/vs2022/mimalloc-override-test.vcxproj index ae465349..1dc2cee7 100644 --- a/ide/vs2022/mimalloc-override-test.vcxproj +++ b/ide/vs2022/mimalloc-override-test.vcxproj @@ -148,6 +148,9 @@ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\ + + false + Level3 diff --git a/ide/vs2022/mimalloc-test-api.vcxproj b/ide/vs2022/mimalloc-test-api.vcxproj index b7f97ad2..440693a2 100644 --- a/ide/vs2022/mimalloc-test-api.vcxproj +++ b/ide/vs2022/mimalloc-test-api.vcxproj @@ -148,6 +148,9 @@ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\ + + false + Level3 diff --git a/ide/vs2022/mimalloc-test-stress.vcxproj b/ide/vs2022/mimalloc-test-stress.vcxproj index cb761f94..d6af71ce 100644 --- a/ide/vs2022/mimalloc-test-stress.vcxproj +++ b/ide/vs2022/mimalloc-test-stress.vcxproj @@ -148,6 +148,9 @@ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\ + + false + Level3 diff --git a/ide/vs2022/mimalloc-test.vcxproj b/ide/vs2022/mimalloc-test.vcxproj index 83202dbe..1e41fca1 100644 --- a/ide/vs2022/mimalloc-test.vcxproj +++ b/ide/vs2022/mimalloc-test.vcxproj @@ -148,6 +148,9 @@ $(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\ $(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\ + + false + Level3