observer: Improve handling of Unicode

3 files changed, 49 insertions, 3 deletions

diff --git a/lib/observer/test/Makefile b/lib/observer/test/Makefile
index 6100af5e17..fcb1b73911 100644
--- a/lib/observer/test/Makefile
+++ b/lib/observer/test/Makefile
@@ -27,7 +27,8 @@ MODULES =  \
 	ttb_SUITE \
 	client \
 	server \
-	crashdump_helper
+	crashdump_helper \
+	crashdump_helper_unicode
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -46,7 +47,7 @@ RELSYSDIR = $(RELEASE_PATH)/observer_test
 # FLAGS
 # ----------------------------------------------------
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS +=
+ERL_COMPILE_FLAGS += +nowarn_export_all
 
 EBIN = .
 
diff --git a/lib/observer/test/crashdump_helper_unicode.erl b/lib/observer/test/crashdump_helper_unicode.erl
new file mode 100644
index 0000000000..60c3d20315
--- /dev/null
+++ b/lib/observer/test/crashdump_helper_unicode.erl
@@ -0,0 +1,22 @@
+-module(crashdump_helper_unicode).
+-behaviour(gen_server).
+-export([start/0, init/1, handle_call/3, handle_cast/2]).
+-record(state, {s,a,b,lb}).
+
+start() ->
+    gen_server:start({local, 'unicode_reg_name_αβ'}, ?MODULE, [], []).
+
+init([]) ->
+    process_flag(trap_exit, true),
+    ets:new('tab_αβ',[set,named_table]),
+    Bin = <<"bin αβ"/utf8>>,
+    LongBin = <<"long bin αβ - a utf8 binary which can be expanded αβ"/utf8>>,
+    {ok, #state{s = "unicode_string_αβ",
+                a = 'unicode_atom_αβ',
+                b = Bin,
+                lb = LongBin}}.
+
+handle_call(_Info, _From, State) ->
+    {reply, ok, State}.
+handle_cast(_Info, State) ->
+    {noreply, State}.
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 1fd94ffb3c..77cf086d4b 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -427,6 +427,18 @@ special(File,Procs) ->
             {ok,_,[TW]} = crashdump_viewer:general_info(),
             {match,_} = re:run(TW,"CRASH DUMP SIZE LIMIT REACHED"),
             ok;
+        ".unicode" ->
+            #proc{pid=Pid0} =
+                lists:keyfind("'unicode_reg_name_αβ'",#proc.name,Procs),
+            Pid = pid_to_list(Pid0),
+	    {ok,#proc{},[]} = crashdump_viewer:proc_details(Pid),
+            io:format("  unicode registered name ok",[]),
+
+	    {ok,[#ets_table{id="'tab_αβ'",name="'tab_αβ'"}],[]} =
+                crashdump_viewer:ets_tables(Pid),
+            io:format("  unicode table name ok",[]),
+
+            ok;
 	_ ->
 	    ok
     end,
@@ -492,7 +504,8 @@ do_create_dumps(DataDir,Rel) ->
             CD5 = dump_with_args(DataDir,Rel,"trunc.bytes",
                                  "-env ERL_CRASH_DUMP_BYTES " ++
                                      integer_to_list(Bytes)),
-	    {[CD1,CD2,CD3,CD4,CD5], DosDump};
+            CD6 = dump_with_unicode_atoms(DataDir,Rel,"unicode"),
+	    {[CD1,CD2,CD3,CD4,CD5,CD6], DosDump};
 	_ ->
 	    {[CD1,CD2], DosDump}
     end.
@@ -573,6 +586,16 @@ dump_with_strange_module_name(DataDir,Rel,DumpName) ->
     ?t:stop_node(n1),
     CD.
 
+dump_with_unicode_atoms(DataDir,Rel,DumpName) ->
+    Opt = rel_opt(Rel),
+    Pz = "-pz \"" ++ filename:dirname(code:which(?MODULE)) ++ "\"",
+    PzOpt = [{args,Pz}],
+    {ok,N1} = ?t:start_node(n1,peer,Opt ++ PzOpt),
+    {ok,_Pid} = rpc:call(N1,crashdump_helper_unicode,start,[]),
+    CD = dump(N1,DataDir,Rel,DumpName),
+    ?t:stop_node(n1),
+    CD.
+
 dump(Node,DataDir,Rel,DumpName) ->
     Crashdump = filename:join(DataDir, dump_prefix(Rel)++DumpName),
     rpc:call(Node,os,putenv,["ERL_CRASH_DUMP",Crashdump]),