Merge branch 'anders/diameter/performance/OTP-14343'

* anders/diameter/performance/OTP-14343: (50 commits)
  Let spawn_opt config replace erlang:spawn_opt/2 for request processes
  Move (most of) diameter_gen.hrl to diameter_gen.erl
  Change signature associated with dictionary @custom_type/@codecs
  Avoid sending answer terms between processes unnecessarily
  Refactor handling of incoming requests
  Restore diameter_codec:decode/2, update diameter_codec(3)
  Add diameter_codec option ordered_encode
  Restore undocumented Failed-AVP setting convenience
  Fix/simplify setting of one Failed-AVP
  Avoid recreating records
  Avoid recreating records
  Avoid recreating records
  Avoid recreating records
  Adapt test suites to modified encode/decode
  Simplify diameter_caps construction
  Don't compute URI defaults unnecessarily
  Don't deconstruct {TPid, Caps} unnecessarily
  Remove use of process dictionary in decode
  Remove minor diameter_config bloat
  Fix maximum AVP arity check
  ...

7 files changed, 58 insertions, 170 deletions

diff --git a/lib/diameter/test/diameter_codec_SUITE.erl b/lib/diameter/test/diameter_codec_SUITE.erl
index 558ba3b848..9f08f49f9f 100644
--- a/lib/diameter/test/diameter_codec_SUITE.erl
+++ b/lib/diameter/test/diameter_codec_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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.
@@ -31,6 +31,8 @@
 -export([suite/0,
          all/0,
          groups/0,
+         init_per_suite/1,
+         end_per_suite/1,
          init_per_group/2,
          end_per_group/2,
          init_per_testcase/2,
@@ -63,6 +65,12 @@ groups() ->
                    grouped_error,
                    failed_error]}].
 
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
 init_per_group(recode, Config) ->
     ok = diameter:start(),
     Config.
@@ -277,7 +285,14 @@ recode(Msg) ->
     recode(Msg, diameter_gen_base_rfc6733).
 
 recode(#diameter_packet{} = Pkt, Dict) ->
-    diameter_codec:decode(Dict, diameter_codec:encode(Dict, Pkt));
+    diameter_codec:decode(Dict, opts(Dict), diameter_codec:encode(Dict, Pkt));
 
 recode(Msg, Dict) ->
     recode(#diameter_packet{msg = Msg}, Dict).
+
+opts(Mod) ->
+    #{dictionary => Mod,
+      string_decode => false,
+      strict_mbit => true,
+      rfc => 6733,
+      failed_avp => false}.
diff --git a/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl b/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl
index 50cc6e7eef..700910878c 100644
--- a/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl
+++ b/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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.
@@ -59,7 +59,7 @@ enc(M, #diameter_packet{msg = Vs} = P) ->
                           P#diameter_packet{msg = [M|Vs]}).
 
 run(M, Pkt) ->
-    dec(M, diameter_codec:decode(diameter_test_recv, Pkt)).
+    dec(M, diameter_codec:decode(diameter_test_recv, opts(M), Pkt)).
 %% Note that the recv dictionary defines neither XXX nor YYY.
 
 dec('AR', #diameter_packet
@@ -75,3 +75,10 @@ dec('BR', #diameter_packet
             errors = [{5001, ?MANDATORY_XXX},
                       {5008, ?NOT_MANDATORY_YYY}]}) ->
     ok.
+
+opts(Mod) ->
+    #{dictionary => Mod,
+      string_decode => true,
+      strict_mbit => true,
+      rfc => 6733,
+      failed_avp => false}.
diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl
index 869797f11f..b548f85cb8 100644
--- a/lib/diameter/test/diameter_codec_test.erl
+++ b/lib/diameter/test/diameter_codec_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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.
@@ -94,7 +94,7 @@ base(T) ->
 
 %% Ensure that 'zero' values encode only zeros.
 base(zero = T, F) ->
-    B = diameter_types:F(encode, T),
+    B = diameter_types:F(encode, T, opts()),
     B = z(B);
 
 %% Ensure that we can decode what we encode and vice-versa, and that
@@ -106,7 +106,7 @@ base(decode, F) ->
     [] = run([[fun base_invalid/2, F, V]       || V <- Is]).
 
 base_decode(F, Eq, Value) ->
-    d(fun(X,V) -> diameter_types:F(X,V) end, Eq, Value).
+    d(fun(X,V) -> diameter_types:F(X, V, opts()) end, Eq, Value).
 
 base_invalid(F, Value) ->
     try
@@ -171,7 +171,7 @@ gen(M, avp_types, {Name, Code, Type, _Flags}) ->
     V = undefined /= VendorId,
     V = 0 /= Flags band 2#10000000,
     {Name, Type} = M:avp_name(Code, VendorId),
-    B = M:empty_value(Name),
+    B = M:empty_value(Name, #{module => M}),
     B = z(B),
     [] = avp_decode(M, Type, Name);
 
@@ -207,10 +207,22 @@ avp_decode(Mod, Name, Type, Eq, Value) ->
     d(fun(X,V) -> avp(Mod, X, V, Name, Type) end, Eq, Value).
 
 avp(Mod, decode = X, V, Name, 'Grouped') ->
-    {Rec, _} = Mod:avp(X, V, Name),
+    {Rec, _} = Mod:avp(X, V, Name, opts(Mod)),
     Rec;
-avp(Mod, X, V, Name, _) ->
-    Mod:avp(X, V, Name).
+avp(Mod, decode = X, V, Name, _) ->
+    Mod:avp(X, V, Name, opts(Mod));
+avp(Mod, encode = X, V, Name, _) ->
+    iolist_to_binary(Mod:avp(X, V, Name, opts(Mod))).
+
+opts(Mod) ->
+    (opts())#{module => Mod,
+              dictionary => Mod}.
+
+opts() ->
+    #{string_decode => true,
+      strict_mbit => true,
+      rfc => 6733,
+      failed_avp => false}.
 
 %% v/1
 
