diff options
| author | Lukas Larsson <lukas@erlang.org> | 2021-12-20 10:35:50 +0100 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang.org> | 2022-01-10 11:43:19 +0100 |
| commit | b1c1e3d2c2d0b9b44c25dc5e56a62b332b31843b (patch) | |
| tree | ae33e65c148683cb2eb90237ac5756e4ffa1b07a /erts/emulator | |
| parent | 35587e5a07cc99c0302f8cae0796bc8c977fedaf (diff) | |
| download | erlang-b1c1e3d2c2d0b9b44c25dc5e56a62b332b31843b.tar.gz | |
erts: Fix disable of MSACC
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_msacc.c | 2 | ||||
| -rw-r--r-- | erts/emulator/test/statistics_SUITE.erl | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_msacc.c b/erts/emulator/beam/erl_msacc.c index 89fdaf77cd..db06688be7 100644 --- a/erts/emulator/beam/erl_msacc.c +++ b/erts/emulator/beam/erl_msacc.c @@ -42,7 +42,7 @@ #include "erl_msacc.h" #include "erl_bif_table.h" -#if ERTS_ENABLE_MSACC +#ifdef ERTS_ENABLE_MSACC static Eterm erts_msacc_gather_stats(ErtsMsAcc *msacc, ErtsHeapFactory *factory); static void erts_msacc_reset(ErtsMsAcc *msacc); diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl index 155ec28323..6aef3a29ed 100644 --- a/erts/emulator/test/statistics_SUITE.erl +++ b/erts/emulator/test/statistics_SUITE.erl @@ -23,6 +23,7 @@ %% Tests the statistics/1 bif. -export([all/0, suite/0, groups/0, + init_per_testcase/2, wall_clock_sanity/1, wall_clock_zero_diff/1, wall_clock_update/1, runtime_sanity/1, @@ -61,6 +62,16 @@ groups() -> [runtime_sanity, runtime_zero_diff, runtime_update, runtime_diff]}, {run_queue, [], [run_queue_one]}]. +init_per_testcase(msacc, Config) -> + try erlang:statistics(microstate_accounting) of + _ -> + Config + catch _:_ -> + {skip, "Microstate accouning not available"} + end; +init_per_testcase(_, Config) -> + Config. + wall_clock_sanity(Config) when is_list(Config) -> erlang:yield(), {WallClock, _} = statistics(wall_clock), |