Merge branch 'maint'

* maint: (128 commits)
  beam_lib: Correct wrong type specification
  testSeqOf: Test constrained, extensible sizes
  [snmp/agent] Some restructuring of test suite
  Clean up testSeqOf
  Extend tests cases for BIT STRING
  Improve tests of ENUMERATED
  asn1ct_check: Eliminate useless Per argument from complist_as_tuple()
  asn1ct_check: Don't pass on #'ObjectClassFieldType'{} with fixed type
  asn1ct_gen_per: Remove useless renewal of 'enumval'
  Fix encoding of semi-constrained, extensible INTEGERs
  PER/UPER: Fix decoding of semi-constrained INTEGERs
  testPrim: Simplify test cases using a roundtrip function
  BER: Fix handling of a constructed default value for a class
  PER: Generate code for deep table constraints at compile-time
  Normalize data representation for table constraints
  asn1ct: Simplify check_value/2
  Extend tests to cover more code in asn1ct_check
  Clean up checking of values for ENUMERATEDs
  Introduce a new mechanism for structured error handling
  asn1_db: Make dbput/3 and dbsave/2 asynchronous
  ...

1 files changed, 17 insertions, 50 deletions

diff --git a/lib/asn1/src/asn1_db.erl b/lib/asn1/src/asn1_db.erl
index 843fc66c9c..e96ca9ae25 100644
--- a/lib/asn1/src/asn1_db.erl
+++ b/lib/asn1/src/asn1_db.erl
@@ -19,31 +19,22 @@
 %%
 -module(asn1_db).
 
--export([dbstart/1,dbnew/1,dbsave/2,dbload/1,dbput/3,dbget/2,dbget_all/1]).
--export([dbget_all_mod/1,dbclear/0,dberase_module/1,dbstop/0]).
+-export([dbstart/1,dbnew/1,dbsave/2,dbput/3,dbget/2]).
+-export([dbstop/0]).
 
 -record(state, {parent, monitor, includes, table}).
 
 %% Interface
 dbstart(Includes) ->
     Parent = self(),
-    case get(?MODULE) of
-        undefined ->
-            put(?MODULE, spawn_link(fun() -> init(Parent, Includes) end)),
-            true;
-        _Pid ->
-            req({new_includes, Includes})
-    end.
+    undefined = get(?MODULE),			%Assertion.
+    put(?MODULE, spawn_link(fun() -> init(Parent, Includes) end)),
+    ok.
 
 dbnew(Module)              -> req({new, Module}).
-dbsave(OutFile, Module)    -> req({save, OutFile, Module}).
-dbload(Module)             -> req({load, Module}).
-dbput(Module, K, V)        -> req({set, Module, K, V}).
+dbsave(OutFile, Module)    -> cast({save, OutFile, Module}).
+dbput(Module, K, V)        -> cast({set, Module, K, V}).
 dbget(Module, K)           -> req({get, Module, K}).
-dbget_all(K)               -> req({get_all, K}).
-dbget_all_mod(Mod)         -> req({all_mod, Mod}).
-dbclear()                  -> req(clear).
-dberase_module({module,M}) -> req({delete_mod, M}).
 dbstop()                   -> Resp = req(stop), erase(?MODULE), Resp.
 
 %% Internal functions
@@ -59,8 +50,13 @@ req(Request) ->
 	    exit({db_error,Info}) 
     end.
 
+cast(Request) ->
+    get(?MODULE) ! Request,
+    ok.
+
 reply({Ref,From}, Response) ->
-    From ! {{Ref,?MODULE}, Response}.
+    From ! {{Ref,?MODULE}, Response},
+    ok.
 
 init(Parent, Includes) ->
     MRef = erlang:monitor(process, Parent),
@@ -70,10 +66,9 @@ init(Parent, Includes) ->
 loop(#state{parent = Parent, monitor = MRef, table = Table,
             includes = Includes} = State) ->
     receive
-        {From, {set, Mod, K2, V}} ->
+        {set, Mod, K2, V} ->
             [{_, Modtab}] = ets:lookup(Table, Mod),
             ets:insert(Modtab, {K2, V}),
-            reply(From, ok),
             loop(State);
         {From, {get, Mod, K2}} ->
             Result = case ets:lookup(Table, Mod) of
@@ -85,44 +80,16 @@ loop(#state{parent = Parent, monitor = MRef, table = Table,
                 _Error       -> reply(From, undefined)
             end,
             loop(State);
-        {From, {all_mod, Mod}} ->
-            [{_, Modtab}] = ets:lookup(Table, Mod),
-            reply(From, ets:tab2list(Modtab)),
-            loop(State);
-        {From, {delete_mod, Mod}} ->
-            [{_, Modtab}] = ets:lookup(Table, Mod),
-            ets:delete(Modtab),
-            ets:delete(Table, Mod),
-            reply(From, ok),
-            loop(State);
-        {From, {save, OutFile, Mod}} ->
+        {save, OutFile, Mod} ->
             [{_,Mtab}] = ets:lookup(Table, Mod),
-            reply(From, ets:tab2file(Mtab, OutFile)),
-            loop(State);
-        {From, {load, Mod}} ->
-            Result = case ets:lookup(Table, Mod) of
-                         []            -> opentab(Table, Mod, Includes);
-                         [{_, Modtab}] -> {ok, Modtab}
-                     end,
-            reply(From, Result),
+            ok = ets:tab2file(Mtab, OutFile),
             loop(State);
         {From, {new, Mod}} ->
-            case ets:lookup(Table, Mod) of
-                [{_, Modtab}] -> ets:delete(Modtab);
-                _             -> true
-            end,
+            [] = ets:lookup(Table, Mod),	%Assertion.
             ModTableId = ets:new(list_to_atom(lists:concat(["asn1_",Mod])), []),
             ets:insert(Table, {Mod, ModTableId}),
             reply(From, ok),
             loop(State);
-        {From, clear} ->
-            [ets:delete(Mt) || {_, Mt} <- ets:tab2list(Table)],
-            ets:delete(Table),
-            reply(From, cleared),
-            loop(State#state{table = ets:new(asn1, [set])});
-        {From, {new_includes, NewIncludes}} ->
-            reply(From, true),
-            loop(State#state{includes = NewIncludes});
         {From, stop} ->
             reply(From, stopped); %% Nothing to store
         {'DOWN', MRef, process, Parent, Reason} ->