@@ -257,8 +269,8 @@ arity(M, Name, AvpName, Rec) ->
 
 enum(M, Name, {_,E}) ->
     B = <<E:32>>,
-    B = M:avp(encode, E, Name),
-    E = M:avp(decode, B, Name).
+    B = M:avp(encode, E, Name, opts(M)),
+    E = M:avp(decode, B, Name, opts(M)).
 
 retag(import_avps)   -> avp_types;
 retag(import_groups) -> grouped;
@@ -280,7 +292,8 @@ d(F, Eq, V) ->
         end.
 
 z(B) ->
-    << <<0>> || <<_>> <= B >>.
+    Sz = size(B),
+    <<0:Sz/unit:8>>.
 
 %% values/1
 %%
diff --git a/lib/diameter/test/diameter_compiler_SUITE.erl b/lib/diameter/test/diameter_compiler_SUITE.erl
index 7a9ac65ae3..73fe1ef6e0 100644
--- a/lib/diameter/test/diameter_compiler_SUITE.erl
+++ b/lib/diameter/test/diameter_compiler_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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.
@@ -39,7 +39,7 @@
 -export([dict/0]).  %% fake dictionary module
 
 %% dictionary callbacks for flatten2/1
--export(['A1'/3, 'Unsigned32'/3]).
+-export(['A1'/4, 'Unsigned32'/4]).
 
 -define(base, "base_rfc3588.dia").
 -define(util, diameter_util).
@@ -552,13 +552,13 @@ flatten2(_Config) ->
                         T <- [encode, decode],
                         M <- [M2, M3],
                         Ref <- [make_ref()],
