diff options
| author | Daan <daanl@outlook.com> | 2022-02-14 16:36:03 -0800 |
|---|---|---|
| committer | Daan <daanl@outlook.com> | 2022-02-14 16:36:03 -0800 |
| commit | 19edc880dae1cd51381a4e59aae74ffd59a108cc (patch) | |
| tree | 188c0bd1b927f36a135b5d284835b7dc578f1b00 | |
| parent | a1310047c45dc5785e2a1f6e0507bc2f4c73ea9d (diff) | |
| parent | 817569dfad79732233fb86649c89e04387ce02e9 (diff) | |
merge from dev
| -rw-r--r-- | cmake/mimalloc-config-version.cmake | 6 | ||||
| -rw-r--r-- | include/mimalloc.h | 2 | ||||
| -rw-r--r-- | readme.md | 6 | ||||
| -rw-r--r-- | src/alloc-override-osx.c | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/cmake/mimalloc-config-version.cmake b/cmake/mimalloc-config-version.cmake index 552551d..76b2af6 100644 --- a/cmake/mimalloc-config-version.cmake +++ b/cmake/mimalloc-config-version.cmake @@ -1,6 +1,12 @@ +<<<<<<< HEAD set(mi_version_major 2) set(mi_version_minor 0) set(mi_version_patch 4) +======= +set(mi_version_major 1) +set(mi_version_minor 7) +set(mi_version_patch 5) +>>>>>>> dev set(mi_version ${mi_version_major}.${mi_version_minor}) set(PACKAGE_VERSION ${mi_version}) diff --git a/include/mimalloc.h b/include/mimalloc.h index 0880584..83debd2 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -8,7 +8,7 @@ terms of the MIT license. A copy of the license can be found in the file #ifndef MIMALLOC_H #define MIMALLOC_H -#define MI_MALLOC_VERSION 204 // major + 2 digits minor +#define MI_MALLOC_VERSION 205 // major + 2 digits minor // ------------------------------------------------------ // Compiler specific attributes @@ -12,8 +12,8 @@ is a general purpose allocator with excellent [performance](#performance) charac Initially developed by Daan Leijen for the run-time systems of the [Koka](https://koka-lang.github.io) and [Lean](https://github.com/leanprover/lean) languages. -Latest release tag: `v2.0.4` (beta, 2022-02-14). -Latest stable tag: `v1.7.4` (2022-02-14). +Latest release tag: `v2.0.5` (alpha, 2022-02-14). +Latest stable tag: `v1.7.5` (2022-02-14). mimalloc is a drop-in replacement for `malloc` and can be used in other programs without code changes, for example, on dynamically linked ELF-based systems (Linux, BSD, etc.) you can use it as: @@ -77,7 +77,7 @@ Note: the `v2.x` beta has a new algorithm for managing internal mimalloc pages t and fragmentation compared to mimalloc `v1.x` (especially for large workloads). Should otherwise have similar performance (see [below](#performance)); please report if you observe any significant performance regression. -* 2022-02-14, `v1.7.4`, `v2.0.4` (alpha): fix malloc override on +* 2022-02-14, `v1.7.5`, `v2.0.5` (alpha): fix malloc override on Windows 11, fix compilation with musl, potentially reduced committed memory, add `bin/minject` for Windows, improved wasm support, faster aligned allocation, diff --git a/src/alloc-override-osx.c b/src/alloc-override-osx.c index a88186b..9c331ca 100644 --- a/src/alloc-override-osx.c +++ b/src/alloc-override-osx.c @@ -43,7 +43,7 @@ extern malloc_zone_t* malloc_default_purgeable_zone(void) __attribute__((weak_im static size_t zone_size(malloc_zone_t* zone, const void* p) { MI_UNUSED(zone); - //if (!mi_is_in_heap_region(p)){ return 0; } // not our pointer, bail out + if (!mi_is_in_heap_region(p)){ return 0; } // not our pointer, bail out return mi_usable_size(p); } |