20 files changed, 302 insertions, 88 deletions

diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 659eb28292..8f3ebcb4de 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,6 +32,60 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The shell script (priv/bin/cdv) and bat file
+	    (priv/bin/cdv.bat) which can be used for starting
+	    crashdump_viewer both started a distributed erlang node.
+	    This would cause any attempt at starting a second
+	    instance of the crashdump_viewer to fail. To solve this
+	    problem, cdv and cdv.bat now use non-distributed nodes
+	    when starting the crashdump_viewer.</p>
+          <p>
+	    Own Id: OTP-14010</p>
+        </item>
+        <item>
+          <p>
+	    A bug caused the number of buckets to be shown in the
+	    'Objects' column, and the number of objects to be shown
+	    in the 'Memory' column for ets table in crashdump_viewer.
+	    This is now corrected.</p>
+          <p>
+	    Own Id: OTP-14064</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add option <c>queue_size</c> to ttb:tracer/2. This sets
+	    the maximum queue size for the IP trace driver which is
+	    used when tracing to shell and/or <c>{local,File}</c>.</p>
+          <p>
+	    The default value for <c>queue_size</c> is specified by
+	    <c>dbg</c>, and it is now changed from 50 to 200.</p>
+          <p>
+	    Own Id: OTP-13829 Aux Id: seq13171 </p>
+        </item>
+        <item>
+          <p>
+	    The port information page is updated to show more
+	    information per port.</p>
+          <p>
+	    Own Id: OTP-13948 Aux Id: ERL-272 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 2.2.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/priv/bin/cdv b/lib/observer/priv/bin/cdv
index 1c44785ac2..d14fd47e41 100755
--- a/lib/observer/priv/bin/cdv
+++ b/lib/observer/priv/bin/cdv
@@ -1,4 +1,4 @@
 #!/bin/sh 
 
-erl -sname cdv -noinput -s crashdump_viewer script_start $@
+erl -noinput -s crashdump_viewer script_start $@
 
diff --git a/lib/observer/priv/bin/cdv.bat b/lib/observer/priv/bin/cdv.bat
index efa8bf8687..18136a30d6 100644
--- a/lib/observer/priv/bin/cdv.bat
+++ b/lib/observer/priv/bin/cdv.bat
@@ -1,2 +1,2 @@
 @ECHO OFF
-CALL werl -sname cdv -s crashdump_viewer script_start %*
+CALL werl -s crashdump_viewer script_start %*
diff --git a/lib/observer/priv/crashdump_viewer.tool b/lib/observer/priv/crashdump_viewer.tool
deleted file mode 100644
index b6bd6bbdef..0000000000
--- a/lib/observer/priv/crashdump_viewer.tool
+++ /dev/null
@@ -1,2 +0,0 @@
-{version,"1.2"}.
-[{config_func,{crashdump_viewer,configData,[]}}].
diff --git a/lib/observer/priv/crashdump_viewer/collapsd.gif b/lib/observer/priv/crashdump_viewer/collapsd.gif
deleted file mode 100644
index 0b90c08a9a..0000000000
--- a/lib/observer/priv/crashdump_viewer/collapsd.gif
+++ /dev/null
diff --git a/lib/observer/priv/crashdump_viewer/exploded.gif b/lib/observer/priv/crashdump_viewer/exploded.gif
deleted file mode 100644
index e3ab5ca2e9..0000000000
--- a/lib/observer/priv/crashdump_viewer/exploded.gif
+++ /dev/null
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index dd7831fa2b..ff2bcbdb99 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -92,7 +92,7 @@ EXAMPLE_FILES= multitrace.erl
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
 
 PRIVDIR= ../priv
-WEBTOOLFILES= $(PRIVDIR)/crashdump_viewer.tool $(PRIVDIR)/erlang_observer.png
+PNGFILES= $(PRIVDIR)/erlang_observer.png
 BINDIR= $(PRIVDIR)/bin
 ifeq ($(findstring win32,$(TARGET)),win32)
 WIN32_EXECUTABLES= $(BINDIR)/etop.bat $(BINDIR)/cdv.bat
@@ -103,10 +103,6 @@ EXECUTABLES= \
 	$(BINDIR)/etop \
 	$(BINDIR)/cdv \
 	$(WIN32_EXECUTABLES)
-CDVDIR= $(PRIVDIR)/crashdump_viewer
-GIF_FILES= \
-	$(CDVDIR)/collapsd.gif \
-	$(CDVDIR)/exploded.gif
 
 APP_FILE= observer.app
 
@@ -163,9 +159,7 @@ release_spec: opt
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
 	$(INSTALL_SCRIPT) $(EXECUTABLES) "$(RELSYSDIR)/priv/bin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/crashdump_viewer"