-                        RC <- [M:avp(T, Ref, A)],
+                        RC <- [M:avp(T, Ref, A, #{module => M})],
                         RC /= {T, Ref}].
 
-'A1'(T, 'Unsigned32', Ref) ->
+'A1'(T, 'Unsigned32', Ref, _Opts) ->
     {T, Ref}.
 
-'Unsigned32'(T, 'A3', Ref) ->
+'Unsigned32'(T, 'A3', Ref, _Opts) ->
     {T, Ref}.
 
 load_forms(Forms) ->
diff --git a/lib/diameter/test/diameter_dict_SUITE.erl b/lib/diameter/test/diameter_dict_SUITE.erl
deleted file mode 100644
index 4c1349f4eb..0000000000
--- a/lib/diameter/test/diameter_dict_SUITE.erl
+++ /dev/null
@@ -1,145 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2016. 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.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%% Tests of the dict-like diameter_dict.
-%%
-
--module(diameter_dict_SUITE).
-
--export([suite/0,
-         all/0,
-         groups/0]).
-
-%% testcases
--export([append/1,
-         fetch/1,
-         fetch_keys/1,
-         filter/1,
-         find/1,
-         fold/1,
-         is_key/1,
-         map/1,
-         merge/1,
-         update/1,
-         update_counter/1]).
-
--include("diameter_ct.hrl").
-
--define(dict, diameter_dict).
--define(util, diameter_util).
-
-%% ===========================================================================
-
-suite() ->
-    [{timetrap, {seconds, 60}}].
-
-all() ->
-    [{group, all},
-     {group, all, [parallel]}].
-
-groups() ->
-    [{all, [], tc()}].
-
-tc() ->
-    [append,
-     fetch,
-     fetch_keys,
-     filter,
-     find,
-     fold,
-     is_key,
-     map,
-     merge,
-     update,
-     update_counter].
-
-%% ===========================================================================
-
--define(KV100, [{N,[N]} || N <- lists:seq(1,100)]).
-
-append(_) ->
-    D = ?dict:append(k, v, ?dict:new()),
-    [{k,[v,v]}] = ?dict:to_list(?dict:append(k, v, D)).
-
-fetch(_) ->
-    D = ?dict:from_list(?KV100),
-    [50] = ?dict:fetch(50, D),
-    Ref = make_ref(),
-    Ref = try ?dict:fetch(Ref, D) catch _:_ -> Ref end.
-
-fetch_keys(_) ->
-    L = ?KV100,
-    D = ?dict:from_list(L),
-    L = [{N,[N]} || N <- lists:sort(?dict:fetch_keys(D))].
-
-filter(_) ->
-    L = ?KV100,
-    F = fun(K,[_]) -> 0 == K rem 2 end,
-    D = ?dict:filter(F, ?dict:from_list(L)),
-    true = [T || {K,V} = T <- L, F(K,V)] == lists:sort(?dict:to_list(D)).
-
-find(_) ->
-    D = ?dict:from_list(?KV100),
-    {ok, [50]} = ?dict:find(50, D),
-    error = ?dict:find(make_ref(), D).
-
-fold(_) ->
-    L = ?KV100,
-    S = lists:sum([N || {N,_} <- L]),
-    S = ?dict:fold(fun(K,[_],A) -> K + A end, 0, ?dict:from_list(L)).
-
-is_key(_) ->
-    L = ?KV100,
-    D = ?dict:from_list(L),
-    true = lists:all(fun({N,_}) -> ?dict:is_key(N,D) end, L),
-    false = ?dict:is_key(make_ref(), D).
-
-map(_) ->
-    L = ?KV100,
-    F = fun(_,V) -> [N] = V, N*2 end,
-    D = ?dict:map(F, ?dict:from_list(L)),
-    M = [{K, F(K,V)} || {K,V} <- L],
-    M = lists:sort(?dict:to_list(D)).
-
-merge(_) ->
-    L = ?KV100,
-    F = fun(_,V1,V2) -> V1 ++ V2 end,
-    D = ?dict:merge(F, ?dict:from_list(L), ?dict:from_list(L)),
-    M = [{K, F(K,V,V)} || {K,V} <- L],
-    M = lists:sort(?dict:to_list(D)).
-
-update(_) ->
-    L = ?KV100,
-    F = fun([V]) -> 2*V end,
-    D = ?dict:update(50, F, ?dict:from_list(L)),
-    100 = ?dict:fetch(50, D),
-    Ref = make_ref(),
-    Ref = try ?dict:update(Ref, F, D) catch _:_ -> Ref end,
-    [Ref] = ?dict:fetch(Ref, ?dict:update(Ref,
-                                          fun(_,_) -> ?ERROR(i_think_not) end,
-                                          [Ref],
-                                          D)).
-
-update_counter(_) ->
-    L = [{N,2*N} || {N,_} <- ?KV100],
-    D = ?dict:update_counter(50, 20, ?dict:from_list(L)),
-    120 = ?dict:fetch(50,D),
-    2 = ?dict:fetch(1,D).
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index c6d63a9345..871a27f8b1 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -202,8 +202,7 @@
          {'Acct-Application-Id', [?DIAMETER_APP_ID_ACCOUNTING]},
          {restrict_connections, false},
          {string_decode, Decode},
-         {incoming_maxlen, 1 bsl 21},
-         {spawn_opt, [{min_heap_size, 5000}]}
+         {incoming_maxlen, 1 bsl 21}
          | [{application, [{dictionary, D},
                            {module, ?MODULE},
                            {answer_errors, callback}]}
@@ -465,8 +464,8 @@ add_transports(Config) ->
                             || T == sctp andalso CS]],
                         [{capabilities_cb, fun capx/2},
                          {pool_size, 8},
-                         {spawn_opt, [{min_heap_size, 8096}]},
-                         {applications, apps(rfc3588)}]),
+                         {applications, apps(rfc3588)}]
+                        ++ [{spawn_opt, {erlang, spawn, []}} || CS]),
     Cs = [?util:connect(CN,
                         [T, {sender, CS}],
                         LRef,
diff --git a/lib/diameter/test/modules.mk b/lib/diameter/test/modules.mk
index 80d0f8d59c..0c73adca12 100644
--- a/lib/diameter/test/modules.mk
+++ b/lib/diameter/test/modules.mk
@@ -1,7 +1,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2015. All Rights Reserved.
+# Copyright Ericsson AB 2010-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.
@@ -31,7 +31,6 @@ MODULES = \
 	diameter_codec_test \
 	diameter_config_SUITE \
 	diameter_compiler_SUITE \
-	diameter_dict_SUITE \
 	diameter_distribution_SUITE \
 	diameter_dpr_SUITE \
 	diameter_event_SUITE \