Merge branch 'maint'

5 files changed, 63 insertions, 22 deletions

diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index c7ee294719..8b6036f52a 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -297,6 +297,8 @@ to_str(No) when is_integer(No) ->
     integer_to_list(No);
 to_str(Float) when is_float(Float) ->
     io_lib:format("~.3f", [Float]);
+to_str({trunc, Float}) when is_float(Float) ->
+    float_to_list(Float, [{decimals,0}]);
 to_str(Term) ->
     io_lib:format("~w", [Term]).
 
diff --git a/lib/observer/src/observer_sys_wx.erl b/lib/observer/src/observer_sys_wx.erl
index db86c05bed..2e1af3ada9 100644
--- a/lib/observer/src/observer_sys_wx.erl
+++ b/lib/observer/src/observer_sys_wx.erl
@@ -48,7 +48,7 @@ start_link(Notebook, Parent, Config) ->
 
 init([Notebook, Parent, Config]) ->
     SysInfo = observer_backend:sys_info(),
-    {Sys, Mem, Cpu, Stats} = info_fields(),
+    {Sys, Mem, Cpu, Stats, Limits} = info_fields(),
     Panel = wxPanel:new(Notebook),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
     HSizer0 = wxBoxSizer:new(?wxHORIZONTAL),
@@ -63,17 +63,26 @@ init([Notebook, Parent, Config]) ->
     wxSizer:add(HSizer1, FPanel2, [{flag, ?wxEXPAND}, {proportion, 1}]),
     wxSizer:add(HSizer1, FPanel3, [{flag, ?wxEXPAND}, {proportion, 1}]),
 
+    HSizer2 = wxBoxSizer:new(?wxHORIZONTAL),
+    {FPanel4, _FSizer4, Fields4} = observer_lib:display_info(Panel, observer_lib:fill_info(Limits, SysInfo)),
+    wxSizer:add(HSizer2, FPanel4, [{flag, ?wxEXPAND}, {proportion, 1}]),
+
+
     BorderFlags = ?wxLEFT bor ?wxRIGHT,
     wxSizer:add(Sizer, HSizer0, [{flag, ?wxEXPAND bor BorderFlags bor ?wxTOP},
 				 {proportion, 0}, {border, 5}]),
     wxSizer:add(Sizer, HSizer1, [{flag, ?wxEXPAND bor BorderFlags bor ?wxBOTTOM},
 				 {proportion, 0}, {border, 5}]),
