Merge branch 'bmk/snmp/agent/synchronizing_vacm_dumping/r14/OTP-9851' into bmk/snmp/snmp4215_integration/r14

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/app/snmp.appup.src

12 files changed, 338 insertions, 306 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 0dc0e5dc79..ac832dc381 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -55,23 +55,27 @@
 
     <section>
       <title>Fixed Bugs and Malfunctions</title>
+<!--
       <p>-</p> 
+-->
 
-<!--
       <list type="bulleted">
         <item>
-          <p>[agent] Version 4.20 introduced a change that broke trap 
-	  sending from subagents. Due to a bug in the test code, 
-	  this was not discovered, until that bug was fixed. </p>
-          <p>Own Id: OTP-9745</p>
+          <p>[agent] Repeated vacm table dumping fails due to file name 
+	  conflict. When dumping the vacm table to disk, a temoporary 
+	  file with a fixed name was used. If the table dumping 
+	  (snmpa_vacm:dump_table/0) was initiated from several different 
+	  processes in rapid succesion, the dumping could fail because the 
+	  different processes was simultaniously trying to write to the 
+	  same file. This problem has been eliminated by creating a unique 
+	  name for the temporary file. </p>
+          <p>Own Id: OTP-9851</p>
+          <p>Aux Id: Seq 11980</p>
         </item>
 
       </list>
--->
-
     </section>
 
-
     <section>
       <title>Incompatibilities</title>
       <p>-</p>
@@ -79,9 +83,10 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>[compiler] foo bar. </p>
+          <p>foo. </p>
           <p>Own Id: OTP-9718</p>
         </item>
+
       </list>
 -->
 
@@ -1763,211 +1768,6 @@ snmp_view_basec_acm_mib:vacmAccessTable(set, RowIndex, Cols).
     </section>
   </section> <!-- 4.12 -->
 
