Merge branch 'lukas/erts/msacc'

* lukas/erts/msacc:
  Update preloaded modules
  erts: Make msacc alloctor type thread safe
  Silence compiler
  erts: Fix msacc testcase on some windowses
  erts: Add power saving cpu feature tests and use them
  erts: Refactor perf counter internal interface
  erts: Add rdtscp instruction check
  erts: Fix hrtime for windows
  erts: use correct function for perf counter on non-x86
  erts: Fix msacc win32 debug compile error
  erts: Add microstate accounting
  erts, kernel: Add os:perf_counter function
  erts: Add ERTS_WRITE_UNLIKELY

1 files changed, 34 insertions, 1 deletions

diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index 84dedab930..a15355bb10 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -45,10 +45,13 @@
 
 -export([await_result/1, gather_io_bytes/2]).
 
--export([time_unit/0]).
+-export([time_unit/0, perf_counter_unit/0]).
 
 -export([is_system_process/1]).
 
+-export([await_microstate_accounting_modifications/3,
+	 gather_microstate_accounting_result/2]).
+
 %% Auto import name clash
 -export([check_process_code/2]).
 
@@ -345,8 +348,38 @@ flush_monitor_messages(Ref, Multi, Res) when is_reference(Ref) ->
 time_unit() ->
     erlang:nif_error(undefined).
 
+-spec erts_internal:perf_counter_unit() -> pos_integer().
+
+perf_counter_unit() ->
+    erlang:nif_error(undefined).
+
 -spec erts_internal:is_system_process(Pid) -> boolean() when
       Pid :: pid().
 
 is_system_process(_Pid) ->
     erlang:nif_error(undefined).
+
+-spec await_microstate_accounting_modifications(Ref, Result, Threads) -> boolean() when
+      Ref :: reference(),
+      Result :: boolean(),
+      Threads :: pos_integer().
+
+await_microstate_accounting_modifications(Ref, Result, Threads) ->
+    _ = microstate_accounting(Ref,Threads),
+    Result.
+
+-spec gather_microstate_accounting_result(Ref, Threads) -> [#{}] when
+      Ref :: reference(),
+      Threads :: pos_integer().
+
+gather_microstate_accounting_result(Ref, Threads) ->
+    microstate_accounting(Ref, Threads).
+
+microstate_accounting(_Ref, 0) ->
+    [];
+microstate_accounting(Ref, Threads) ->
+    receive
+        Ref -> microstate_accounting(Ref, Threads - 1);
+        {Ref, Res} ->
+	    [Res | microstate_accounting(Ref, Threads - 1)]
+    end.