Merge branch 'dev-slice' into dev-slice-trace

This commit is contained in:
daan 2022-02-05 17:55:10 -08:00
commit 8fa9600e98
4 changed files with 43 additions and 19 deletions

View file

@ -334,10 +334,15 @@ typedef enum mi_segment_kind_e {
// the corresponding MI_COMMIT_SIZE area is committed.
// The MI_COMMIT_SIZE must be a multiple of the slice
// size. If it is equal we have the most fine grained
// decommit (but in practice 2x seems to perform better).
// decommit (but setting it higher can be more efficient).
// The MI_MINIMAL_COMMIT_SIZE is the minimal amount that will
// be committed in one go which can be set higher than
// MI_COMMIT_SIZE for efficiency (while the decommit mask
// is still tracked in fine-grained MI_COMMIT_SIZE chunks)
// ------------------------------------------------------
#define MI_COMMIT_SIZE (MI_SEGMENT_SLICE_SIZE)
#define MI_MINIMAL_COMMIT_SIZE (2*MI_MiB)
#define MI_COMMIT_SIZE (MI_SEGMENT_SLICE_SIZE) // 64KiB
#define MI_COMMIT_MASK_BITS (MI_SEGMENT_SIZE / MI_COMMIT_SIZE)
#define MI_COMMIT_MASK_FIELD_BITS MI_SIZE_BITS
#define MI_COMMIT_MASK_FIELD_COUNT (MI_COMMIT_MASK_BITS / MI_COMMIT_MASK_FIELD_BITS)

View file

@ -328,6 +328,7 @@ typedef enum mi_option_e {
mi_option_max_warnings,
mi_option_allow_decommit,
mi_option_segment_decommit_delay,
mi_option_decommit_extend_delay,
_mi_option_last
} mi_option_t;