-  <section>
-    <title>SNMP Development Toolkit 4.11.2</title>
-    <p>Version 4.11.2 supports code replacement in runtime from/to
-      version 4.11.1 and 4.11. </p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <p>-</p> 
-      <!-- 
-      <list type="bulleted">
-        <item>
-	  <p>Added utility functions for transforming DateAndTime
-            as [int()] to strings; 
-            <seealso marker="snmp#dat2s">date_and_time_to_string/2</seealso>
-            and  
-            <seealso marker="snmp#dat2s2">date_and_time_to_string2/1</seealso>. </p>
-          <p>Also added new validation function 
-            <seealso marker="snmp#vdat">validate_date_and_time/2</seealso>. </p>
-	  <p>Own Id: OTP-7412</p>
-	  <p>Aux Id: Seq 10987</p>
-        </item>
-      </list>
-      -->
-    </section>
-
-    <section>
-      <title>Reported Fixed Bugs and Malfunctions</title>
-      <!-- 
-      <p>-</p>
-      -->
-      <list type="bulleted">
-        <item>
-          <p>[manager] Erroneous engine-id check when receiving version 3 
-            informs. </p>
-          <p>Own Id: OTP-7570</p>
-	  <p>Aux Id: Seq 11060</p>
-        </item>
-
-        <item>
-	  <p>Receiving an snmp message with a very large version
-            number could cause the erlang node to run out of
-            memory and consequently crash. </p>
-          <p>The standard specifies the snmp version as an
-            (unlimited) INTEGER, but today only
-            0 (version 1), 1 (version 2) and 3 (version 3) is
-            actually used. So, when decoding a message, a limit
-            has been put on the snmp version integer in order
-            to not allow this kind of a problem. </p>
-	  <p>Own Id: OTP-7575</p>
-	  <p>Aux Id: Seq 11064</p>
-        </item>
-
-      </list>
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-    </section>
-  </section> <!-- 4.11.2 -->
-
-
-  <section>
-    <title>SNMP Development Toolkit 4.11.1</title>
-    <p>Version 4.11.1 supports code replacement in runtime from/to
-      version 4.11.</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <!-- 
-      <p>-</p> 
-      -->
-      <list type="bulleted">
-        <item>
-          <p>[compiler] The MIB compiler did not retrieve the REFERENCE part
-            of a SNMP MIB definition. </p>
-          <p>This problem has been partly solved. For SNMP tables, 
-            the assocList field of the tables mib-entry record now contains 
-            this info (as <c>{reference, string()}</c>), <em>if</em> the 
-            MIB was compiled with the compiler option <em>+reference</em>. </p>
-          <p>This solution is temporary, until such time as a permanent
-            solution (and probably not backward compatible) is devised, which
-            retrieves and stores all REFERENCE part(s) of a MIB. </p>
-          <p>See the 
-            <seealso marker="snmpc#compiler_opts">compiler options</seealso> 
-            for more info. </p> 
-
-          <p>Serge Aleynikov</p>
-          <p>Own Id: OTP-7426</p>
-        </item>
-
-        <item>
-	  <p>Added utility functions for transforming DateAndTime
-            as [int()] to strings; 
-            <seealso marker="snmp#dat2s">date_and_time_to_string/2</seealso>
-            and  
-            <seealso marker="snmp#dat2s2">date_and_time_to_string2/1</seealso>. </p>
-          <p>Also added new validation function 
-            <seealso marker="snmp#vdat">validate_date_and_time/2</seealso>. </p>
-	  <p>Own Id: OTP-7412</p>
-	  <p>Aux Id: Seq 10987</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Reported Fixed Bugs and Malfunctions</title>
-      <!-- 
-      <p>-</p>
-      -->
-      <list type="bulleted">
-        <item>
-          <p>[manager] Encryption error when attempting to send
-            version 3 inform-requests. </p>
-          <p>Own Id: OTP-7432</p>
-	  <p>Aux Id: Seq 10966</p>
-        </item>
-
-      </list>
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-    </section>
-  </section> <!-- 4.11.1 -->
-
-  <section>
-    <title>SNMP Development Toolkit 4.11</title>
-    <p>Version 4.11 supports code replacement in runtime from/to
-      version 4.10.3, 4.10.2, 4.10.1 and 4.10.</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <!-- 
-      <p>-</p> 
-      -->
-      <list type="bulleted">
-        <item>
-          <p>[agent] Performance improvements in the case when an SNMP 
-            manager performs an snmpwalk. </p>
-          <p>Martin Bj&ouml;rklund</p>
-          <p>Own Id: OTP-7201</p>
-        </item>
-
-        <item>
-          <p>The API for sending inform(s) has been improved. Also
-            the documentation has been corrected and updated. See 
-            <seealso marker="snmpa#send_notification">snmpa:send_notification</seealso> and 
-            <seealso marker="snmpa_notification_delivery_info_receiver">snmpa_notification_delivery_info_receiver</seealso> 
-            for more info.</p>
-          <p>Own Id: OTP-7287</p>
-          <p>Aux Id: Seq 10926</p>
-        </item>
-
-        <item>
-	  <p>[agent] Performance of the internal database (local-db) 
-           has been improved.</p>
-	  <p>Own Id: OTP-7319</p>
-	  <p>Aux Id: Seq 10942</p>
-        </item>
-
-        <item>
-	  <p>[agent] Added utility functions,
-            <seealso marker="snmpa#restart_worker">snmpa:restart_worker/0,1</seealso> and 
-            <seealso marker="snmpa#restart_set_worker">snmpa:restart_set_worker/0,1</seealso>, 
-            for restarting the agent worker processes (in case the agent is
-            multi-threaded).</p>
-	  <p>Own Id: OTP-7369</p>
-        </item>
-
-        <item>
-	  <p>Add utility function to 
-            <seealso marker="snmp#read_mib">read</seealso> 
-            a compiled mib. </p>
-	  <p>Own Id: OTP-7371</p>
-        </item>
-
-      </list>
-    </section>
-
-    <section>
-      <title>Reported Fixed Bugs and Malfunctions</title>
-      <!-- 
-      <p>-</p>
-      -->
-      <list type="bulleted">
-        <item>
-          <p>[manager] Encryption error when attempting to send
-            version 3 inform-requests. </p>
-          <p>Own Id: OTP-7377</p>
-	  <p>Aux Id: Seq 10966</p>
-        </item>
-
-      </list>
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-    </section>
-  </section> <!-- 4.11 -->
-
   <!-- section>
     <title>Release notes history</title>
     <p>For information about older versions see
