et: Improve handling of Unicode

4 files changed, 44 insertions, 43 deletions

diff --git a/lib/et/src/et_collector.erl b/lib/et/src/et_collector.erl
index aba90b0be1..b0f016a8ea 100644
--- a/lib/et/src/et_collector.erl
+++ b/lib/et/src/et_collector.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2017. 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.
@@ -750,7 +750,7 @@ next_iterate(TH, Prev = first, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): First ~p~n", [?MODULE, ?LINE, Error]),
+            io:format("~p(~p): First ~tp~n", [?MODULE, ?LINE, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         First ->
             lookup_and_apply(TH, Prev, First, Limit, -1, Fun, Acc)
@@ -761,7 +761,7 @@ next_iterate(TH, Prev = last, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): Last ~p~n", [?MODULE, ?LINE, Error]),
+            io:format("~p(~p): Last ~tp~n", [?MODULE, ?LINE, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         Last ->
             lookup_and_apply(TH, Prev, Last, Limit, -1, Fun, Acc)
@@ -773,7 +773,7 @@ next_iterate(TH, Prev, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): Next ~p -> ~p~n", [?MODULE, ?LINE, Key, Error]),
+            io:format("~p(~p): Next ~tp -> ~tp~n", [?MODULE, ?LINE, Key, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         Next ->
             lookup_and_apply(TH, Prev, Next, Limit, -1, Fun, Acc)
@@ -785,7 +785,7 @@ prev_iterate(TH, Prev = first, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): First ~p~n", [?MODULE, ?LINE, Error]),
+            io:format("~p(~p): First ~tp~n", [?MODULE, ?LINE, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         First ->
             lookup_and_apply(TH, Prev, First, Limit, 1, Fun, Acc)
@@ -796,7 +796,7 @@ prev_iterate(TH, Prev = last, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): Last ~p~n", [?MODULE, ?LINE, Error]),
+            io:format("~p(~p): Last ~tp~n", [?MODULE, ?LINE, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         Last ->
             lookup_and_apply(TH, Prev, Last, Limit, 1, Fun, Acc)
@@ -808,7 +808,7 @@ prev_iterate(TH, Prev, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): Prev ~p -> ~p~n", [?MODULE, ?LINE, Key, Error]),
+            io:format("~p(~p): Prev ~tp -> ~tp~n", [?MODULE, ?LINE, Key, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         Next ->
             lookup_and_apply(TH, Prev, Next, Limit, 1, Fun, Acc)
@@ -1049,7 +1049,7 @@ handle_call(stop, _From, S) ->
     end,
     {stop, shutdown, ok, S};
 handle_call(Request, From, S) ->
-    ok = error_logger:format("~p(~p): handle_call(~p, ~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_call(~tp, ~tp, ~tp)~n",
                              [?MODULE, self(), Request, From, S]),
     reply({error, {bad_request, Request}}, S).
 
@@ -1061,7 +1061,7 @@ handle_call(Request, From, S) ->
 %%----------------------------------------------------------------------
 
 handle_cast(Msg, S) ->
-    ok = error_logger:format("~p(~p): handle_cast(~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_cast(~tp, ~tp)~n",
                              [?MODULE, self(), Msg, S]),
     noreply(S).
 
@@ -1083,18 +1083,18 @@ handle_info({nodeup, Node}, S) ->
             S2 = listen_on_trace_port(Node, Port, S),
 	    noreply(S2);
         {error, Reason} when Reason =:= already_started->
-            ok = error_logger:format("~p(~p): producer ignored(~p:~p):~n    ~p~n",
+            ok = error_logger:format("~p(~p): producer ignored(~p:~p):~n    ~tp~n",
                                      [?MODULE, self(), Node, Port, Reason]),
             S2 = S#state{trace_port = Port + 1},
             noreply(S2);
         {badrpc, Reason} ->
-            ok = error_logger:format("~p(~p): producer ignored(~p:~p):~n    ~p~n",
+            ok = error_logger:format("~p(~p): producer ignored(~p:~p):~n    ~tp~n",
                                      [?MODULE, self(), Node, Port, Reason]),
             S2 = S#state{trace_port = Port + 1},
             noreply(S2);
         {error, Reason} ->
             self() ! {nodeup, Node},
-            ok = error_logger:format("~p(~p): producer retry(~p:~p):~n     ~p~n",
+            ok = error_logger:format("~p(~p): producer retry(~p:~p):~n     ~tp~n",
                                      [?MODULE, self(), Node, Port, Reason]),
             S2 = S#state{trace_port = Port + 1},
             noreply(S2)
@@ -1125,12 +1125,12 @@ handle_info(Info = {'EXIT', Pid, Reason}, S) ->
 	    opt_unlink(S#state.parent_pid),
 	    {stop, Reason, S};
         false ->
-            ok = error_logger:format("~p(~p): handle_info(~p, ~p)~n",
+            ok = error_logger:format("~p(~p): handle_info(~tp, ~tp)~n",
                                      [?MODULE, self(), Info, S]),
             noreply(S)
     end;
 handle_info(Info, S) ->
-    ok = error_logger:format("~p(~p): handle_info(~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_info(~tp, ~tp)~n",
                              [?MODULE, self(), Info, S]),
     noreply(S).
 
@@ -1143,12 +1143,12 @@ listen_on_trace_port(Node, Port, S) ->
             S#state{trace_nodes = [Node | S#state.trace_nodes],
 		    trace_port  = Port + 1};
         {'EXIT', Reason} when Reason =:= already_started->
-            ok = error_logger:format("~p(~p): consumer ignored(~p:~p): ~p~n",
+            ok = error_logger:format("~p(~p): consumer ignored(~p:~p): ~tp~n",
                                      [?MODULE, self(), Node, Port, Reason]),
             S#state{trace_port = Port + 1};
         {'EXIT', Reason} ->
             self() ! {nodeup, Node},
-            ok = error_logger:format("~p(~p): consumer retry(~p:~p):~n     ~p~n",
+            ok = error_logger:format("~p(~p): consumer retry(~p:~p):~n     ~tp~n",
                                      [?MODULE, self(), Node, Port, Reason]),
             S#state{trace_port = Port + 1}
     end.
@@ -1247,7 +1247,7 @@ file_open(F) ->
         {ok, _} ->
             {ok, Fd};
         {repaired, _, _, BadBytes} ->
-            ok = error_logger:format("~p: Skipped ~p bad bytes in file: ~p~n",
+            ok = error_logger:format("~p: Skipped ~p bad bytes in file: ~tp~n",
                                      [?MODULE, BadBytes, F#file.name]),
             {ok, Fd};
         {error,Reason} ->
diff --git a/lib/et/src/et_selector.erl b/lib/et/src/et_selector.erl
index a0297c21d1..35db07cd99 100644
--- a/lib/et/src/et_selector.erl
+++ b/lib/et/src/et_selector.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2017. 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.
@@ -208,7 +208,7 @@ parse_event(Mod, Trace) ->
 					  {to, undefined},
 					  {drop, NumberOfDroppedItems}]}};
         _ ->
-            error_logger:format("~p(~p): Ignoring unknown trace type -> ~p~n~n",
+            error_logger:format("~p(~p): Ignoring unknown trace type -> ~tp~n~n",
                                 [?MODULE, ?LINE, Trace]),
             false
     end.
@@ -258,7 +258,7 @@ parse_seq_event(Trace, ParsedTS, ReportedTS, Label, Info) ->
 					  {serial, Serial},
 					  {user_info, UserInfo}]}};
         _ ->
-            error_logger:format("~p(~p): Ignoring unknown trace type -> ~p~n~n",
+            error_logger:format("~p(~p): Ignoring unknown trace type -> ~tp~n~n",
                                 [?MODULE, ?LINE, Trace]),
             false
     end.
@@ -590,7 +590,7 @@ parse_event(Mod, Trace, ParsedTS, ReportedTS, From, Label, Contents) ->
                                           {to, From},
                                           {gc_items, GcKeyValueList}]}};
         _ ->
-            error_logger:format("~p(~p): Ignoring unknown trace type -> ~p~n~n",
+            error_logger:format("~p(~p): Ignoring unknown trace type -> ~tp~n~n",
                                 [?MODULE, ?LINE, Trace]),
             false
     end.
diff --git a/lib/et/src/et_wx_contents_viewer.erl b/lib/et/src/et_wx_contents_viewer.erl
index 247dd4c7ba..bca517317e 100644
--- a/lib/et/src/et_wx_contents_viewer.erl
+++ b/lib/et/src/et_wx_contents_viewer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2017. 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.
@@ -213,7 +213,7 @@ init([S]) when is_record(S, state) ->
 %%----------------------------------------------------------------------
 
 handle_call(Request, From, S) ->
-    ok = error_logger:format("~p(~p): handle_call(~p, ~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_call(~tp, ~tp, ~tp)~n",
                              [?MODULE, self(), Request, From, S]),
     Reply = {error, {bad_request, Request}},
     {reply, Reply, S}.
@@ -226,7 +226,7 @@ handle_call(Request, From, S) ->
 %%----------------------------------------------------------------------
 
 handle_cast(Msg, S) ->
-    ok = error_logger:format("~p(~p): handle_cast(~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_cast(~tp, ~tp)~n",
                              [?MODULE, self(), Msg, S]),
     {noreply, S}.
 
@@ -272,10 +272,11 @@ handle_event(#wx{id = Id,
                 end,
             FileName = lists:flatten(["et_contents_viewer_", now_to_string(TimeStamp), ".txt"]),
 	    Style = ?wxFD_SAVE bor ?wxFD_OVERWRITE_PROMPT,
-	    Msg = "Select a file to the events to",
+	    Msg = "Select a file to save events to",
 	    case select_file(S#state.frame, Msg, filename:absname(FileName), Style) of
 		{ok, FileName2} ->
-		    Bin = list_to_binary(event_to_string(Event, S#state.event_order)),
+                    EventString = event_to_string(Event, S#state.event_order),
+		    Bin = unicode:characters_to_binary(EventString),
 		    ok = file:write_file(FileName2, Bin);
 		cancel ->
 		    ok
@@ -381,7 +382,7 @@ handle_event(#wx{event = #wxSize{size = {W, H}}}, S) ->
     S2 = S#state{width = W, height = H},
     {noreply, S2};
 handle_event(Wx = #wx{}, S) ->
-    io:format("~p got an unexpected event: ~p\n", [self(), Wx]),
+    io:format("~p got an unexpected event: ~tp\n", [self(), Wx]),
     {noreply, S}.
 
 %%----------------------------------------------------------------------
@@ -405,7 +406,7 @@ handle_info({'EXIT', Pid, Reason}, S) ->
             {noreply, S}
     end;
 handle_info(Info, S) ->
-    ok = error_logger:format("~p(~p): handle_info(~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_info(~tp, ~tp)~n",
                              [?MODULE, self(), Info, S]),
     {noreply, S}.
 
@@ -606,8 +607,8 @@ do_config_editor(Editor, Event, _Colour, TsKey) ->
 %%%----------------------------------------------------------------------
 
 term_to_string(Term) ->
-    case catch io_lib:format("~s", [Term]) of
-        {'EXIT', _} -> io_lib:format("~p", [Term]);
+    case catch io_lib:format("~ts", [Term]) of
+        {'EXIT', _} -> io_lib:format("~tp", [Term]);
         GoodString  -> GoodString
     end.
 
@@ -659,7 +660,7 @@ pad_string(Int, MinLen, Char, Dir) when is_integer(Int) ->
 pad_string(Atom, MinLen, Char, Dir) when is_atom(Atom) ->
     pad_string(atom_to_list(Atom), MinLen, Char, Dir);
 pad_string(String, MinLen, Char, Dir) when is_integer(MinLen), MinLen >= 0 ->
-    Len = length(String),
+    Len = string:length(String),
     case {Len >= MinLen, Dir} of
         {true, _} ->
             String;
diff --git a/lib/et/src/et_wx_viewer.erl b/lib/et/src/et_wx_viewer.erl
index 9613299e6b..4dd44e7a4c 100644
--- a/lib/et/src/et_wx_viewer.erl
+++ b/lib/et/src/et_wx_viewer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2017. 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.
@@ -352,7 +352,7 @@ handle_call({open_event, N}, _From, S) when is_integer(N), N > 0->
     Reply = do_open_event(S, N),
     reply(Reply, S);
 handle_call(Request, From, S) ->
-    ok = error_logger:format("~p(~p): handle_call(~p, ~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_call(~tp, ~tp, ~tp)~n",
 			     [?MODULE, self(), Request, From, S]),
     Reply = {error, {bad_request, Request}},
     reply(Reply, S).
@@ -365,7 +365,7 @@ handle_call(Request, From, S) ->
 %%----------------------------------------------------------------------
 
 handle_cast(Msg, S) ->
-    ok = error_logger:format("~p(~p): handle_cast(~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_cast(~tp, ~tp)~n",
 			     [?MODULE, self(), Msg, S]),
     noreply(S).
 
@@ -803,7 +803,7 @@ handle_info(timeout, S) ->
 handle_info({'EXIT', Pid, Reason}, S) ->
     if
 	Pid =:= S#state.collector_pid ->
-	    io:format("collector died: ~p\n\n", [Reason]),
+	    io:format("collector died: ~tp\n\n", [Reason]),
 	    wxFrame:destroy(S#state.frame),
 	    {stop, Reason, S};
 	Pid =:= S#state.parent_pid ->
@@ -853,10 +853,10 @@ handle_info(#wx{event = #wxPaint{}}, S) ->
     S2 = refresh_main_window(S),
     noreply(S2);
 handle_info(#wx{event = #wxMouse{type = T, x=X,y=Y}}, S) ->
-    io:format("~p ~p\n", [T, {X,Y}]),
+    io:format("~tp ~tp\n", [T, {X,Y}]),
     noreply(S);
 handle_info(Info, S) ->
-    ok = error_logger:format("~p(~p): handle_info(~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_info(~tp, ~tp)~n",
 			     [?MODULE, self(), Info, S]),
     noreply(S).
 
@@ -1162,7 +1162,7 @@ open_viewer(Scale, FilterName, Actors, S) ->
 	    %% unlink(ViewerPid),
 	    ok;
 	{error, Reason} ->
-	    ok = error_logger:format("~p: Failed to start a new window: ~p~n",
+	    ok = error_logger:format("~p: Failed to start a new window: ~tp~n",
 				     [?MODULE, Reason])
     end.
 
@@ -1393,7 +1393,7 @@ create_filter_menu(S=#state{filter_menu = {Menu,Data}}, ActiveFilterName, Filter
 			    wxMenu:delete(Menu,I)
 			catch
 			    _:Reason ->
-				io:format("Could not delete item: ~p, because ~p.\n", [I, Reason])
+				io:format("Could not delete item: ~tp, because ~tp.\n", [I, Reason])
 			end
 		end, 
 		Data),
@@ -1872,7 +1872,7 @@ create_contents_window(Event, {S, Res}) ->
 	{ok, Pid} ->
 	    {S, [{ok, Pid} | Res]};
 	{error, Reason} ->
-	    ok = error_logger:format("~p(~p): create_contents_window(~p) ->~n     ~p~n",
+	    ok = error_logger:format("~p(~p): create_contents_window(~tp) ->~n     ~tp~n",
 				     [?MODULE, self(), Options, Reason]),
 	    {S, [{error, Reason} | Res]};
 	Stuff ->
@@ -2069,15 +2069,15 @@ create_actor(Name) ->
     #actor{name = Name, string = String, include = false, exclude = false}.
 
 name_to_string(Name) ->
-    case catch io_lib:format("~s", [Name]) of
-        {'EXIT', _} -> lists:flatten(io_lib:format("~w", [Name]));
+    case catch io_lib:format("~ts", [Name]) of
+        {'EXIT', _} -> lists:flatten(io_lib:format("~tw", [Name]));
         GoodString  -> lists:flatten(GoodString)
     end.
 
 pad_string(Atom, MinLen) when is_atom(Atom) ->
     pad_string(atom_to_list(Atom), MinLen);
 pad_string(String, MinLen) when is_integer(MinLen), MinLen >= 0 ->
-    Len = length(String),
+    Len = string:length(String),
     case Len >= MinLen of
         true ->
             String;