[snmp] Add (atl) log conversion block option

It is now possible to request that the Audit Trail Log should
be blocked during conversion (log_to_txt or log_to_io). This
could be usefull when coverting a large log (when there is
a chance it may otherwise wrap during conversion).

1 files changed, 38 insertions, 29 deletions

diff --git a/lib/snmp/test/snmp_log_test.erl b/lib/snmp/test/snmp_log_test.erl
index e9345b44cc..cbd843b8fe 100644
--- a/lib/snmp/test/snmp_log_test.erl
+++ b/lib/snmp/test/snmp_log_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -365,7 +365,7 @@ log_to_io1(Config) when is_list(Config) ->
     display_info(Info),
 
     ?DBG("log_to_io1 -> do the convert to io (stdout)", []),
-    ? line ok = snmp_log:log_to_io(Log, File, Dir, []),
+    ? line ok = snmp:log_to_io(Dir, [], Name, File, false),
 
     ?DBG("log_to_io1 -> close log", []),
     ?line ok = snmp_log:close(Log),
@@ -377,7 +377,7 @@ log_to_io1(Config) when is_list(Config) ->
 %%======================================================================
 %% Start a logger-process that logs messages with a certain interval.
 %% Start a reader-process that reads messages from the log at a certain
-%% point of time.
+%% point in time.
 
 log_to_io2(suite) -> [];
 log_to_io2(doc) -> "Log to io from a different process than which "
@@ -414,13 +414,13 @@ log_to_io2(Config) when is_list(Config) ->
 	log_reader_log_to(Reader, 
 			  fun() -> 
 				  I = disk_log:info(Log),
-				  R = snmp_log:log_to_io(Log, File, Dir, []),
+				  R = snmp:log_to_io(Dir, [], Name, File, true),
 				  {R, I}
 			  end),
 
     case Res of
