From 33a1962290ba6a6116cefe9fabb2e6cef823b33b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Fri, 23 Jun 2017 13:15:22 +0200
Subject: Break erts_debug:lock_counters/1 into separate BIFs

---
 lib/kernel/src/erts_debug.erl | 35 +++++++++++++++++++++++++++--------
 lib/kernel/src/kernel.app.src |  2 +-
 2 files changed, 28 insertions(+), 9 deletions(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/src/erts_debug.erl b/lib/kernel/src/erts_debug.erl
index ad92aafc2f..480db6814e 100644
--- a/lib/kernel/src/erts_debug.erl
+++ b/lib/kernel/src/erts_debug.erl
@@ -33,10 +33,10 @@
 
 -export([breakpoint/2, disassemble/1, display/1, dist_ext_to_term/2,
          dump_monitors/1, dump_links/1, flat_size/1,
-         get_internal_state/1, instructions/0, lock_counters/1,
+         get_internal_state/1, instructions/0,
          map_info/1, same/2, set_internal_state/2,
-         size_shared/1, copy_shared/1, dirty_cpu/2, dirty_io/2,
-	 dirty/3]).
+         size_shared/1, copy_shared/1, dirty_cpu/2, dirty_io/2, dirty/3,
+         lcnt_control/1, lcnt_control/2, lcnt_collect/0, lcnt_clear/0]).
 
 -spec breakpoint(MFA, Flag) -> non_neg_integer() when
       MFA :: {Module :: module(),
@@ -142,12 +142,31 @@ ic(F) when is_function(F) ->
     io:format("Total: ~w~n",[lists:sum([C||{_I,C}<-Is])]),
     R.
 
--spec lock_counters(info) -> term();
-                      (clear) -> ok;
-                      ({copy_save, boolean()}) -> boolean();
-                      ({process_locks, boolean()}) -> boolean().
+-spec lcnt_control
+    (copy_save, boolean()) -> ok;
+    (mask, list(atom())) -> ok.
 
-lock_counters(_) ->
+lcnt_control(_Option, _Value) ->
+    erlang:nif_error(undef).
+
+-spec lcnt_control
+    (copy_save) -> boolean();
+    (mask) -> list(atom()).
+
+lcnt_control(_Option) ->
+    erlang:nif_error(undef).
+
+-type lcnt_lock_info() :: {atom(), term(), atom(), term()}.
+
+-spec lcnt_collect() ->
+    list({duration, {non_neg_integer(), non_neg_integer()}} |
+         {locks, list(lcnt_lock_info())}).
+
+lcnt_collect() ->
+    erlang:nif_error(undef).
+
+-spec lcnt_clear() -> ok.
+lcnt_clear() ->
     erlang:nif_error(undef).
 
 -spec same(Term1, Term2) -> boolean() when
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 1128ee3ec5..7aefbbd9b6 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -120,6 +120,6 @@
   {applications, []},
   {env, [{error_logger, tty}]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-9.0", "stdlib-3.0", "sasl-3.0"]}
+  {runtime_dependencies, ["erts-9.1", "stdlib-3.0", "sasl-3.0"]}
  ]
 }.
-- 
cgit v1.2.3