diff options
Diffstat (limited to 'erts/emulator/sys')
-rw-r--r-- | erts/emulator/sys/common/erl_mseg.c | 20 | ||||
-rw-r--r-- | erts/emulator/sys/common/erl_mseg.h | 6 |
2 files changed, 2 insertions, 24 deletions
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c index 84830d91ec..2ff88ee435 100644 --- a/erts/emulator/sys/common/erl_mseg.c +++ b/erts/emulator/sys/common/erl_mseg.c @@ -229,9 +229,6 @@ struct ErtsMsegAllctr_t_ { #endif Uint max_cache_size; - Uint abs_max_cache_bad_fit; - Uint rel_max_cache_bad_fit; - ErtsMsegCalls calls; #if CAN_PARTLY_DESTROY @@ -530,7 +527,7 @@ static ERTS_INLINE void mseg_cache_free_descriptor(MemKind *mk, cache_t *c) { static ERTS_INLINE int cache_bless_segment(MemKind *mk, void *seg, Uint size) { ERTS_DBG_MK_CHK_THR_ACCESS(mk); - if IS_2POW(size) { + if (IS_2POW(size)) { int ix = SIZE_TO_CACHE_AREA_IDX(size); cache_t *c; @@ -925,8 +922,6 @@ static struct { Eterm version; Eterm options; - Eterm amcbf; - Eterm rmcbf; Eterm mcs; Eterm memkind; @@ -985,8 +980,6 @@ init_atoms(ErtsMsegAllctr_t *ma) AM_INIT(name); AM_INIT(options); - AM_INIT(amcbf); - AM_INIT(rmcbf); AM_INIT(mcs); AM_INIT(status); @@ -1084,8 +1077,6 @@ info_options(ErtsMsegAllctr_t *ma, if (print_to_p) { int to = *print_to_p; void *arg = print_to_arg; - erts_print(to, arg, "%samcbf: %beu\n", prefix, ma->abs_max_cache_bad_fit); - erts_print(to, arg, "%srmcbf: %beu\n", prefix, ma->rel_max_cache_bad_fit); erts_print(to, arg, "%smcs: %beu\n", prefix, ma->max_cache_size); } @@ -1098,13 +1089,6 @@ info_options(ErtsMsegAllctr_t *ma, add_2tup(hpp, szp, &res, am.mcs, bld_uint(hpp, szp, ma->max_cache_size)); - add_2tup(hpp, szp, &res, - am.rmcbf, - bld_uint(hpp, szp, ma->rel_max_cache_bad_fit)); - add_2tup(hpp, szp, &res, - am.amcbf, - bld_uint(hpp, szp, ma->abs_max_cache_bad_fit)); - } return res; @@ -1533,8 +1517,6 @@ erts_mseg_init(ErtsMsegInit_t *init) /* Options ... */ - ma->abs_max_cache_bad_fit = init->amcbf; - ma->rel_max_cache_bad_fit = init->rmcbf; ma->max_cache_size = init->mcs; if (ma->max_cache_size > MAX_CACHE_SIZE) diff --git a/erts/emulator/sys/common/erl_mseg.h b/erts/emulator/sys/common/erl_mseg.h index 8f8cb0e121..80a6c42741 100644 --- a/erts/emulator/sys/common/erl_mseg.h +++ b/erts/emulator/sys/common/erl_mseg.h @@ -60,19 +60,15 @@ #define ERTS_MSEG_FLG_2POW ((Uint)(1 << 0)) -#define ERTS_MSEG_VSN_STR "0.9" +#define ERTS_MSEG_VSN_STR "0.10" typedef struct { - Uint amcbf; - Uint rmcbf; Uint mcs; Uint nos; } ErtsMsegInit_t; #define ERTS_MSEG_INIT_DEFAULT_INITIALIZER \ { \ - 4*1024*1024, /* amcbf: Absolute max cache bad fit */ \ - 20, /* rmcbf: Relative max cache bad fit */ \ 5, /* mcs: Max cache size */ \ 1000 /* cci: Cache check interval */ \ } |