File 3036-Polish-the-test-code-and-adjust-the-dev-gr... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3036-Polish-the-test-code-and-adjust-the-dev-group.patch of Package erlang (Revision 2f15b05a39d64e5cba90e927e8665465)

Currently displaying revision 2f15b05a39d64e5cba90e927e8665465 , Show latest

From b1d47bf5f623cb5321635ddcf41e1295204bc4d2 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Wed, 21 Feb 2024 15:26:44 +0100
Subject: [PATCH 06/22]  Polish the test code and adjust the 'dev' group

---
 lib/kernel/test/gen_tcp_socket_SUITE.erl | 27 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/lib/kernel/test/gen_tcp_socket_SUITE.erl b/lib/kernel/test/gen_tcp_socket_SUITE.erl
index 321b30da66..d574066e73 100644
--- a/lib/kernel/test/gen_tcp_socket_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_socket_SUITE.erl
@@ -34,8 +34,8 @@ groups() ->
      %%
      {dev,          [{group,dev_direct},
                      {group,dev_inet}, {group,dev_socket}]},
-     {dev_inet,     [active_raw, active_true, active_false, active_once]},
-     {dev_socket,   [active_raw, active_true, active_false, active_once]},
+     {dev_inet,     testcases(dev)},
+     {dev_socket,   testcases(dev)},
      {dev_direct,   testcases(direct)},
      %%
      {small,        backend_groups()},
@@ -51,14 +51,19 @@ backend_groups() ->
     [{group,inet}, {group,socket}, {group,direct}].
 
 testcases(active) ->
-    [active_raw, active_false, active_true, active_once,
-     active_1, active_5, active_20];
+    [active_raw, active_false, active_true,
+     active_once, active_1, active_5, active_20];
+testcases(dev) ->
+    [active_raw, active_false, active_true,
+     active_once, active_20];
 testcases(direct) ->
     [socket_raw, socket_packet, socket_packet_buf, socket_packet_cheat].
 
 -define(SUITE, "gen_tcp_socket").
 -define(DOMAIN, inet).
--define(NORM_EXP, 30).
+%% *_EXP is a power of 2 exponent so the resulting value is
+%% 1 bsl ?*_EXP
+-define(NORM_EXP, 30). % Total byte size norm: packet size * number of packets
 -define(BUFSIZE_EXP, 17).
 -define(BUFSIZE, (1 bsl ?BUFSIZE_EXP)).
 
@@ -81,14 +86,20 @@ end_per_suite(_Config) ->
 init_per_group(Nm, Config) ->
     case Nm of
         smoketest   -> [{burden,0} | Config];
-        benchmark   -> [{burden,2} | Config];
+        benchmark   -> [{burden,2} | Config]; % 4 times the total size
         %%
-        dev         -> init_per_group(dev_size, [{burden,0} | Config]);
+        dev         -> init_per_group(dev_size, [{burden,3} | Config]);
         dev_inet    -> init_per_group(inet,     Config);
         dev_socket  -> init_per_group(socket,   Config);
         dev_direct  -> init_per_group(direct,   Config);
         %%
-        dev_size    -> init_per_group_size(6, 8, Config);
+        dev_size    ->
+            init_per_group_size(
+              ?BUFSIZE_EXP + 4, ?NORM_EXP - (?BUFSIZE_EXP + 4), Config);
+        %% For small packets we cannot have the total size 2^?NORM_EXP
+        %% since the message passing overhead (latency) starts to dominate
+        %% so we have to subtract some from the exponent to get
+        %% roughly the same running time
         small       -> init_per_group_size(7, ?NORM_EXP - 7 - 3, Config);
         medium      -> init_per_group_size(10, ?NORM_EXP - 10 - 1, Config);
         large       -> init_per_group_size(15, ?NORM_EXP - 15, Config);
-- 
2.35.3

Places

File 3036-Polish-the-test-code-and-adjust-the-dev-group.patch of Package erlang (Revision 2f15b05a39d64e5cba90e927e8665465)

Places