From a99b0a2a570e7429b05f3ce424880744ee3a8814 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Wed, 17 May 2017 16:16:58 +0200
Subject: kernel: Introcude error_logger:get_format_depth()

---
 lib/stdlib/src/error_logger_file_h.erl | 12 ++----------
 lib/stdlib/src/error_logger_tty_h.erl  | 14 +++-----------
 lib/stdlib/src/gen_server.erl          |  2 +-
 lib/stdlib/src/proc_lib.erl            | 20 +++++++-------------
 4 files changed, 13 insertions(+), 35 deletions(-)

(limited to 'lib/stdlib/src')

diff --git a/lib/stdlib/src/error_logger_file_h.erl b/lib/stdlib/src/error_logger_file_h.erl
index 0b262de3ab..76f89841b9 100644
--- a/lib/stdlib/src/error_logger_file_h.erl
+++ b/lib/stdlib/src/error_logger_file_h.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ init(File, PrevHandler) ->
     process_flag(trap_exit, true),
     case file:open(File, [write]) of
 	{ok,Fd} ->
-	    Depth = get_depth(),
+            Depth = error_logger:get_format_depth(),
 	    State = #st{fd=Fd,filename=File,prev_handler=PrevHandler,
 			depth=Depth},
 	    {ok, State};
@@ -65,14 +65,6 @@ init(File, PrevHandler) ->
 	    Error
     end.
 
-get_depth() ->
-    case application:get_env(kernel, error_logger_format_depth) of
-	{ok, Depth} when is_integer(Depth) ->
-	    max(10, Depth);
-	undefined ->
-	    unlimited
-    end.
-
 handle_event({_Type, GL, _Msg}, State) when node(GL) =/= node() ->
     {ok, State};
 handle_event(Event, State) ->
diff --git a/lib/stdlib/src/error_logger_tty_h.erl b/lib/stdlib/src/error_logger_tty_h.erl
index 2f2fd65252..8f0d7b0362 100644
--- a/lib/stdlib/src/error_logger_tty_h.erl
+++ b/lib/stdlib/src/error_logger_tty_h.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@
 %% This one is used when we takeover from the simple error_logger.
 init({[], {error_logger, Buf}}) ->
     User = set_group_leader(),
-    Depth = get_depth(),
+    Depth = error_logger:get_format_depth(),
     State = #st{user=User,prev_handler=error_logger,depth=Depth},
     write_events(State, Buf),
     {ok, State};
@@ -56,17 +56,9 @@ init({[], {error_logger_tty_h, PrevHandler}}) ->
 %% This one is used when we are started directly.
 init([]) ->
     User = set_group_leader(),
-    Depth = get_depth(),
+    Depth = error_logger:get_format_depth(),
     {ok, #st{user=User,prev_handler=[],depth=Depth}}.
 
-get_depth() ->
-    case application:get_env(kernel, error_logger_format_depth) of
-	{ok, Depth} when is_integer(Depth) ->
-	    max(10, Depth);
-	undefined ->
-	    unlimited
-    end.
-    
 handle_event({_Type, GL, _Msg}, State) when node(GL) =/= node() ->
     {ok, State};
 handle_event(Event, State) ->
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 460ea0ed16..9f6568473d 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -859,7 +859,7 @@ error_info(Reason, Name, From, Msg, State, Debug) ->
 			end
 		end;
 	    _ ->
-		Reason
+		error_logger:limit_term(Reason)
 	end,    
     {ClientFmt, ClientArgs} = client_stacktrace(From),
     LimitedState = error_logger:limit_term(State),
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index b2856be805..3fa54cd0d5 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -551,26 +551,19 @@ get_messages(Pid) ->
     {messages, error_logger:limit_term(Messages)}.
 
 get_process_messages(Pid) ->
-    case get_depth() of
-        unlimited ->
+    Depth = error_logger:get_format_depth(),
+    case Pid =/= self() orelse Depth =:= unlimited of
+        true ->
             {messages, Messages} = get_process_info(Pid, messages),
             Messages;
-        Depth ->
+        false ->
             %% If there are more messages than Depth, garbage
             %% collection can sometimes be avoided by collecting just
-            %% enough messages for the output. It is assumed the
+            %% enough messages for the crash report. It is assumed the
             %% process is about to die anyway.
             receive_messages(Depth)
     end.
 
-get_depth() ->
-    case application:get_env(kernel, error_logger_format_depth) of
-	{ok, Depth} when is_integer(Depth) ->
-	    max(10, Depth);
-	undefined ->
-	    unlimited
-    end.
-
 receive_messages(0) -> [];
 receive_messages(N) ->
     receive
@@ -643,7 +636,8 @@ make_neighbour_report(Pid) ->
    get_process_info(Pid, status),
    get_process_info(Pid, heap_size),
    get_process_info(Pid, stack_size),
-   get_process_info(Pid, reductions)
+   get_process_info(Pid, reductions),
+   get_process_info(Pid, current_stacktrace)
   ].
  
 get_initial_call(Pid) ->
-- 
cgit v1.2.3