-	$(INSTALL_DATA) $(WEBTOOLFILES) "$(RELSYSDIR)/priv"
-	$(INSTALL_DATA) $(GIF_FILES) "$(RELSYSDIR)/priv/crashdump_viewer"
+	$(INSTALL_DATA) $(PNGFILES) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/observer/src/cdv_ets_cb.erl b/lib/observer/src/cdv_ets_cb.erl
index 52a90b093b..ddd2d42df6 100644
--- a/lib/observer/src/cdv_ets_cb.erl
+++ b/lib/observer/src/cdv_ets_cb.erl
@@ -34,10 +34,8 @@
 -define(COL_NAME,  ?COL_ID+1).
 -define(COL_SLOT,  ?COL_NAME+1).
 -define(COL_OWNER, ?COL_SLOT+1).
--define(COL_BUCK,  ?COL_OWNER+1).
--define(COL_OBJ,   ?COL_BUCK+1).
+-define(COL_OBJ,   ?COL_OWNER+1).
 -define(COL_MEM,   ?COL_OBJ+1).
--define(COL_TYPE,  ?COL_MEM+1).
 
 %% Callbacks for cdv_virtual_list_wx
 col_to_elem(id) -> col_to_elem(?COL_ID);
@@ -45,8 +43,6 @@ col_to_elem(?COL_ID)    -> #ets_table.id;
 col_to_elem(?COL_NAME)  -> #ets_table.name;
 col_to_elem(?COL_SLOT)  -> #ets_table.slot;
 col_to_elem(?COL_OWNER) -> #ets_table.pid;
-col_to_elem(?COL_TYPE)  -> #ets_table.data_type;
-col_to_elem(?COL_BUCK)  -> #ets_table.buckets;
 col_to_elem(?COL_OBJ)   -> #ets_table.size;
 col_to_elem(?COL_MEM)   -> #ets_table.memory.
 
@@ -57,7 +53,6 @@ col_spec() ->
      {"Owner",   ?wxLIST_FORMAT_CENTRE, 120},
      {"Objects", ?wxLIST_FORMAT_RIGHT,  80},
      {"Memory",  ?wxLIST_FORMAT_RIGHT,  80}
-%     {"Type",    ?wxLIST_FORMAT_LEFT,   50}
     ].
 
 get_info(Owner) ->
diff --git a/lib/observer/src/cdv_mem_cb.erl b/lib/observer/src/cdv_mem_cb.erl
index ba972d6963..abeddc7335 100644
--- a/lib/observer/src/cdv_mem_cb.erl
+++ b/lib/observer/src/cdv_mem_cb.erl
@@ -77,6 +77,10 @@ fix_alloc([{Title,Columns,Data}|Tables]) ->
      fix_alloc(Tables)];
 fix_alloc([{Title,[{_,V}|_]=Data}|Tables]) ->
     fix_alloc([{Title,lists:duplicate(length(V),[]),Data}|Tables]);
+fix_alloc([{"",[]}|Tables]) -> % no name and no data, probably truncated dump
+    fix_alloc(Tables);
+fix_alloc([{Title,[]=Data}|Tables]) -> % no data, probably truncated dump
+    fix_alloc([{Title,[],Data}|Tables]);
 fix_alloc([]) ->
     [].
 
diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index 9268dac180..13e73f027d 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/lib/observer/src/crashdump_viewer.erl
@@ -90,6 +90,7 @@
 
 
 %% All possible tags - use macros in order to avoid misspelling in the code
+-define(abort,abort).
 -define(allocated_areas,allocated_areas).
 -define(allocator,allocator).
 -define(atoms,atoms).