diff --git a/lib/snmp/doc/src/notes_history.xml b/lib/snmp/doc/src/notes_history.xml
index 934df87866..e8dcbae528 100644
--- a/lib/snmp/doc/src/notes_history.xml
+++ b/lib/snmp/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,6 +33,212 @@
   </header>
 
   <section>
+    <title>SNMP Development Toolkit 4.11.2</title>
+    <p>Version 4.11.2 supports code replacement in runtime from/to
+      version 4.11.1 and 4.11. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p> 
+      <!-- 
+      <list type="bulleted">
+        <item>
+	  <p>Added utility functions for transforming DateAndTime
+            as [int()] to strings; 
+            <seealso marker="snmp#dat2s">date_and_time_to_string/2</seealso>
+            and  
+            <seealso marker="snmp#dat2s2">date_and_time_to_string2/1</seealso>. </p>
+          <p>Also added new validation function 
+            <seealso marker="snmp#vdat">validate_date_and_time/2</seealso>. </p>
+	  <p>Own Id: OTP-7412</p>
+	  <p>Aux Id: Seq 10987</p>
+        </item>
+      </list>
+      -->
+    </section>
+
+    <section>
+      <title>Reported Fixed Bugs and Malfunctions</title>
+      <!-- 
+      <p>-</p>
+      -->
+      <list type="bulleted">
+        <item>
+          <p>[manager] Erroneous engine-id check when receiving version 3 
+            informs. </p>
+          <p>Own Id: OTP-7570</p>
+	  <p>Aux Id: Seq 11060</p>
+        </item>
+
+        <item>
+	  <p>Receiving an snmp message with a very large version
+            number could cause the erlang node to run out of
+            memory and consequently crash. </p>
+          <p>The standard specifies the snmp version as an
+            (unlimited) INTEGER, but today only
+            0 (version 1), 1 (version 2) and 3 (version 3) is
+            actually used. So, when decoding a message, a limit
+            has been put on the snmp version integer in order
+            to not allow this kind of a problem. </p>
+	  <p>Own Id: OTP-7575</p>
+	  <p>Aux Id: Seq 11064</p>
+        </item>
+
+      </list>
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+  </section> <!-- 4.11.2 -->
+
+
+  <section>
+    <title>SNMP Development Toolkit 4.11.1</title>
+    <p>Version 4.11.1 supports code replacement in runtime from/to
+      version 4.11.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <!-- 
+      <p>-</p> 
+      -->
+      <list type="bulleted">
+        <item>
+          <p>[compiler] The MIB compiler did not retrieve the REFERENCE part
+            of a SNMP MIB definition. </p>
+          <p>This problem has been partly solved. For SNMP tables, 
+            the assocList field of the tables mib-entry record now contains 
+            this info (as <c>{reference, string()}</c>), <em>if</em> the 
+            MIB was compiled with the compiler option <em>+reference</em>. </p>
+          <p>This solution is temporary, until such time as a permanent
+            solution (and probably not backward compatible) is devised, which
+            retrieves and stores all REFERENCE part(s) of a MIB. </p>
+          <p>See the 
+            <seealso marker="snmpc#compiler_opts">compiler options</seealso> 
+            for more info. </p> 
+
+          <p>Serge Aleynikov</p>
+          <p>Own Id: OTP-7426</p>
+        </item>
+
+        <item>
+	  <p>Added utility functions for transforming DateAndTime
+            as [int()] to strings; 
+            <seealso marker="snmp#dat2s">date_and_time_to_string/2</seealso>
+            and  
+            <seealso marker="snmp#dat2s2">date_and_time_to_string2/1</seealso>. </p>
+          <p>Also added new validation function 
+            <seealso marker="snmp#vdat">validate_date_and_time/2</seealso>. </p>
+	  <p>Own Id: OTP-7412</p>
+	  <p>Aux Id: Seq 10987</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Reported Fixed Bugs and Malfunctions</title>
+      <!-- 
+      <p>-</p>
+      -->
+      <list type="bulleted">
+        <item>
+          <p>[manager] Encryption error when attempting to send
+            version 3 inform-requests. </p>
+          <p>Own Id: OTP-7432</p>
+	  <p>Aux Id: Seq 10966</p>
+        </item>
+
+      </list>
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+  </section> <!-- 4.11.1 -->
+
+  <section>
+    <title>SNMP Development Toolkit 4.11</title>
+    <p>Version 4.11 supports code replacement in runtime from/to
+      version 4.10.3, 4.10.2, 4.10.1 and 4.10.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <!-- 
+      <p>-</p> 
+      -->
+      <list type="bulleted">
+        <item>
+          <p>[agent] Performance improvements in the case when an SNMP 
+            manager performs an snmpwalk. </p>
+          <p>Martin Bj&ouml;rklund</p>
+          <p>Own Id: OTP-7201</p>
+        </item>
+
+        <item>
+          <p>The API for sending inform(s) has been improved. Also
+            the documentation has been corrected and updated. See 
+            <seealso marker="snmpa#send_notification">snmpa:send_notification</seealso> and 
+            <seealso marker="snmpa_notification_delivery_info_receiver">snmpa_notification_delivery_info_receiver</seealso> 
+            for more info.</p>
+          <p>Own Id: OTP-7287</p>
+          <p>Aux Id: Seq 10926</p>
+        </item>
+
+        <item>
+	  <p>[agent] Performance of the internal database (local-db) 
+           has been improved.</p>
+	  <p>Own Id: OTP-7319</p>
+	  <p>Aux Id: Seq 10942</p>
+        </item>
+
+        <item>
+	  <p>[agent] Added utility functions,
+            <seealso marker="snmpa#restart_worker">snmpa:restart_worker/0,1</seealso> and 
+            <seealso marker="snmpa#restart_set_worker">snmpa:restart_set_worker/0,1</seealso>, 
+            for restarting the agent worker processes (in case the agent is
+            multi-threaded).</p>
+	  <p>Own Id: OTP-7369</p>
+        </item>
+
+        <item>
+	  <p>Add utility function to 
+            <seealso marker="snmp#read_mib">read</seealso> 
+            a compiled mib. </p>
+	  <p>Own Id: OTP-7371</p>
+        </item>
+
+      </list>
+    </section>
+
+    <section>
+      <title>Reported Fixed Bugs and Malfunctions</title>
+      <!-- 
+      <p>-</p>
+      -->
+      <list type="bulleted">
+        <item>
+          <p>[manager] Encryption error when attempting to send
+            version 3 inform-requests. </p>
+          <p>Own Id: OTP-7377</p>
+	  <p>Aux Id: Seq 10966</p>
+        </item>
+
+      </list>
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+  </section> <!-- 4.11 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.10.3</title>
     <p>Version 4.10.3 supports code replacement in runtime from/to
       version 4.10.2, 4.10.1 and 4.10.</p>
