File 0376-snmp-test-Tweaked-the-host-analyzis-for-Op... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0376-snmp-test-Tweaked-the-host-analyzis-for-OpenBSD.patch of Package erlang (Revision 3663bb9606f23c4ba295a87cfbbd490d)

Currently displaying revision 3663bb9606f23c4ba295a87cfbbd490d , Show latest

From a1d9f52e126940e5cb280341071243c6212a85fb Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 13 Apr 2022 10:15:49 +0200
Subject: [PATCH 2/2] [snmp|test] Tweaked the host analyzis for OpenBSD

---
 lib/snmp/test/snmp_test_lib.erl | 58 +++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index 68244b3f80..548e86f1c9 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -1447,39 +1447,71 @@ analyze_and_print_openbsd_host_info(Version) ->
             io:format("TS Scale Factor: ~w~n", [timetrap_scale_factor()]),
             CPUFactor =
                 if
-                    (CPUSpeed =:= -1) ->
-                        1;
-                    (CPUSpeed >= 2000) ->
+                    (CPUSpeed >= 3000) ->
                         if
-                            (NCPU >= 4) ->
+                            (NCPU >= 8) ->
                                 1;
+                            (NCPU >= 6) ->
+                                2;
+                            (NCPU >= 4) ->
+                                3;
                             (NCPU >= 2) ->
+                                4;
+                            true ->
+                                10
+                        end;
+                    (CPUSpeed >= 2000) ->
+                        if
+                            (NCPU >= 8) ->
                                 2;
+                            (NCPU >= 6) ->
+                                3;
+                            (NCPU >= 4) ->
+                                4;
+                            (NCPU >= 2) ->
+                                5;
                             true ->
-                                3
+                                12
+                        end;
+                    (CPUSpeed >= 1000) ->
+                        if
+                            (NCPU >= 8) ->
+                                3;
+                            (NCPU >= 6) ->
+                                4;
+                            (NCPU >= 4) ->
+                                5;
+                            (NCPU >= 2) ->
+                                6;
+                            true ->
+                                14
                         end;
                     true ->
                         if
+                            (NCPU >= 8) ->
+                                4;
+                            (NCPU >= 6) ->
+                                6;
                             (NCPU >= 4) ->
-                                2;
+                                8;
                             (NCPU >= 2) ->
-                                3;
+                                10;
                             true ->
-                                4
+                                20
                         end
                 end,
             MemAddFactor =
                 if
-                    (Memory =:= -1) ->
+                    (Memory >= 16777216) ->
                         0;
                     (Memory >= 8388608) ->
-                        0;
-                    (Memory >= 4194304) ->
                         1;
+                    (Memory >= 4194304) ->
+                        3;
                     (Memory >= 2097152) ->
-                        2;
+                        5;
                     true ->
-                        3
+                        10
                 end,
             {CPUFactor + MemAddFactor, []}
         end
-- 
2.34.1

Places

File 0376-snmp-test-Tweaked-the-host-analyzis-for-OpenBSD.patch of Package erlang (Revision 3663bb9606f23c4ba295a87cfbbd490d)

Places