@@ -321,8 +322,16 @@ handle_call(general_info,_From,State=#state{file=File}) ->
     NumAtoms = GenInfo#general_info.num_atoms,
     WS = parse_vsn_str(GenInfo#general_info.system_vsn,4),
     TW = case get(truncated) of
-	     true -> ["WARNING: The crash dump is truncated. "
-		      "Some information might be missing."];
+	     true ->
+                 case get(truncated_reason) of
+                     undefined ->
+                         ["WARNING: The crash dump is truncated. "
+                          "Some information might be missing."];
+                     Reason ->
+                         ["WARNING: The crash dump is truncated "
+                          "("++Reason++"). "
+                          "Some information might be missing."]
+                 end;
 	     false -> []
 	 end,
     ets:insert(cdv_reg_proc_table,
@@ -515,8 +524,15 @@ truncated_warning([Tag|Tags]) ->
 	false -> truncated_warning(Tags)
     end.
 truncated_warning() ->
-    ["WARNING: The crash dump is truncated here. "
-     "Some information might be missing."].
+    case get(truncated_reason) of
+        undefined ->
+            ["WARNING: The crash dump is truncated here. "
+             "Some information might be missing."];
+        Reason ->
+            ["WARNING: The crash dump is truncated here "
+             "("++Reason++"). "
+             "Some information might be missing."]
+    end.
 
 truncated_here(Tag) ->
     case get(truncated) of
@@ -692,6 +708,7 @@ val(Fd, NoExist) ->
 	{eof,[]} -> NoExist;
 	[] -> NoExist;
 	{eof,Val} -> Val;
+        "=abort:"++_ -> NoExist;
 	Val -> Val
     end.
 
@@ -787,7 +804,7 @@ do_read_file(File) ->
 			?erl_crash_dump ->
 			    reset_index_table(),
 			    insert_index(Tag,Id,N1+1),
-			    put(last_tag,{Tag,""}),
+			    put_last_tag(Tag,""),
 			    indexify(Fd,Rest,N1),
 			    end_progress(),
 			    check_if_truncated(),
@@ -831,7 +848,7 @@ indexify(Fd,Bin,N) ->
 	    <<_:Pos/binary,TagAndRest/binary>> = Bin,
 	    {Tag,Id,Rest,N1} = tag(Fd,TagAndRest,N+Pos),
 	    insert_index(Tag,Id,N1+1), % +1 to get past newline
-	    put(last_tag,{Tag,Id}),
+	    put_last_tag(Tag,Id),
 	    indexify(Fd,Rest,N1);
 	nomatch ->
 	    case progress_read(Fd) of
@@ -911,7 +928,10 @@ general_info(File) ->
 		  WholeLine -> WholeLine
 	      end,
 
-    GI = get_general_info(Fd,#general_info{created=Created}),
+    {Slogan,SysVsn} = get_slogan_and_sysvsn(Fd,[]),
+    GI = get_general_info(Fd,#general_info{created=Created,
+                                           slogan=Slogan,
+                                           system_vsn=SysVsn}),
 
     {MemTot,MemMax} = 
 	case lookup_index(?memory) of
@@ -965,12 +985,20 @@ general_info(File) ->
 		    mem_max=MemMax,
 		    instr_info=InstrInfo}.
 
+get_slogan_and_sysvsn(Fd,Acc) ->
+    case val(Fd,eof) of
+        "Slogan: " ++ SloganPart when Acc==[] ->
+            get_slogan_and_sysvsn(Fd,[SloganPart]);
+        "System version: " ++ SystemVsn ->
+            {lists:append(lists:reverse(Acc)),SystemVsn};
+        eof ->
+            {lists:append(lists:reverse(Acc)),"-1"};
+        SloganPart ->
+            get_slogan_and_sysvsn(Fd,[[$\n|SloganPart]|Acc])
+    end.
+
 get_general_info(Fd,GenInfo) ->
     case line_head(Fd) of
-	"Slogan" ->
-	    get_general_info(Fd,GenInfo#general_info{slogan=val(Fd)});
-	"System version" ->
-	    get_general_info(Fd,GenInfo#general_info{system_vsn=val(Fd)});
 	"Compiled" ->
 	    get_general_info(Fd,GenInfo#general_info{compile_time=val(Fd)});
 	"Taints" ->
@@ -1174,7 +1202,11 @@ parse_link_list("{from,"++Str,Links,Monitors,MonitoredBy) ->
 parse_link_list(", "++Rest,Links,Monitors,MonitoredBy) ->
     parse_link_list(Rest,Links,Monitors,MonitoredBy);
 parse_link_list([],Links,Monitors,MonitoredBy) ->
-    {lists:reverse(Links),lists:reverse(Monitors),lists:reverse(MonitoredBy)}.
+    {lists:reverse(Links),lists:reverse(Monitors),lists:reverse(MonitoredBy)};
+parse_link_list(Unexpected,Links,Monitors,MonitoredBy) ->
+    io:format("WARNING: found unexpected data in link list:~n~s~n",[Unexpected]),
+    parse_link_list([],Links,Monitors,MonitoredBy).
+
 
 parse_port(Str) ->
     {Port,Rest} = parse_link(Str,[]),
@@ -1813,16 +1845,16 @@ main_modinfo(_Fd,LM,_LineHead) ->
 all_modinfo(Fd,LM,LineHead) ->
     case LineHead of
 	"Current attributes" ->
-	    Str = hex_to_str(val(Fd)),
+	    Str = hex_to_str(val(Fd,"")),
 	    LM#loaded_mod{current_attrib=Str};
 	"Current compilation info" ->
-	    Str = hex_to_str(val(Fd)),
+	    Str = hex_to_str(val(Fd,"")),
 	    LM#loaded_mod{current_comp_info=Str};
 	"Old attributes" ->
-	    Str = hex_to_str(val(Fd)),
+	    Str = hex_to_str(val(Fd,"")),
 	    LM#loaded_mod{old_attrib=Str};
 	"Old compilation info" ->
-	    Str = hex_to_str(val(Fd)),
+	    Str = hex_to_str(val(Fd,"")),
 	    LM#loaded_mod{old_comp_info=Str};
 	Other ->
 	    unexpected(Fd,Other,"loaded modules info"),
@@ -1848,7 +1880,12 @@ hex_to_term([],Acc) ->
 	     Bin};
 	Term ->
 	    Term
-    end.
+    end;
+hex_to_term(Rest,Acc) ->
+    {"WARNING: The term is probably truncated!",
+     "I can not convert hex to term.",
+     Rest,list_to_binary(lists:reverse(Acc))}.
+
 
 hex_to_dec("F") -> 15;
 hex_to_dec("E") -> 14;
@@ -2159,7 +2196,8 @@ sort_allocator_types([{Name,Data}|Allocators],Acc,DoTotal) ->
     Type =
 	case string:tokens(Name,"[]") of
 	    [T,_Id] -> T;
-	    [Name] -> Name
+	    [Name] -> Name;
+            Other -> Other
 	end,
     TypeData = proplists:get_value(Type,Acc,[]),
     {NewTypeData,NewDoTotal} = sort_type_data(Type,Data,TypeData,DoTotal),
@@ -2686,6 +2724,7 @@ count_index(Tag) ->
 %%-----------------------------------------------------------------
 %% Convert tags read from crashdump to atoms used as first part of key
 %% in cdv_dump_index_table
+tag_to_atom("abort") -> ?abort;
 tag_to_atom("allocated_areas") -> ?allocated_areas;
 tag_to_atom("allocator") -> ?allocator;
 tag_to_atom("atoms") -> ?atoms;
@@ -2720,6 +2759,14 @@ tag_to_atom(UnknownTag) ->
     list_to_atom(UnknownTag).
 
 %%%-----------------------------------------------------------------
+%%% Store last tag for use when truncated, and reason if aborted
+put_last_tag(?abort,Reason) ->
+    %% Don't overwrite the real last tag
+    put(truncated_reason,Reason);
+put_last_tag(Tag,Id) ->
+    put(last_tag,{Tag,Id}).
+
+%%%-----------------------------------------------------------------
 %%% Fetch next chunk from crashdump file
 lookup_and_parse_index(File,What,ParseFun,Str) when is_list(File) ->
     Indices = lookup_index(What),
@@ -2815,7 +2862,16 @@ collect(Pids,Acc) ->
 	    update_progress(),
 	    collect(Pids,Acc);
 	{'DOWN', _Ref, process, Pid, {pmap_done,Result}} ->
-	    collect(lists:delete(Pid,Pids),[Result|Acc])
+	    collect(lists:delete(Pid,Pids),[Result|Acc]);
+        {'DOWN', _Ref, process, Pid, _Error} ->
+            Warning =
+                "WARNING: an error occured while parsing data.\n" ++
+                case get(truncated) of
+                    true -> "This might be because the dump is truncated.\n";
+                    false -> ""
+                end,
+            io:format(Warning),
+            collect(lists:delete(Pid,Pids),Acc)
     end.
 
 %%%-----------------------------------------------------------------
diff --git a/lib/observer/src/etop.erl b/lib/observer/src/etop.erl
index fcb900960b..925f4456bb 100644
--- a/lib/observer/src/etop.erl
+++ b/lib/observer/src/etop.erl
@@ -23,7 +23,7 @@
 -export([start/0, start/1, config/2, stop/0, dump/1, help/0]).
 %% Internal
 -export([update/1]).
--export([loadinfo/1, meminfo/2, getopt/2]).
+-export([loadinfo/2, meminfo/2, getopt/2]).
 
 -include("etop.hrl").
 -include("etop_defs.hrl").
@@ -319,18 +319,18 @@ output(graphical) -> exit({deprecated, "Use observer instead"});
 output(text) -> etop_txt.
 
 
-loadinfo(SysI) ->
+loadinfo(SysI,Prev) ->
     #etop_info{n_procs = Procs, 
 	       run_queue = RQ, 
 	       now = Now,
 	       wall_clock = WC,
 	       runtime = RT} = SysI,
-    Cpu = calculate_cpu_utilization(WC,RT),
+    Cpu = calculate_cpu_utilization(WC,RT,Prev#etop_info.runtime),
     Clock = io_lib:format("~2.2.0w:~2.2.0w:~2.2.0w",
 			 tuple_to_list(element(2,calendar:now_to_datetime(Now)))),
     {Cpu,Procs,RQ,Clock}.
 
-calculate_cpu_utilization({_,WC},{_,RT}) ->
+calculate_cpu_utilization({_,WC},{_,RT},_) ->
     %% Old version of observer_backend, using statistics(wall_clock)
     %% and statistics(runtime)
     case {WC,RT} of
@@ -341,15 +341,23 @@ calculate_cpu_utilization({_,WC},{_,RT}) ->
 	_ ->
 	    round(100*RT/WC)
     end;
-calculate_cpu_utilization(_,undefined) ->
+calculate_cpu_utilization(_,undefined,_) ->
     %% First time collecting - no cpu utilization has been measured
     %% since scheduler_wall_time flag is not yet on
     0;
-calculate_cpu_utilization(_,RTInfo) ->
+calculate_cpu_utilization(WC,RTInfo,undefined) ->
+    %% Second time collecting - RTInfo shows scheduler_wall_time since
+    %% flag was set to true. Faking previous values by setting
+    %% everything to zero.
+    ZeroRT = [{Id,0,0} || {Id,_,_} <- RTInfo],
+    calculate_cpu_utilization(WC,RTInfo,ZeroRT);
+calculate_cpu_utilization(_,RTInfo,PrevRTInfo) ->
     %% New version of observer_backend, using statistics(scheduler_wall_time)
-    Sum = lists:foldl(fun({_,A,T},{AAcc,TAcc}) -> {A+AAcc,T+TAcc} end,
+    Sum = lists:foldl(fun({{_, A0, T0}, {_, A1, T1}},{AAcc,TAcc}) ->
+                              {(A1 - A0)+AAcc,(T1 - T0)+TAcc}
+                      end,
 		      {0,0},
-		      RTInfo),
+		      lists:zip(PrevRTInfo,RTInfo)),
     case Sum of
 	{0,0} ->
 	    0;
diff --git a/lib/observer/src/etop_txt.erl b/lib/observer/src/etop_txt.erl
index 3b4c176478..6b8f9df24f 100644
--- a/lib/observer/src/etop_txt.erl
+++ b/lib/observer/src/etop_txt.erl
@@ -22,35 +22,35 @@
 
 %%-compile(export_all).
 -export([init/1,stop/1]).
--export([do_update/3]).
+-export([do_update/4]).
 
 -include("etop.hrl").
 -include("etop_defs.hrl").
 
--import(etop,[loadinfo/1,meminfo/2]).
+-import(etop,[loadinfo/2,meminfo/2]).
 
 -define(PROCFORM,"~-15w~-20s~8w~8w~8w~8w ~-20s~n").
 
 stop(Pid) -> Pid ! stop.
 
 init(Config) ->
-    loop(Config).
+    loop(#etop_info{},Config).
 
-loop(Config) ->
-    Info = do_update(Config),
+loop(Prev,Config) ->
+    Info = do_update(Prev,Config),
     receive 
 	stop -> stopped;
-	{dump,Fd} -> do_update(Fd,Info,Config), loop(Config); 
-	{config,_,Config1} -> loop(Config1)
-    after Config#opts.intv -> loop(Config)
+	{dump,Fd} -> do_update(Fd,Info,Prev,Config), loop(Info,Config);
+	{config,_,Config1} -> loop(Info,Config1)
+    after Config#opts.intv -> loop(Info,Config)
     end.
 
-do_update(Config) ->
+do_update(Prev,Config) ->
     Info = etop:update(Config),
-    do_update(standard_io,Info,Config).
+    do_update(standard_io,Info,Prev,Config).
 
-do_update(Fd,Info,Config) ->
-    {Cpu,NProcs,RQ,Clock} = loadinfo(Info),
+do_update(Fd,Info,Prev,Config) ->
+    {Cpu,NProcs,RQ,Clock} = loadinfo(Info,Prev),
     io:nl(Fd),
     writedoubleline(Fd),
     case Info#etop_info.memi of
diff --git a/lib/observer/src/observer_alloc_wx.erl b/lib/observer/src/observer_alloc_wx.erl
index 77609b11ce..ca54080e15 100644
--- a/lib/observer/src/observer_alloc_wx.erl
+++ b/lib/observer/src/observer_alloc_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2016. 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.
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 7c1337025f..1eaba31a3a 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -25,7 +25,7 @@
 	 wait_for_progress/0, report_progress/1,
 	 user_term/3, user_term_multiline/3,
 	 interval_dialog/4, start_timer/1, stop_timer/1,
-	 display_info/2, fill_info/2, update_info/2, to_str/1,
+	 display_info/2, display_info/3, fill_info/2, update_info/2, to_str/1,
 	 create_menus/3, create_menu_item/3,
 	 create_attrs/0,
 	 set_listctrl_col_size/2,
@@ -124,6 +124,11 @@ display_info(Frame, Info) ->
     Panel = wxPanel:new(Frame),
     wxWindow:setBackgroundStyle(Panel, ?wxBG_STYLE_SYSTEM),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
+    InfoFs = display_info(Panel, Sizer, Info),
+    wxWindow:setSizerAndFit(Panel, Sizer),
+    {Panel, Sizer, InfoFs}.
+
+display_info(Panel, Sizer, Info) ->
     wxSizer:addSpacer(Sizer, 5),
     Add = fun(BoxInfo) ->
 		  case create_box(Panel, BoxInfo) of
@@ -136,9 +141,7 @@ display_info(Frame, Info) ->
 			  []
 		  end
 	  end,
-    InfoFs = [Add(I) || I <- Info],
-    wxWindow:setSizerAndFit(Panel, Sizer),
-    {Panel, Sizer, InfoFs}.
+    [Add(I) || I <- Info].
 
 fill_info([{dynamic, Key}|Rest], Data)
   when is_atom(Key); is_function(Key) ->
@@ -254,6 +257,11 @@ to_str({func, {F,A}}) when is_atom(F), is_integer(A) ->
     lists:concat([F, "/", A]);
 to_str({func, {F,'_'}}) when is_atom(F) ->
     atom_to_list(F);
+to_str({inet, Addr}) ->
+    case inet:ntoa(Addr) of
+        {error,einval} -> to_str(Addr);
+        AddrStr -> AddrStr
+    end;
 to_str({{format,Fun},Value}) when is_function(Fun) ->
     Fun(Value);
 to_str({A, B}) when is_atom(A), is_atom(B) ->
@@ -453,14 +461,16 @@ create_box(Parent, Data) ->
 				 link_entry(Panel,Value);
 			     _ ->
 				 Value = to_str(Value0),
-				 case length(Value) > 100 of
-				     true ->
-					 Shown = lists:sublist(Value, 80),
+                                 case string:sub_word(lists:sublist(Value, 80),1,$\n) of
+                                     Value ->
+                                         %% Short string, no newlines - show all
+					 wxStaticText:new(Panel, ?wxID_ANY, Value);
+                                     Shown ->
+                                         %% Long or with newlines,
+                                         %% use tooltip to show all
 					 TCtrl = wxStaticText:new(Panel, ?wxID_ANY, [Shown,"..."]),
 					 wxWindow:setToolTip(TCtrl,wxToolTip:new(Value)),
-					 TCtrl;
-				     false ->
-					 wxStaticText:new(Panel, ?wxID_ANY, Value)
+					 TCtrl
 				 end
 			 end,
 		     wxSizer:add(Line, 10, 0), % space of size 10 horisontally
diff --git a/lib/observer/src/observer_perf_wx.erl b/lib/observer/src/observer_perf_wx.erl
index 6a1aac92c7..b0ead42e3f 100644
--- a/lib/observer/src/observer_perf_wx.erl
+++ b/lib/observer/src/observer_perf_wx.erl
@@ -383,8 +383,8 @@ lmax(MState, Values, State) ->
 init_data(runq, {stats, _, T0, _, _}) -> {mk_max(),lists:sort(T0)};
 init_data(io,   {stats, _, _, {{_,In0}, {_,Out0}}, _}) -> {mk_max(), {In0,Out0}};
 init_data(memory, _) -> {mk_max(), info(memory, undefined)};
-init_data(alloc, _) -> {mk_max(), ok};
-init_data(utilz, _) -> {mk_max(), ok}.
+init_data(alloc, _) -> {mk_max(), unused};
+init_data(utilz, _) -> {mk_max(), unused}.
 
 info(runq, {stats, _, T0, _, _}) -> lists:seq(1, length(T0));
 info(memory, _) -> [total, processes, atom, binary, code, ets];
@@ -410,11 +410,11 @@ collect_data(memory, {stats, _, _, _, MemInfo}, {Max, MemTypes}) ->
 collect_data(alloc, MemInfo, Max) ->
     Vs = [Carrier || {_Type,_Block,Carrier} <- MemInfo],
     Sample = list_to_tuple(Vs),
-    {Sample, lmax(Max, Vs, Sample)};
+    {Sample, {lmax(Max, Vs, Sample),unused}};
 collect_data(utilz, MemInfo, Max) ->
     Vs = [round(100*Block/Carrier) || {_Type,Block,Carrier} <- MemInfo],
     Sample = list_to_tuple(Vs),
-    {Sample, lmax(Max,Vs,Sample)}.
+    {Sample, {lmax(Max,Vs,Sample),unused}}.
 
 calc_delta([{Id, WN, TN}|Ss], [{Id, WP, TP}|Ps]) ->
     [100*(WN-WP) div (TN-TP)|calc_delta(Ss, Ps)];
diff --git a/lib/observer/src/observer_port_wx.erl b/lib/observer/src/observer_port_wx.erl
index 3b788642cc..53ba3fa607 100644
--- a/lib/observer/src/observer_port_wx.erl
+++ b/lib/observer/src/observer_port_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2016. 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.
@@ -52,7 +52,13 @@
 	 slot,
 	 id_str,
 	 links,
-	 monitors}).
+	 monitors,
+	 monitored_by,
+         parallelism,
+         locking,
+         queue_size,
+         memory,
+         inet}).
 
 -record(opt, {sort_key=2,
 	      sort_incr=true
@@ -358,7 +364,13 @@ list_to_portrec(PL) ->
 	  links = proplists:get_value(links, PL, []),
 	  name = proplists:get_value(registered_name, PL, []),
 	  monitors = proplists:get_value(monitors, PL, []),
-	  controls = proplists:get_value(name, PL)}.
+	  monitored_by = proplists:get_value(monitored_by, PL, []),
+	  controls = proplists:get_value(name, PL),
+          parallelism = proplists:get_value(parallelism, PL),
+          locking = proplists:get_value(locking, PL),
+          queue_size = proplists:get_value(queue_size, PL, 0),
+          memory = proplists:get_value(memory, PL, 0),
+          inet = proplists:get_value(inet, PL, [])}.
 
 portrec_to_list(#port{id = Id,
 		      slot = Slot,
@@ -366,14 +378,26 @@ portrec_to_list(#port{id = Id,
 		      links = Links,
 		      name = Name,
 		      monitors = Monitors,
-		      controls = Controls}) ->
+                      monitored_by = MonitoredBy,
+		      controls = Controls,
+                      parallelism = Parallelism,
+                      locking = Locking,
+                      queue_size = QueueSize,
+                      memory = Memory,
+                      inet = Inet}) ->
     [{id,Id},
      {slot,Slot},
      {connected,Connected},
      {links,Links},
      {name,Name},
      {monitors,Monitors},
-     {controls,Controls}].
+     {monitored_by,MonitoredBy},
+     {controls,Controls},
+     {parallelism,Parallelism},
+     {locking,Locking},
+     {queue_size,QueueSize},
+     {memory,Memory} |
+     Inet].
 
 display_port_info(Parent, PortRec, Opened) ->
     PortIdStr = PortRec#port.id_str,
