Whitespace: using spaces in modified lines

Author: kvakvs

lib/inets/examples/httpd_load_test/hdlt_ctrl.erl

@@ -51,8 +51,9 @@
 -define(SSH_CONNECT_TIMEOUT,        5000).
 -define(NODE_START_TIMEOUT,         5000).
 -define(LOCAL_PROXY_START_TIMEOUT,  ?NODE_START_TIMEOUT * 4).
--define(DEFAULT_DEBUGS, 
-	[{ctrl, info}, {follower, silence}, {proxy, silence}, {client, silence}]).
+-define(DEBUGS_OPTION_KEYS,   [ctrl, proxy, follower, client]).
+-define(DEBUGS_OPTION_VALUES, [silence, info, log, debug]).
+-define(DEFAULT_DEBUGS,       lists:zip(?DEBUGS_OPTION_KEYS, ?DEBUGS_OPTION_VALUES)).
 -define(DEFAULT_WORK_SIM,           10000).
 -define(DEFAULT_DATA_SIZE_START,    500).
 -define(DEFAULT_DATA_SIZE_END,      1500).
@@ -504,7 +505,7 @@ local_follower_module() ->
 	Path when is_list(Path) ->
 	    Path;
 	_ ->
-	    exit({follower_module_not_found, Mod})
+            exit({follower_module_not_found, Mod})
     end.
 
 follower_module() ->
@@ -725,7 +726,7 @@ proxy_loop(#proxy{mode      = started,
     receive
 	{proxy_request, Ref, From, {start_node, Debug}} ->
 	    ?LOG("[starting] received start_node order", []),
-	    case hdlt_follower_node:start_link(Host, NodeName,
+            case hdlt_follower_node:start_link(Host, NodeName,
                 ErlPath, Paths, Args, Debug) of
 		{ok, Node} ->
 		    ?DEBUG("[starting] node ~p started - now monitor", [Node]),
@@ -1241,13 +1242,13 @@ verify_debugs([{Tag, Debug}|Debugs]) ->
     verify_debugs(Debugs).
 
 verify_debug(Tag, Debug) ->
-    case lists:member(Tag, [ctrl, proxy, follower, client]) of
+    case lists:member(Tag, ?DEBUGS_OPTION_KEYS) of
 	true ->
 	    ok;
 	false ->
 	    exit({bad_debug_tag, Tag})
     end,
-    case lists:member(Debug, [silence, info, log, debug]) of
+    case lists:member(Debug, ?DEBUGS_OPTION_VALUES) of
 	true ->
 	    ok;
 	false ->

lib/inets/examples/httpd_load_test/hdlt_follower_node.erl

@@ -114,17 +114,17 @@ wait_for_follower_node(Parent, Host, Name, Node, Paths, Args,
     case (catch mk_cmd(Host, Name, Paths, Args, Waiter, Prog)) of
 	{ok, Cmd} ->
   	    ?DEBUG("command generated: ~n~s", [Cmd]),
-	    case (catch ssh_follower_start(Host, Cmd)) of
+            case (catch ssh_follower_start(Host, Cmd)) of
 		{ok, Conn, _Chan} ->
  		    ?DEBUG("ssh channel created", []),
 		    receive
-			{FollowerPid, follower_started} ->
- 			    ?DEBUG("follower started: ~p", [FollowerPid]),
+                        {FollowerPid, follower_started} ->
+                            ?DEBUG("follower started: ~p", [FollowerPid]),
 			    unregister(Waiter),
-			    follower_started(Parent, LinkTo, FollowerPid, Conn,
-					     DebugLevel)
+                            follower_started(Parent, LinkTo, FollowerPid, Conn,
+                                             DebugLevel)
 		    after 32000 ->
-			    ?INFO("follower node failed to report in on time",
+                            ?INFO("follower node failed to report in on time",
 				  []),
 			    %% If it seems that the node was partially started,
 			    %% try to kill it.
@@ -200,8 +200,8 @@ follower_started(ReplyTo, Master, Follower, Conn, Level)
   when is_pid(Master) andalso is_pid(Follower) ->
     process_flag(trap_exit, true),
     SName = lists:flatten(
-	      io_lib:format("HDLT FOLLOWER CTRL[~p,~p]",
-			    [self(), node(Follower)])),
+              io_lib:format("HDLT FOLLOWER CTRL[~p,~p]",
+                            [self(), node(Follower)])),
     ?SET_NAME(SName),
     ?SET_LEVEL(Level), 
     ?LOG("initiating", []),
@@ -219,18 +219,18 @@ follower_running(Master, MasterRef, Follower, FollowerRef, Conn) ->
     receive
 	{'DOWN', MasterRef, process, _Object, _Info} ->
 	    ?LOG("received DOWN from master", []),
-	    erlang:demonitor(FollowerRef, [flush]),
-	    Follower ! {nodedown, node()},
+            erlang:demonitor(FollowerRef, [flush]),
+            Follower ! {nodedown, node()},
 	    ssh:close(Conn);
 
-	{'DOWN', FollowerRef, process, Object, _Info} ->
-	    ?LOG("received DOWN from follower (~p)", [Object]),
+        {'DOWN', FollowerRef, process, Object, _Info} ->
+            ?LOG("received DOWN from follower (~p)", [Object]),
 	    erlang:demonitor(MasterRef, [flush]),
 	    ssh:close(Conn);
 
 	Other ->
 	    ?DEBUG("received unknown: ~n~p", [Other]),
-	    follower_running(Master, MasterRef, Follower, FollowerRef, Conn)
+            follower_running(Master, MasterRef, Follower, FollowerRef, Conn)
 
     end.
 
@@ -255,7 +255,7 @@ mk_cmd(Host, Name, Paths, Args, Waiter, Prog) ->
 			 " -detached -nopinput ", 
 			 Args, " ", 
 			 " -sname ", Name, "@", Host,
-			 " -s ", ?MODULE, " follower_node_start ", node(),
+                         " -s ", ?MODULE, " follower_node_start ", node(),
 			 " ", Waiter,
 			 " ", PaPaths]))}.
 
@@ -267,12 +267,12 @@ follower_node_start([Master, Waiter]) ->
     spawn(?MODULE, wait_for_master_to_die, [Master, Waiter, silence]);
 follower_node_start([Master, Waiter, Level]) ->
     spawn(?MODULE, wait_for_master_to_die, [Master, Waiter, Level]).
-	
+
 
 wait_for_master_to_die(Master, Waiter, Level) ->
     process_flag(trap_exit, true),
     SName = lists:flatten(
-	      io_lib:format("HDLT-FOLLOWER MASTER MONITOR[~p,~p,~p]",
+              io_lib:format("HDLT-FOLLOWER MASTER MONITOR[~p,~p,~p]",
 			    [self(), node(), Master])), 
     ?SET_NAME(SName),
     ?SET_LEVEL(Level), 

lib/inets/test/httpd_bench_SUITE.erl

@@ -240,8 +240,7 @@ setup(_Config, _LocalNode) ->
     case net_adm:ping(Node) of
 	pong -> ok;
 	pang ->
-%%	    {ok, Node} = slave:start(Host, inets_perf_server, PeerArgs, no_link, Prog)
-	    {ok, Node} = peer:start(#{
+            {ok, Node} = peer:start(#{
                 host => Host,
                 name => inets_perf_server,
                 args => PeerArgs,