diff --git a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
index 37f6dd3f26..2cee91b081 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. 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
@@ -203,18 +203,16 @@ init_sec2group_table([Row | T]) ->
     init_sec2group_table(T);
 init_sec2group_table([]) -> true.
 
-init_access_table([{GN, Prefix, Model, Level, Row} | T]) ->
-%%     ?vtrace("init access table: "
-%%  	    "~n   GN:     ~p"
-%%  	    "~n   Prefix: ~p"
-%%  	    "~n   Model:  ~p"
-%%  	    "~n   Level:  ~p"
-%%  	    "~n   Row:    ~p",[GN, Prefix, Model, Level, Row]),    
-    Key = [length(GN) | GN] ++ [length(Prefix) | Prefix] ++ [Model, Level],
-    snmpa_vacm:insert([{Key, Row}], false),
-    init_access_table(T);
-init_access_table([]) ->
-    snmpa_vacm:dump_table().
+make_access_key(GN, Prefix, Model, Level) ->
+    [length(GN) | GN] ++ [length(Prefix) | Prefix] ++ [Model, Level].
+
+make_access_entry({GN, Prefix, Model, Level, Row}) ->
+    Key = make_access_key(GN, Prefix, Model, Level),
+    {Key, Row}.
+       
+init_access_table(TableData) ->
+    TableData2 = [make_access_entry(E) || E <- TableData],
+    snmpa_vacm:insert(TableData2, true).
 
 init_view_table([Row | T]) ->
 %%     ?vtrace("init view table: "
@@ -276,10 +274,7 @@ add_access(GroupName, Prefix, SecModel, SecLevel, Match, RV, WV, NV) ->
 	      Match, RV, WV, NV},
     case (catch check_vacm(Access)) of
 	{ok, {vacmAccess, {GN, Pref, SM, SL, Row}}} ->