+    wxSizer:add(Sizer, HSizer2, [{flag, ?wxEXPAND bor BorderFlags bor ?wxBOTTOM},
+                                 {proportion, 0}, {border, 5}]),
+
     wxPanel:setSizer(Panel, Sizer),
     Timer = observer_lib:start_timer(Config, 10),
     {Panel, #sys_wx_state{parent=Parent,
 			  parent_notebook=Notebook,
 			  panel=Panel, sizer=Sizer,
-			  timer=Timer, fields=Fields0 ++ Fields1++Fields2++Fields3}}.
+			  timer=Timer, fields=Fields0 ++ Fields1++Fields2++Fields3++Fields4}}.
+
 
 create_sys_menu(Parent) ->
     View = {"View", [#create_menu{id = ?ID_REFRESH, text = "Refresh\tCtrl-R"},
@@ -83,14 +92,40 @@ create_sys_menu(Parent) ->
 update_syspage(#sys_wx_state{node = undefined}) -> ignore;
 update_syspage(#sys_wx_state{node = Node, fields=Fields, sizer=Sizer}) ->
     SysInfo = observer_wx:try_rpc(Node, observer_backend, sys_info, []),
-    {Sys, Mem, Cpu, Stats} = info_fields(),
+    {Sys, Mem, Cpu, Stats, Limits} = info_fields(),
     observer_lib:update_info(Fields,
 			     observer_lib:fill_info(Sys, SysInfo) ++
 				 observer_lib:fill_info(Mem, SysInfo) ++
 				 observer_lib:fill_info(Cpu, SysInfo) ++
-				 observer_lib:fill_info(Stats, SysInfo)),
+				 observer_lib:fill_info(Stats, SysInfo)++
+				 observer_lib:fill_info(Limits, SysInfo)),
+
     wxSizer:layout(Sizer).
 
+
+maybe_convert(undefined) -> "Not available";
+maybe_convert(V) -> observer_lib:to_str(V).
+
+get_dist_buf_busy_limit_info() ->
+    fun(Data) ->
+            maybe_convert(proplists:get_value(dist_buf_busy_limit, Data))
+    end.
+
+get_limit_count_info(Count, Limit) ->
+    fun(Data) ->
+            C = proplists:get_value(Count, Data),
+            L = proplists:get_value(Limit, Data),
+            lists:flatten(
+              io_lib:format("~s / ~s ~s",
+                            [maybe_convert(C), maybe_convert(L),
+                             if
+                                 C =:= undefined -> "";
+                                 L =:= undefined -> "";
+                                 true -> io_lib:format("(~s % used)",[observer_lib:to_str({trunc, (C / L) *100})])
+                             end]))
+    end.
+
+
 info_fields() ->
     Sys = [{"System and Architecture",
 	     [{"System Version", otp_release},
@@ -122,14 +157,20 @@ info_fields() ->
 	    ]}],
     Stats = [{"Statistics", right,
 	      [{"Up time", {time_ms, uptime}},
-	       {"Max Processes", process_limit},
-	       {"Processes", process_count},
 	       {"Run Queue", run_queue},
 	       {"IO Input",  {bytes, io_input}},
 	       {"IO Output", {bytes, io_output}}
 	      ]}
 	    ],
-    {Sys, Mem, Cpu, Stats}.
+    Limits = [{"System statistics / limit",
+               [{"Atoms", get_limit_count_info(atom_count, atom_limit)},
+                {"Processes", get_limit_count_info(process_count, process_limit)},
+                {"Ports", get_limit_count_info(port_count, port_limit)},
+                {"ETS", get_limit_count_info(ets_count, ets_limit)},
+                {"Distribution buffer busy limit", get_dist_buf_busy_limit_info()}
+               ]}],
+    {Sys, Mem, Cpu, Stats, Limits}.
+
 
 %%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index d36af257ce..7f0c1ac6e4 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -63,9 +63,7 @@ sys_info() ->
 			  end,
 
     {{_,Input},{_,Output}} = erlang:statistics(io),
-    [{process_count, erlang:system_info(process_count)},
-     {process_limit, erlang:system_info(process_limit)},
-     {uptime, element(1, erlang:statistics(wall_clock))},
+    [{uptime, element(1, erlang:statistics(wall_clock))},
      {run_queue, erlang:statistics(run_queue)},
      {io_input, Input},
      {io_output,  Output},
@@ -86,7 +84,17 @@ sys_info() ->
      {thread_pool_size, erlang:system_info(thread_pool_size)},
      {wordsize_internal, erlang:system_info({wordsize, internal})},
      {wordsize_external, erlang:system_info({wordsize, external})},
-     {alloc_info, alloc_info()}
+     {alloc_info, alloc_info()},
+     {process_count, erlang:system_info(process_count)},
+     {atom_limit,  erlang:system_info(atom_limit)},
+     {atom_count, erlang:system_info(atom_count)},
+     {process_limit, erlang:system_info(process_limit)},
+     {process_count, erlang:system_info(process_count)},
+     {port_limit, erlang:system_info(port_limit)},
+     {port_count, erlang:system_info(port_count)},
+     {ets_limit,  erlang:system_info(ets_limit)},
+     {ets_count, length(ets:all())},
+     {dist_buf_busy_limit, erlang:system_info(dist_buf_busy_limit)}
      | MemInfo].
 
 alloc_info() ->
diff --git a/system/doc/design_principles/des_princ.xml b/system/doc/design_principles/des_princ.xml
index 8ab8661c2d..af5904ce78 100644
--- a/system/doc/design_principles/des_princ.xml
+++ b/system/doc/design_principles/des_princ.xml
@@ -225,10 +225,8 @@ free(Ch, {Alloc, Free} = Channels) ->
     <list type="bulleted">
       <item><p><seealso marker="gen_server_concepts">gen_server</seealso></p>
       <p>For implementing the server of a client-server relation</p></item>
-      <item><p><seealso marker="fsm">gen_fsm</seealso></p>
-      <p>For implementing finite-state machines (Old)</p></item>
       <item><p><seealso marker="statem">gen_statem</seealso></p>
-      <p>For implementing state machines (New)</p></item>
+      <p>For implementing state machines</p></item>
       <item><p><seealso marker="events">gen_event</seealso></p>
       <p>For implementing event handling functionality</p></item>
       <item><p><seealso marker="sup_princ">supervisor</seealso></p>
diff --git a/system/doc/design_principles/statem.xml b/system/doc/design_principles/statem.xml
index 7febe31df3..a0611a46da 100644
--- a/system/doc/design_principles/statem.xml
+++ b/system/doc/design_principles/statem.xml
@@ -411,14 +411,6 @@ StateName(EventType, EventContent, Data) ->
     <marker id="Example" />
     <title>Example</title>
     <p>
-      This example starts off as equivalent to the example in section
-      <seealso marker="fsm"><c>gen_fsm</c>&nbsp;Behavior</seealso>.
-      In later sections, additions and tweaks are made
-      using features in <c>gen_statem</c> that <c>gen_fsm</c> does not have.
-      The end of this chapter provides the example again
-      with all the added features.
-    </p>
-    <p>
       A door with a code lock can be seen as a state machine.
       Initially, the door is locked. When someone presses a button,
       an event is generated.