Merge branch 'crashdump_viewer_allocators' of github.com:gomoripeti/otp into maint

* 'crashdump_viewer_allocators' of github.com:gomoripeti/otp:
  Crash dump viewer: ignore allocator type from blocks size keys

OTP-19353

Author: bjorng

lib/observer/src/cdv_mem_cb.erl

@@ -84,5 +84,5 @@ fix_alloc([]) ->
     [].
 
 alloc_columns(Columns) ->
-    [{"",   ?wxLIST_FORMAT_LEFT,  180} |
+    [{"", ?wxLIST_FORMAT_LEFT, 240} |
      [{Column, ?wxLIST_FORMAT_RIGHT, 140} || Column <- Columns]].

lib/observer/src/crashdump_viewer.erl

@@ -2537,7 +2537,8 @@ sort_allocator_types([],Acc,DoTotal) ->
 
 sort_type_data(Type,[?opt_e_false|Data],Acc,_) when Type=/=?sbmbc_alloc->
     sort_type_data(Type,Data,Acc,false);
-sort_type_data(Type,[{Key,Val0}|Data],Acc,DoTotal) ->
+sort_type_data(Type,[{Key0,Val0}|Data],Acc,DoTotal) ->
+    Key = re:replace(Key0, "([^[]*)(\\[[^]]*\\])(.*)", "\\1\\3", [{return, list}]),
     case lists:member(Key,?interesting_allocator_info) of
 	true ->
 	    Val = list_to_integer(hd(Val0)),

lib/observer/test/crashdump_viewer_SUITE.erl

@@ -364,7 +364,7 @@ browse_file(File) ->
     {ok,Mods,_ModsTW} = crashdump_viewer:loaded_modules(),
     {ok,_Mem,_MemTW} = crashdump_viewer:memory(),
     {ok,_AllocAreas,_AreaTW} = crashdump_viewer:allocated_areas(),
-    {ok,_AllocINfo,_AllocInfoTW} = crashdump_viewer:allocator_info(),
+    {ok,AllocInfo,_AllocInfoTW} = crashdump_viewer:allocator_info(),
     {ok,_HashTabs,_HashTabsTW} = crashdump_viewer:hash_tables(),
     {ok,_IndexTabs,_IndexTabsTW} = crashdump_viewer:index_tables(),
     {ok,_PTs,_PTsTW} = crashdump_viewer:persistent_terms(),
@@ -380,6 +380,9 @@ browse_file(File) ->
     lookat_all_nodes(Nodes),
     io:format("  nodes ok",[]),
 
+    lookat_alloc_info(AllocInfo,is_truncated(File)),
+    io:format("  alloc info ok",[]),
+
     Procs. % used as second arg to special/2
 
 is_truncated(File) ->
@@ -733,6 +736,32 @@ lookat_all_nodes([#nod{channel=Channel0}|Nodes]) ->
     {ok,_Node=#nod{},_NodeTW} = crashdump_viewer:node_info(Channel),
     lookat_all_nodes(Nodes).
 
+lookat_alloc_info(_,true) ->
+    ok;
+lookat_alloc_info([AllocSummary|_],false) ->
+    {"Allocator Summary",
+     ["blocks size", "carriers size", "mseg carriers size"],
+     Data
+    } = AllocSummary,
+
+    %% All values must be integer.
+    Filter = filter_alloc_info_fun(),
+    _ = [list_to_integer(IntStr) || {_,L} <- Data,
+                                    IntStr <- Filter(L)],
+
+    ok.
+
+filter_alloc_info_fun() ->
+    case os:type() of
+        {win32,_} ->
+            fun([A,B,_]) ->
+                    %% The third column is never valid on Windows.
+                    [A,B]
+            end;
+        _ ->
+            fun([_,_,_]=L) -> L end
+    end.
+
 %%%-----------------------------------------------------------------
 %%% 
 create_dumps(DataDir,Rels) ->