-	    Key1 = [length(GN) | GN],
-	    Key2 = [length(Pref) | Pref],
-	    Key3 = [SM, SL],
-	    Key  = Key1 ++ Key2 ++ Key3, 
+	    Key = make_access_key(GN, Pref, SM, SL),
 	    snmpa_vacm:insert([{Key, Row}], false),
             snmpa_agent:invalidate_ca_cache(),
 	    {ok, Key};
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index 46c634969d..d3eeca2290 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. 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
@@ -934,6 +934,7 @@ handle_info({'EXIT', Pid, Reason}, S) ->
 	    end,
 	    {noreply, S}
     end;
+
 handle_info({'DOWN', Ref, process, Pid, {mibs_cache_reply, Reply}}, 
 	    #state{mibs_cache_request = {Pid, Ref, From}} = S) ->
     ?vlog("reply from the mibs cache request handler (~p): ~n~p", 
@@ -1283,27 +1284,27 @@ handle_call({me_of, Oid}, _From, S) ->
     {reply, Reply, S};
 
 handle_call(get_log_type, _From, S) ->
-    ?vlog("get_log_type", []),
+    ?vlog("handle_call(get_log_type) -> entry with", []),
     Reply = handle_get_log_type(S), 
     {reply, Reply, S};
     
 handle_call({set_log_type, NewType}, _From, S) ->
-    ?vlog("set_log_type -> "
+    ?vlog("handle_call(set_log_type) -> entry with"
 	  "~n   NewType: ~p", [NewType]),
     Reply = handle_set_log_type(S, NewType), 
     {reply, Reply, S};
     
 handle_call(get_request_limit, _From, S) ->
-    ?vlog("get_request_limit", []),
+    ?vlog("handle_call(get_request_limit) -> entry with", []),
     Reply = handle_get_request_limit(S), 
     {reply, Reply, S};
     
 handle_call({set_request_limit, NewLimit}, _From, S) ->
-    ?vlog("set_request_limit -> "
+    ?vlog("handle_call(set_request_limit) -> entry with"
 	  "~n   NewLimit: ~p", [NewLimit]),
     Reply = handle_set_request_limit(S, NewLimit), 
     {reply, Reply, S};
-    
+
 handle_call(stop, _From, S) ->
     {stop, normal, ok, S};
 
@@ -3859,6 +3860,7 @@ mapfoldl(F, Eas, Accu0, [Hd|Tail]) ->
     {Accu2,[R|Rs]};
 mapfoldl(_F, _Eas, Accu, []) -> {Accu,[]}.
 
+
 %%-----------------------------------------------------------------
 %% Runtime debugging of the agent.
 %%-----------------------------------------------------------------
@@ -3983,7 +3985,7 @@ handle_set_request_limit(_, _) ->
     {error, not_supported}.
 
 
-agent_info(#state{worker = W, set_worker = SW}) ->	 
+agent_info(#state{worker = W, set_worker = SW}) -> 
     case (catch get_agent_info(W, SW)) of
 	Info when is_list(Info) ->
 	    Info;
diff --git a/lib/snmp/src/agent/snmpa_vacm.erl b/lib/snmp/src/agent/snmpa_vacm.erl
index 892dc265f1..2cbc11d280 100644
--- a/lib/snmp/src/agent/snmpa_vacm.erl
+++ b/lib/snmp/src/agent/snmpa_vacm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. 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
@@ -266,9 +266,10 @@ dump_table(true) ->
 dump_table(_) ->
     ok.
 
+
 dump_table() ->
     [{_, FName}] = ets:lookup(snmp_agent_table, snmpa_vacm_file),
-    TmpName = FName ++ ".tmp",
+    TmpName = unique_table_name(FName), 
     case ets:tab2file(snmpa_vacm, TmpName) of
 	ok ->
 	    case file:rename(TmpName, FName) of
@@ -283,6 +284,35 @@ dump_table() ->
 		     [FName, Reason])
     end.
 
+%% This little thing is an attempt to create a "unique" filename
+%% in order to minimize the risk of two processes at the same 
+%% time dumping the table.
+unique_table_name(Pre) ->
+    %% We want something that is guaranteed to be unique, 
+    %% therefor we use erlang:now() instead of os:timestamp()
+    unique_table_name(Pre, erlang:now()).
+
+unique_table_name(Pre, {_A, _B, C} = Now) ->
+    {Date, Time}     = calendar:now_to_datetime(Now),
+    {YYYY, MM, DD}   = Date,
+    {Hour, Min, Sec} = Time,
+    FormatDate =
+        io_lib:format("~.4w~.2.0w~.2.0w_~.2.0w~.2.0w~.2.0w_~w",
+                      [YYYY, MM, DD, Hour, Min, Sec, round(C/1000)]), 
+    unique_table_name2(Pre, FormatDate).
+
+unique_table_name2(Pre, FormatedDate) ->
+    PidPart = unique_table_name_pid(), 
+    lists:flatten(io_lib:format("~s.~s~s.tmp", [Pre, PidPart, FormatedDate])).
+
+unique_table_name_pid() ->
+    case string:tokens(pid_to_list(self()), [$<,$.,$>]) of
+	[A, B, C] ->
+	    A ++ B ++ C ++ ".";
+	_ ->
+	    ""
+    end.
+
 
 %%-----------------------------------------------------------------
 %% Alg.
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 4743f75cfd..589b728dc5 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -24,17 +24,25 @@
  [
   {"4.21.4", 
    [
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}
+    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.3", 
    [
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
+    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.2", 
    [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
@@ -45,6 +53,8 @@
   }, 
   {"4.21.1", 
    [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
@@ -56,6 +66,8 @@
   }, 
   {"4.21", 
    [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
@@ -68,6 +80,7 @@
   }, 
   {"4.20.1", 
    [
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, []}, 
@@ -94,6 +107,7 @@
   }, 
   {"4.20", 
    [
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
@@ -125,17 +139,25 @@
  [
   {"4.21.4", 
    [
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}
+    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.3", 
    [
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
+    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.2", 
    [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
@@ -146,6 +168,8 @@
   }, 
   {"4.21.1", 
    [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
@@ -157,6 +181,8 @@
   }, 
   {"4.21", 
    [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
@@ -169,6 +195,7 @@
   }, 
   {"4.20.1", 
    [
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, []}, 
@@ -195,6 +222,7 @@
   }, 
   {"4.20", 
    [
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index c964b08168..0a147130b0 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. 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
@@ -566,14 +566,7 @@ p(F, A) ->
 
 p(TName, F, A) ->
     io:format("*** [~w][~s] ***"
-              "~n" ++ F ++ "~n", [TName,format_timestamp(now())|A]).
-
-format_timestamp({_N1, _N2, N3}   = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
+              "~n" ++ F ++ "~n", [TName, formated_timestamp()|A]).
 
+formated_timestamp() ->
+    snmp_test_lib:formated_timestamp().
diff --git a/lib/snmp/test/snmp_manager_config_test.erl b/lib/snmp/test/snmp_manager_config_test.erl
index 4498d506f3..3192fe1b40 100644
--- a/lib/snmp/test/snmp_manager_config_test.erl
+++ b/lib/snmp/test/snmp_manager_config_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. 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
@@ -2726,14 +2726,7 @@ p(F, A) ->
 
 p(TName, F, A) ->
     io:format("*** [~s] ***"
-              " ~w -> " ++ F ++ "~n", [format_timestamp(now()),TName|A]).
-
-format_timestamp({_N1, _N2, N3}   = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
+              " ~w -> " ++ F ++ "~n", [formated_timestamp(),TName|A]).
 
+formated_timestamp() ->
+    snmp_test_lib:formated_timestamp().
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index d18f20d359..75c9f7b277 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. 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
@@ -6064,7 +6064,7 @@ rcall(Node, Mod, Func, Args) ->
 
 %% Time in milli sec
 %% t() ->
-%%     {A,B,C} = erlang:now(),
+%%     {A,B,C} = os:timestamp(),
 %%     A*1000000000+B*1000+(C div 1000).
 
 
@@ -6078,16 +6078,10 @@ p(F, A) ->
  
 p(TName, F, A) ->
     io:format("*** [~w][~s] ***"
-              "~n" ++ F ++ "~n", [TName,format_timestamp(now())|A]).
-
-format_timestamp({_N1, _N2, N3}   = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
+              "~n" ++ F ++ "~n", [TName, formated_timestamp()|A]).
+
+formated_timestamp() ->
+    snmp_test_lib:formated_timestamp().
 
 %% p(TName, F, A) ->
 %%     io:format("~w -> " ++ F ++ "~n", [TName|A]).
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index 54839d989b..e4d58a1253 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2012. 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
@@ -37,7 +37,7 @@
 -export([watchdog/3, watchdog_start/1, watchdog_start/2, watchdog_stop/1]).
 -export([del_dir/1]).
 -export([cover/1]).
--export([p/2, print/5]).
+-export([p/2, print/5, formated_timestamp/0]).
 
 
 %% ----------------------------------------------------------------------
@@ -521,15 +521,18 @@ p(F, A) when is_list(F) andalso is_list(A) ->
 
 print(Prefix, Module, Line, Format, Args) ->
     io:format("*** [~s] ~s ~p ~p ~p:~p *** " ++ Format ++ "~n", 
-	      [format_timestamp(now()), 
+	      [formated_timestamp(), 
 	       Prefix, node(), self(), Module, Line|Args]).
 
+formated_timestamp() ->
+    format_timestamp(os:timestamp()).
+
 format_timestamp({_N1, _N2, N3} = Now) ->
     {Date, Time}   = calendar:now_to_datetime(Now),
     {YYYY,MM,DD}   = Date,
     {Hour,Min,Sec} = Time,
     FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
+        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w ~w",
                       [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
     lists:flatten(FormatDate).
 
diff --git a/lib/snmp/test/snmp_test_mgr.erl b/lib/snmp/test/snmp_test_mgr.erl
index 84bdc6b04f..499cf7abcf 100644
--- a/lib/snmp/test/snmp_test_mgr.erl
+++ b/lib/snmp/test/snmp_test_mgr.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. 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
@@ -1124,16 +1124,11 @@ d(F,A) -> d(get(debug),F,A).
 
 d(true,F,A) ->
     io:format("*** [~s] MGR_DBG *** " ++ F ++ "~n",
-	      [format_timestamp(now())|A]);
+	      [formated_timestamp()|A]);
 d(_,_F,_A) -> 
     ok.
 
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
+
+formated_timestamp() ->
+    snmp_test_lib:formated_timestamp().
 
diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index fc6dedd96d..5525c5c3ec 100644
--- a/lib/snmp/test/snmp_test_mgr_misc.erl
+++ b/lib/snmp/test/snmp_test_mgr_misc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. 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
@@ -779,16 +779,9 @@ d(F,A) -> d(get(debug),F,A).
 
 d(true,F,A) ->
     io:format("*** [~s] MGR_PS_DBG *** " ++ F ++ "~n",
-	      [format_timestamp(now())|A]);
+	      [formated_timestamp()|A]);
 d(_,_F,_A) -> 
     ok.
 
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
-
+formated_timestamp() ->
+    snmp_test_lib:formated_timestamp().