@@ -391,29 +415,86 @@ do_display_port_info(Parent0, PortRec) ->
     Title = "Port Info: " ++ PortRec#port.id_str,
     Frame = wxMiniFrame:new(Parent, ?wxID_ANY, Title,
 			    [{style, ?wxSYSTEM_MENU bor ?wxCAPTION
-				  bor ?wxCLOSE_BOX bor ?wxRESIZE_BORDER}]),
-
+				  bor ?wxCLOSE_BOX bor ?wxRESIZE_BORDER},
+                             {size,{600,400}}]),
+    ScrolledWin = wxScrolledWindow:new(Frame,[{style,?wxHSCROLL bor ?wxVSCROLL}]),
+    wxScrolledWindow:enableScrolling(ScrolledWin,true,true),
+    wxScrolledWindow:setScrollbars(ScrolledWin,20,20,0,0),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    wxWindow:setSizer(ScrolledWin,Sizer),
     Port = portrec_to_list(PortRec),
     Fields0 = port_info_fields(Port),
-    {_FPanel, _Sizer, _UpFields} = observer_lib:display_info(Frame, Fields0),
+    _UpFields = observer_lib:display_info(ScrolledWin, Sizer, Fields0),
     wxFrame:center(Frame),
     wxFrame:connect(Frame, close_window, [{skip, true}]),
     wxFrame:show(Frame),
     Frame.
 
 
