observer: Improve handling of Unicode

1 files changed, 17 insertions, 21 deletions

diff --git a/lib/observer/src/etop_txt.erl b/lib/observer/src/etop_txt.erl
index 183641119a..cd3ec62c13 100644
--- a/lib/observer/src/etop_txt.erl
+++ b/lib/observer/src/etop_txt.erl
@@ -48,7 +48,6 @@ 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),
@@ -72,7 +71,7 @@ do_update(Fd,Info,Prev,Config) ->
     io:nl(Fd),
     writepinfo_header(Fd),
     writesingleline(Fd),
-    writepinfo(Fd,Info#etop_info.procinfo,Encoding),
+    writepinfo(Fd,Info#etop_info.procinfo,modifier(Fd)),
     writedoubleline(Fd),
     io:nl(Fd),
     Info.
@@ -93,26 +92,27 @@ writepinfo(Fd,[#etop_proc_info{pid=Pid,
 			       cf=MFA,
 			       mq=MQ}
 	       |T],
-           Encoding) ->
-    io:fwrite(Fd,proc_format(Encoding),
-              [Pid,to_list(Name,Encoding),Time,Reds,Mem,MQ,
-               formatmfa(MFA,Encoding)]),
-    writepinfo(Fd,T,Encoding);
+           Modifier) ->
+    io:fwrite(Fd,proc_format(Modifier),
+              [Pid,to_string(Name,Modifier),Time,Reds,Mem,MQ,
+               to_string(MFA,Modifier)]),
+    writepinfo(Fd,T,Modifier);
 writepinfo(_Fd,[],_) ->
     ok.
 
+proc_format(Modifier) ->
+    "~-15w~-20"++Modifier++"s~8w~8w~8w~8w ~-20"++Modifier++"s~n".
 
-formatmfa({M, F, A},latin1) ->
-    io_lib:format("~w:~w/~w",[M, F, A]);
-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_string({M,F,A},Modifier) ->
+    io_lib:format("~w:~"++Modifier++"w/~w",[M,F,A]);
+to_string(Other,Modifier) ->
+    io_lib:format("~"++Modifier++"w",[Other]).
 
-to_list(Name,_) when is_atom(Name) -> atom_to_list(Name);
-to_list({_M,_F,_A}=MFA,Encoding) -> formatmfa(MFA,Encoding).
+modifier(Device) ->
+    case encoding(Device) of
+        latin1 -> "";
+        _ -> "t"
+    end.
 
 encoding(Device) ->
     case io:getopts(Device) of
@@ -122,7 +122,3 @@ encoding(Device) ->
             latin1
     end.
 
-proc_format(latin1) ->
-    "~-15w~-20s~8w~8w~8w~8w ~-20s~n";
-proc_format(_) ->
-    "~-15w~-20ts~8w~8w~8w~8w ~-20ts~n".