From 74b7b4192193397aabc563872ef6061cddd595a5 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Fri, 9 Jun 2017 18:08:53 +0200
Subject: [etop] Fix handling of unicode atoms

Print function names and registered names with ~tw.
Open dump file with encoding utf8.
---
 lib/observer/src/etop.erl     |  4 ++--
 lib/observer/src/etop_txt.erl | 39 ++++++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/lib/observer/src/etop.erl b/lib/observer/src/etop.erl
index 3d56a1e64d..f0990f1f25 100644
--- a/lib/observer/src/etop.erl
+++ b/lib/observer/src/etop.erl
@@ -81,7 +81,7 @@ check_runtime_config(accumulate,A) when A=:=true; A=:=false -> ok;
 check_runtime_config(_Key,_Value) -> error.
 
 dump(File) ->
-    case file:open(File,[write]) of
+    case file:open(File,[write,{encoding,utf8}]) of
 	{ok,Fd} -> etop_server ! {dump,Fd};
 	Error -> Error
     end.
@@ -161,7 +161,7 @@ data_handler(Reader, Opts) ->
 	{'EXIT', EPid, Reason} when EPid == Opts#opts.out_proc ->
 	    case Reason of
 		normal -> ok;
-		_ -> io:format("Output server crashed: ~p~n",[Reason])
+		_ -> io:format("Output server crashed: ~tp~n",[Reason])
 	    end,
 	    stop(Opts),
 	    out_proc_stopped;
diff --git a/lib/observer/src/etop_txt.erl b/lib/observer/src/etop_txt.erl
index 6b8f9df24f..f772d5cc6d 100644
--- a/lib/observer/src/etop_txt.erl
+++ b/lib/observer/src/etop_txt.erl
@@ -29,8 +29,6 @@
 
 -import(etop,[loadinfo/2,meminfo/2]).
 
--define(PROCFORM,"~-15w~-20s~8w~8w~8w~8w ~-20s~n").
-
 stop(Pid) -> Pid ! stop.
 
 init(Config) ->
@@ -50,6 +48,7 @@ do_update(Prev,Config) ->
     do_update(standard_io,Info,Prev,Config).
 
 do_update(Fd,Info,Prev,Config) ->
+    Encoding = encoding(Fd),
     {Cpu,NProcs,RQ,Clock} = loadinfo(Info,Prev),
     io:nl(Fd),
     writedoubleline(Fd),
@@ -73,7 +72,7 @@ do_update(Fd,Info,Prev,Config) ->
     io:nl(Fd),
     writepinfo_header(Fd),
     writesingleline(Fd),
-    writepinfo(Fd,Info#etop_info.procinfo),
+    writepinfo(Fd,Info#etop_info.procinfo,Encoding),
     writedoubleline(Fd),
     io:nl(Fd),
     Info.
@@ -93,19 +92,37 @@ writepinfo(Fd,[#etop_proc_info{pid=Pid,
 			       runtime=Time,
 			       cf=MFA,
 			       mq=MQ}
-	       |T]) ->
-    io:fwrite(Fd,?PROCFORM,[Pid,to_list(Name),Time,Reds,Mem,MQ,formatmfa(MFA)]), 
-    writepinfo(Fd,T);
-writepinfo(_Fd,[]) ->
+	       |T],
+           Encoding) ->
+    io:fwrite(Fd,proc_format(Encoding),
+              [Pid,to_list(Name,Encoding),Time,Reds,Mem,MQ,
+               formatmfa(MFA,Encoding)]),
+    writepinfo(Fd,T,Encoding);
+writepinfo(_Fd,[],_) ->
     ok.
 
 
-formatmfa({M, F, A}) ->
+formatmfa({M, F, A},latin1) ->
     io_lib:format("~w:~w/~w",[M, F, A]);
-formatmfa(Other) ->
+formatmfa({M, F, A},_) ->
+    io_lib:format("~w:~tw/~w",[M, F, A]);
+formatmfa(Other,_) ->
     %% E.g. when running hipe - the current_function for some
     %% processes will be 'undefined'
     io_lib:format("~w",[Other]).
 
-to_list(Name) when is_atom(Name) -> atom_to_list(Name);
-to_list({_M,_F,_A}=MFA) -> formatmfa(MFA).
+to_list(Name,_) when is_atom(Name) -> atom_to_list(Name);
+to_list({_M,_F,_A}=MFA,Encoding) -> formatmfa(MFA,Encoding).
+
+encoding(Device) ->
+    case io:getopts(Device) of
+        List when is_list(List) ->
+            proplists:get_value(encoding,List,latin1);
+        _ ->
+            latin1
+    end.
+
+proc_format(latin1) ->
+    "~-15w~-20s~8w~8w~8w~8w ~-20s~n";
+proc_format(_) ->
+    "~-15w~-20ts~8w~8w~8w~8w ~-20ts~n".
-- 
cgit v1.2.3