Repository navigation
gh-159111: Update vendored mimalloc to v2.5.2 #159112
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
4180f6d
Update vendored mimalloc to v2.5.2
corona10 836dced
Re-apply CPython-specific changes to mimalloc v2.5.2
corona10 3d0f073
Update the free-threaded build to mimalloc v2.5.2 changes
corona10 29b2d1b
Update NEWS.d
corona10 c3e6efb
fix MSAN
corona10 2599016
fix TSAN
corona10 91f4f86
fix test_cext
corona10 488b485
Disable THP
corona10 fea8db6
Merge remote-tracking branch 'upstream/main' into gh-159111
corona10 f561f9f
Address code review
corona10 1ed1490
Address code review
corona10 c711d85
Address code review
corona10 b051985
nit
corona10 471d7da
Address code review
corona10 8b9cb49
Address code review
corona10 09196b1
Merge remote-tracking branch 'upstream/main' into gh-159111
corona10 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /* ---------------------------------------------------------------------------- | ||
| Copyright (c) 2018-2025, Microsoft Research, Daan Leijen | ||
| This is free software; you can redistribute it and/or modify it under the | ||
| terms of the MIT license. A copy of the license can be found in the file | ||
| "LICENSE" at the root of this distribution. | ||
| -----------------------------------------------------------------------------*/ | ||
| #pragma once | ||
| #ifndef MIMALLOC_STATS_H | ||
| #define MIMALLOC_STATS_H | ||
|
|
||
| #include "mimalloc.h" | ||
| #include <stdint.h> | ||
|
|
||
| #define MI_STAT_VERSION 4 // increased on every backward incompatible change | ||
|
|
||
| // count allocation over time | ||
| typedef struct mi_stat_count_s { | ||
| int64_t total; // total allocated | ||
| int64_t peak; // peak allocation | ||
| int64_t current; // current allocation | ||
| } mi_stat_count_t; | ||
|
|
||
| // counters only increase | ||
| typedef struct mi_stat_counter_s { | ||
| int64_t total; // total count | ||
| } mi_stat_counter_t; | ||
|
|
||
| #define MI_STAT_FIELDS() \ | ||
| MI_STAT_COUNT(pages) /* count of mimalloc pages */ \ | ||
| MI_STAT_COUNT(reserved) /* reserved memory bytes */ \ | ||
| MI_STAT_COUNT(committed) /* committed bytes */ \ | ||
| MI_STAT_COUNTER(reset) /* reset bytes */ \ | ||
| MI_STAT_COUNTER(purged) /* purged bytes */ \ | ||
| MI_STAT_COUNT(page_committed) /* committed memory inside pages */ \ | ||
| MI_STAT_COUNT(pages_abandoned) /* abandoned pages count */ \ | ||
| MI_STAT_COUNT(threads) /* number of threads */ \ | ||
| MI_STAT_COUNT(malloc_normal) /* allocated bytes <= MI_LARGE_OBJ_SIZE_MAX */ \ | ||
| MI_STAT_COUNT(malloc_huge) /* allocated bytes in huge pages */ \ | ||
| MI_STAT_COUNT(malloc_requested) /* malloc requested bytes */ \ | ||
| \ | ||
| MI_STAT_COUNTER(mmap_calls) \ | ||
| MI_STAT_COUNTER(commit_calls) \ | ||
| MI_STAT_COUNTER(reset_calls) \ | ||
| MI_STAT_COUNTER(purge_calls) \ | ||
| MI_STAT_COUNTER(arena_count) /* number of memory arena's */ \ | ||
| MI_STAT_COUNTER(malloc_normal_count) /* number of blocks <= MI_LARGE_OBJ_SIZE_MAX */ \ | ||
| MI_STAT_COUNTER(malloc_huge_count) /* number of huge bloks */ \ | ||
| MI_STAT_COUNTER(malloc_guarded_count) /* number of allocations with guard pages */ \ | ||
| \ | ||
| /* internal statistics */ \ | ||
| MI_STAT_COUNTER(arena_rollback_count) \ | ||
| MI_STAT_COUNTER(arena_purges) \ | ||
| MI_STAT_COUNTER(pages_extended) /* number of page extensions */ \ | ||
| MI_STAT_COUNTER(pages_retire) /* number of pages that are retired */ \ | ||
| MI_STAT_COUNTER(page_searches) /* total pages searched for a fresh page */ \ | ||
| MI_STAT_COUNTER(page_searches_count) /* searched count for a fresh page */ \ | ||
| /* only on v1 and v2 */ \ | ||
| MI_STAT_COUNT(segments) \ | ||
| MI_STAT_COUNT(segments_abandoned) \ | ||
| MI_STAT_COUNT(segments_cache) \ | ||
| MI_STAT_COUNT(_segments_reserved) \ | ||
| /* only on v3 */ \ | ||
| MI_STAT_COUNTER(pages_reclaim_on_alloc) \ | ||
| MI_STAT_COUNTER(pages_reclaim_on_free) \ | ||
| MI_STAT_COUNTER(pages_reabandon_full) \ | ||
| MI_STAT_COUNTER(pages_unabandon_busy_wait) \ | ||
|
|
||
|
|
||
| // Define the statistics structure | ||
| #define MI_BIN_HUGE (73U) // see types.h | ||
| #define MI_STAT_COUNT(stat) mi_stat_count_t stat; | ||
| #define MI_STAT_COUNTER(stat) mi_stat_counter_t stat; | ||
|
|
||
| typedef struct mi_stats_s | ||
| { | ||
| size_t size; // size of the mi_stats_t structure | ||
| size_t version; | ||
|
|
||
| MI_STAT_FIELDS() | ||
|
|
||
| // future extension | ||
| mi_stat_count_t _stat_reserved[4]; | ||
| mi_stat_counter_t _stat_counter_reserved[4]; | ||
|
|
||
| // size segregated statistics | ||
| mi_stat_count_t malloc_bins[MI_BIN_HUGE+1]; // allocation per size bin | ||
| mi_stat_count_t page_bins[MI_BIN_HUGE+1]; // pages allocated per size bin | ||
| } mi_stats_t; | ||
|
|
||
| #undef MI_STAT_COUNT | ||
| #undef MI_STAT_COUNTER | ||
|
|
||
| // helper | ||
| #define mi_stats_t_decl(name) mi_stats_t name = { 0 }; name.size = sizeof(mi_stats_t); name.version = MI_STAT_VERSION; | ||
|
|
||
| // Exported definitions | ||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| mi_decl_export bool mi_stats_get( mi_stats_t* stats ) mi_attr_noexcept; | ||
| mi_decl_export char* mi_stats_get_json( size_t buf_size, char* buf ) mi_attr_noexcept; // use mi_free to free the result if the input buf == NULL | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif | ||
|
|
||
| #endif // MIMALLOC_STATS_H |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because for the main branch, we will target v3.