-port_info_fields(Port) ->
+
+port_info_fields(Port0) ->
+    {InetStruct,Port} = inet_extra_fields(Port0),
     Struct =
 	[{"Overview",
-	  [{"Name",             name},
+	  [{"Registered Name",  name},
 	   {"Connected",        {click,connected}},
 	   {"Slot",             slot},
-	   {"Controls",         controls}]},
+	   {"Controls",         controls},
+           {"Parallelism",      parallelism},
+           {"Locking",          locking},
+           {"Queue Size",       {bytes,queue_size}},
+           {"Memory",           {bytes,memory}}]},
 	 {scroll_boxes,
 	  [{"Links",1,{click,links}},
-	   {"Monitors",1,{click,filter_monitor_info()}}]}],
+	   {"Monitors",1,{click,filter_monitor_info()}},
+	   {"Monitored by",1,{click,monitored_by}}]} | InetStruct],
     observer_lib:fill_info(Struct, Port).
 
+inet_extra_fields(Port) ->
+    Statistics = proplists:get_value(statistics,Port,[]),
+    Options = proplists:get_value(options,Port,[]),
+    Struct =
+        case proplists:get_value(controls,Port) of
+            Inet when Inet=="tcp_inet"; Inet=="udp_inet"; Inet=="sctp_inet" ->
+                [{"Inet",
+                  [{"Local Address",      {inet,local_address}},
+                   {"Local Port Number",  local_port},
+                   {"Remote Address",     {inet,remote_address}},
+                   {"Remote Port Number", remote_port}]},
+                 {"Statistics",
+                  [stat_name_and_unit(Key) || {Key,_} <- Statistics]},
+                 {"Options",
+                  [{atom_to_list(Key),Key} || {Key,_} <- Options]}];
+            _ ->
+                []
+        end,
+    Port1 = lists:keydelete(statistics,1,Port),
+    Port2 = lists:keydelete(options,1,Port1),
+    {Struct,Port2 ++ Statistics ++ Options}.
+
+stat_name_and_unit(recv_avg) ->
+    {"Average package size received", {bytes,recv_avg}};
+stat_name_and_unit(recv_cnt) ->
+    {"Number of packets received", recv_cnt};
+stat_name_and_unit(recv_dvi) ->
+    {"Average packet size deviation received", {bytes,recv_dvi}};
+stat_name_and_unit(recv_max) ->
+    {"Largest packet received", {bytes,recv_max}};
+stat_name_and_unit(recv_oct) ->
+    {"Total received", {bytes,recv_oct}};
+stat_name_and_unit(send_avg) ->
+    {"Average packet size sent", {bytes, send_avg}};
+stat_name_and_unit(send_cnt) ->
+    {"Number of packets sent", send_cnt};
+stat_name_and_unit(send_max) ->
+    {"Largest packet sent", {bytes, send_max}};
+stat_name_and_unit(send_oct) ->
+    {"Total sent", {bytes, send_oct}};
+stat_name_and_unit(send_pend) ->
+    {"Data waiting to be sent from driver", {bytes,send_pend}};
+stat_name_and_unit(Key) ->
+    {atom_to_list(Key), Key}.
+
 filter_monitor_info() ->
     fun(Data) ->
 	    Ms = proplists:get_value(monitors, Data),
diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl
index ee6829b847..f07b9e295a 100644
--- a/lib/observer/src/observer_pro_wx.erl
+++ b/lib/observer/src/observer_pro_wx.erl
@@ -511,7 +511,13 @@ table_holder(#holder{info=Info, attrs=Attrs,
 	    table_holder(S0);
 	{dump, Fd} ->
 	    EtopInfo = (S0#holder.etop)#etop_info{procinfo=array:to_list(Info)},
-	    etop_txt:do_update(Fd, EtopInfo, #opts{node=Node}),
+            %% The empty #etop_info{} below is a dummy previous info
+            %% value. It is used by etop to calculate the scheduler
+            %% utilization since last update. When dumping to file,
+            %% there is no previous measurement to use, so we just add
+            %% a dummy here, and the value shown will be since the
+            %% tool was started.
+	    etop_txt:do_update(Fd, EtopInfo, #etop_info{}, #opts{node=Node}),
 	    file:close(Fd),
 	    table_holder(S0);
 	stop ->
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index 620979dcc9..c13b164ff9 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -434,7 +434,7 @@ get_gc_info(Arg) ->
 filter_monitor_info() ->
     fun(Data) ->
 	    Ms = proplists:get_value(monitors, Data),
-	    [Pid || {process, Pid} <- Ms]
+	    [Id || {_Type, Id} <- Ms] % Type is process or port
     end.
 
 stringify_bins(Data) ->
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 73ed890802..8df69c6624 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -420,6 +420,10 @@ special(File,Procs) ->
 	%% ".trunc" ->
 	%%     %% ????
 	%%     ok;
+        ".trunc.bytes" ->
+            {ok,_,[TW]} = crashdump_viewer:general_info(),
+            {match,_} = re:run(TW,"CRASH DUMP SIZE LIMIT REACHED"),
+            ok;
 	_ ->
 	    ok
     end,
@@ -481,7 +485,11 @@ do_create_dumps(DataDir,Rel) ->
 	current ->
 	    CD3 = dump_with_args(DataDir,Rel,"instr","+Mim true"),
 	    CD4 = dump_with_strange_module_name(DataDir,Rel,"strangemodname"),
-	    {[CD1,CD2,CD3,CD4], DosDump};
+            Bytes = rand:uniform(300000) + 100,
+            CD5 = dump_with_args(DataDir,Rel,"trunc.bytes",
+                                 "-env ERL_CRASH_DUMP_BYTES " ++
+                                     integer_to_list(Bytes)),
+	    {[CD1,CD2,CD3,CD4,CD5], DosDump};
 	_ ->
 	    {[CD1,CD2], DosDump}
     end.
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index 444089151e..dd23b08484 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.2.2
+OBSERVER_VSN = 2.3