diff options
| author | Daan Leijen <daan@microsoft.com> | 2022-04-09 15:07:07 -0700 |
|---|---|---|
| committer | Daan Leijen <daan@microsoft.com> | 2022-04-09 15:07:07 -0700 |
| commit | 7e492f442002ea8950c446c8ae59629f0e06f027 (patch) | |
| tree | e2f3e869b7ca510f96c91ff90101e75a7f57b5e3 /include | |
| parent | 157c9b0966057a88aa3c660a017dbc75810815e3 (diff) | |
| parent | faca422b718625e656012391d94c564f5a67d977 (diff) | |
merge from dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/mimalloc-types.h | 3 | ||||
| -rw-r--r-- | include/mimalloc.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/mimalloc-types.h b/include/mimalloc-types.h index 0456884..fb75ea4 100644 --- a/include/mimalloc-types.h +++ b/include/mimalloc-types.h @@ -580,9 +580,6 @@ typedef struct mi_segments_tld_s { size_t peak_count; // peak number of segments size_t current_size; // current size of all segments size_t peak_size; // peak size of all segments - size_t cache_count; // number of segments in the cache - size_t cache_size; // total size of all segments in the cache - mi_segment_t* cache; // (small) cache of segments mi_stats_t* stats; // points to tld stats mi_os_tld_t* os; // points to os stats } mi_segments_tld_t; diff --git a/include/mimalloc.h b/include/mimalloc.h index 3930366..58ecaa6 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -316,7 +316,7 @@ typedef enum mi_option_e { mi_option_reserve_huge_os_pages, // reserve N huge OS pages (1GiB) at startup mi_option_reserve_huge_os_pages_at, // reserve huge OS pages at a specific NUMA node mi_option_reserve_os_memory, // reserve specified amount of OS memory at startup - mi_option_segment_cache, + mi_option_deprecated_segment_cache, mi_option_page_reset, mi_option_abandoned_page_decommit, mi_option_deprecated_segment_reset, |