-	{ok, Info} ->
-	    ?DBG("log_to_io2 -> ~n   Info: ~p", [Info]),
+	{ok, _Info} ->
+	    ?DBG("log_to_io2 -> ~n   Info: ~p", [_Info]),
 	    ok;
 	{Error, Info} ->
 	    ?DBG("log_to_io2 -> log to io failed: "
@@ -520,14 +520,21 @@ log_to_txt(Name, SeqNoGen, Config) when is_list(Config) ->
     ?line {ok, Info} = snmp_log:info(Log),
     display_info(Info),
 
-    Out1 = join(Dir, "snmp_text-1.txt"),
-    ?DBG("log_to_txt -> do the convert to a text file when"
-	"~n   Out1: ~p", [Out1]),
-    ?line ok = snmp:log_to_txt(Dir, [], Out1, Log, File),
+    Out1a = join(Dir, "snmp_text-1-unblocked.txt"),
+    ?DBG("log_to_txt -> do the convert to a text file (~s) unblocked", [Out1a]),
+    ?line ok = snmp:log_to_txt(Dir, [], Out1a, Log, File, false),
+
+    ?line {ok, #file_info{size = Size1a}} = file:read_file_info(Out1a),
+    ?DBG("log_to_txt -> text file size: ~p", [Size1a]),
+    validate_size(Size1a),
 
-    ?line {ok, #file_info{size = Size1}} = file:read_file_info(Out1),
-    ?DBG("log_to_txt -> text file size: ~p", [Size1]),
-    validate_size(Size1),
+    Out1b = join(Dir, "snmp_text-1-blocked.txt"),
+    ?DBG("log_to_txt -> do the convert to a text file (~s) blocked", [Out1b]),
+    ?line ok = snmp:log_to_txt(Dir, [], Out1b, Log, File, true),
+
+    ?line {ok, #file_info{size = Size1b}} = file:read_file_info(Out1b),
+    ?DBG("log_to_txt -> text file size: ~p", [Size1b]),
+    validate_size(Size1b, {eq, Size1a}),
 
     Out2 = join(Dir, "snmp_text-2.txt"),
     ?DBG("log_to_txt -> do the convert to a text file when"
@@ -538,7 +545,7 @@ log_to_txt(Name, SeqNoGen, Config) when is_list(Config) ->
 
     ?line {ok, #file_info{size = Size2}} = file:read_file_info(Out2),
     ?DBG("log_to_txt -> text file size: ~p", [Size2]),
-    validate_size(Size2, {le, Size1}),
+    validate_size(Size2, {le, Size1a}),
 
     %% Calculate new start / stop times...
     GStart = calendar:datetime_to_gregorian_seconds(Start),
@@ -568,7 +575,7 @@ log_to_txt(Name, SeqNoGen, Config) when is_list(Config) ->
 
     ?line {ok, #file_info{size = Size3}} = file:read_file_info(Out3),
     ?DBG("log_to_txt -> text file size: ~p", [Size3]),
-    validate_size(Size3, {l, Size1}),    
+    validate_size(Size3, {l, Size1a}),    
 
     ?DBG("log_to_txt -> close log", []),
     ?line ok = snmp_log:close(Log),
@@ -637,8 +644,8 @@ log_to_txt3(Config) when is_list(Config) ->
 			  end),
 
     case Res of
-	{ok, Info} ->
-	    ?DBG("log_to_txt3 -> ~n   Info: ~p", [Info]),
+	{ok, _Info} ->
+	    ?DBG("log_to_txt3 -> ~n   Info: ~p", [_Info]),
 	    ?line {ok, #file_info{size = FileSize}} = 
 		file:read_file_info(TxtFile),
 	    ?DBG("log_to_txt3 -> text file size: ~p", [FileSize]),
@@ -667,6 +674,8 @@ validate_size(_) ->
 
 validate_size(0, _) ->
     ?FAIL(invalid_size);
+validate_size(A, {eq, A}) ->
+    ok;
 validate_size(A, {le, B}) when A =< B ->
     ok;
 validate_size(A, {l, B}) when A < B ->
@@ -695,11 +704,11 @@ log_writer_start(Name, File, Size, Repair) ->
 
 log_writer_stop(Pid) ->
     Pid ! {stop, self()},
-    T1 = t(),
+    _T1 = t(),
     receive
 	{'EXIT', Pid, normal} ->
-	    T2 = t(),
-	    ?DBG("it took ~w ms to stop the writer", [T2 - T1]),
+	    _T2 = t(),
+	    ?DBG("it took ~w ms to stop the writer", [_T2 - _T1]),
 	    ok
     after 60000 ->
 	    Msg  = receive Any -> Any after 0 -> nothing end,
@@ -712,11 +721,11 @@ log_writer_info(Pid) ->
 
 log_writer_sleep(Pid, Time) ->
     Pid ! {sleep, Time, self()},
-    T1 = t(),
+    _T1 = t(),
     receive 
 	{sleeping, Pid} ->
-	    T2 = t(),
-	    ?DBG("it took ~w ms to put the writer to sleep", [T2 - T1]),
+	    _T2 = t(),
+	    ?DBG("it took ~w ms to put the writer to sleep", [_T2 - _T1]),
 	    ok;
 	{'EXIT', Pid, Reason} ->
 	    {error, Reason}
@@ -784,11 +793,11 @@ lp(F, A) ->
 
 log_reader_start() ->
     Pid = spawn_link(?MODULE, log_reader_main, [self()]),
-    T1 = t(),
+    _T1 = t(),
     receive 
 	{started, Pid} ->
-	    T2 = t(),
-	    ?DBG("it took ~w ms to start the reader", [T2 - T1]),
+	    _T2 = t(),
+	    ?DBG("it took ~w ms to start the reader", [_T2 - _T1]),
 	    {ok, Pid};
 	{'EXIT', Pid, Reason} ->
 	    {error, Reason}
@@ -798,11 +807,11 @@ log_reader_start() ->
 
 log_reader_stop(Pid) ->
     Pid ! {stop, self()},
-    T1 = t(),
+    _T1 = t(),
     receive
 	{'EXIT', Pid, normal} ->
-	    T2 = t(),
-	    ?DBG("it took ~w ms to put the reader to eleep", [T2 - T1]),
+	    _T2 = t(),
+	    ?DBG("it took ~w ms to put the reader to eleep", [_T2 - _T1]),
 	    ok
     after 1000 ->
 	    Msg = receive Any -> Any after 0 -> nothing end,