mirror of
https://github.com/git-for-windows/git.git
synced 2026-02-04 03:33:01 -06:00
2add928bae
Update to newer mimalloc versions like this:
update_mimalloc ()
{
test $# = 1 || {
echo "Need a mimalloc version" 1>&2;
return 1
};
for oneline in 'mimalloc: adjust for building inside Git' 'Import the source code of mimalloc';
do
git revert -n HEAD^{/^"$oneline"} && git checkout HEAD -- Makefile && git commit -sm "Temporarily revert \"$oneline\"" -m 'In preparation for upgrading to a newer mimalloc version.' || return 1;
done;
for file in $(git show --format='%n' --name-only --diff-filter=A HEAD^{/^"Import the source code of mimalloc "}) compat/mimalloc/arena-abandon.c compat/mimalloc/free.c compat/mimalloc/libc.c compat/mimalloc/prim/prim.c compat/mimalloc/mimalloc-stats.h;
do
file2=${file#compat/mimalloc/};
case "$file2" in
segment-cache.c)
: no longer needed;
continue
;;
bitmap.h | *.c)
file2=src/$file2
;;
*.h)
file2=include/$file2
;;
esac;
mkdir -p "${file%/*}" && git -C /usr/src/mimalloc/ show "$1":$file2 > "$file" && git add "$file" || {
echo "Failed: $file2 -> $file" 1>&2;
return 1
};
done;
conv_sed='sed -n "/^ *eval/d;/ /p"' && git commit -sm "Import the source code of mimalloc $1" -m "Update to newer mimalloc versions like this:" -m "$(set | sed -n '/^update_mimalloc *() *$/,/^}/{s/^./ &/;p}')" -m ' update_mimalloc $MIMALLOC_VERSION' -m 'For convenience, you can set `MIMALLOC_VERSION` and then run:' -m ' eval "$(git show -s <this-commit> | '"$conv_sed"')"' || return 1;
git cherry-pick HEAD^{/^'mimalloc: adjust for building inside Git'} || return 1
}
update_mimalloc $MIMALLOC_VERSION
For convenience, you can set `MIMALLOC_VERSION` and then run:
eval "$(git show -s <this-commit> | sed -n "/^ *eval/d;/ /p")"
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
105 lines
4.0 KiB
C
105 lines
4.0 KiB
C
/* ----------------------------------------------------------------------------
|
|
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 3 // 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) /* abandonded 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
|
|
{
|
|
int 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
|
|
|
|
// Exported definitions
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
mi_decl_export void mi_stats_get( size_t stats_size, 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
|