merge from dev

2019-11-25 11:16:39 -08:00
parent 41af533a34 1d998af854
commit b5fbdb7180
5 changed files with 25 additions and 19 deletions
--- a/include/mimalloc.h
+++ b/include/mimalloc.h
@@ -266,12 +266,13 @@ typedef enum mi_option_e {
  mi_option_verbose,
  // the following options are experimental
  mi_option_eager_commit,
+  mi_option_eager_region_commit,
+  mi_option_reset_decommits,
  mi_option_large_os_pages,         // implies eager commit
  mi_option_reserve_huge_os_pages,
  mi_option_segment_cache,
  mi_option_page_reset,
  mi_option_segment_reset,
-  mi_option_reset_decommits,
  mi_option_eager_commit_delay,
  mi_option_allow_decommit,
  mi_option_reset_delay,