File 2451-snmp-test-Adjusted-factor-calculation.patch of Package erlang
From e1382bfe2fbd301dc5b5d7aa6f674d55aff4a337 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 24 Jun 2020 21:35:40 +0200
Subject: [PATCH] [snmp|test] Adjusted factor calculation
Use "online schedulers" to calculate factor.
---
lib/snmp/test/snmp_test_lib.erl | 62 ++++++++++++++++-----------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index 76f424d25c..41330cfb78 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -886,9 +886,9 @@ analyze_and_print_host_info() ->
analyze_and_print_win_host_info(Version);
_ ->
io:format("OS Family: ~p"
- "~n OS Type: ~p"
- "~n Version: ~p"
- "~n Num Schedulers: ~s"
+ "~n OS Type: ~p"
+ "~n Version: ~p"
+ "~n Num Online Schedulers: ~s"
"~n", [OsFam, OsName, Version, str_num_schedulers()]),
{num_schedulers_to_factor(), []}
end.
@@ -940,9 +940,9 @@ analyze_and_print_linux_host_info(Version) ->
case (catch linux_which_cpuinfo(Distro)) of
{ok, {CPU, BogoMIPS}} ->
io:format("CPU: "
- "~n Model: ~s"
- "~n BogoMIPS: ~w"
- "~n Num Schedulers: ~s"
+ "~n Model: ~s"
+ "~n BogoMIPS: ~w"
+ "~n Num Online Schedulers: ~s"
"~n", [CPU, BogoMIPS, str_num_schedulers()]),
if
(BogoMIPS > 20000) ->
@@ -960,8 +960,8 @@ analyze_and_print_linux_host_info(Version) ->
end;
{ok, CPU} ->
io:format("CPU: "
- "~n Model: ~s"
- "~n Num Schedulers: ~s"
+ "~n Model: ~s"
+ "~n Num Online Schedulers: ~s"
"~n", [CPU, str_num_schedulers()]),
NumChed = erlang:system_info(schedulers),
if
@@ -1329,10 +1329,10 @@ analyze_and_print_freebsd_host_info(Version) ->
NCPU = analyze_freebsd_ncpu(Extract),
Memory = analyze_freebsd_memory(Extract),
io:format("CPU:"
- "~n Model: ~s"
- "~n Speed: ~w"
- "~n N: ~w"
- "~n Num Schedulers: ~s"
+ "~n Model: ~s"
+ "~n Speed: ~w"
+ "~n N: ~w"
+ "~n Num Online Schedulers: ~s"
"~nMemory:"
"~n ~w KB"
"~n",
@@ -1381,7 +1381,7 @@ analyze_and_print_freebsd_host_info(Version) ->
catch
_:_:_ ->
io:format("CPU:"
- "~n Num Schedulers: ~s"
+ "~n Num Online Schedulers: ~s"
"~n", [str_num_schedulers()]),
io:format("TS Scale Factor: ~w~n", [timetrap_scale_factor()]),
Factor = case erlang:system_info(schedulers) of
@@ -1589,8 +1589,8 @@ analyze_and_print_darwin_host_info(Version) ->
case analyze_darwin_software_info() of
[] ->
io:format("Darwin:"
- "~n Version: ~s"
- "~n Num Schedulers: ~s"
+ "~n Version: ~s"
+ "~n Num Online Schedulers: ~s"
"~n", [Version, str_num_schedulers()]),
{num_schedulers_to_factor(), []};
SwInfo when is_list(SwInfo) ->
@@ -1605,12 +1605,12 @@ analyze_and_print_darwin_host_info(Version) ->
NumCores = analyze_darwin_hw_total_number_of_cores(HwInfo),
Memory = analyze_darwin_hw_memory(HwInfo),
io:format("Darwin:"
- "~n System Version: ~s"
- "~n Kernel Version: ~s"
- "~n Model: ~s (~s)"
- "~n Processor: ~s (~s, ~s, ~s)"
- "~n Memory: ~s"
- "~n Num Schedulers: ~s"
+ "~n System Version: ~s"
+ "~n Kernel Version: ~s"
+ "~n Model: ~s (~s)"
+ "~n Processor: ~s (~s, ~s, ~s)"
+ "~n Memory: ~s"
+ "~n Num Online Schedulers: ~s"
"~n", [SystemVersion, KernelVersion,
ModelName, ModelId,
ProcName, ProcSpeed, NumProc, NumCores,
@@ -1930,13 +1930,13 @@ analyze_and_print_solaris_host_info(Version) ->
"-"
end,
io:format("Solaris: ~s"
- "~n Release: ~s"
- "~n Banner Name: ~s"
- "~n Instruction Set: ~s"
- "~n CPUs: ~s (~s)"
- "~n System Config: ~s"
- "~n Memory Size: ~s"
- "~n Num Schedulers: ~s"
+ "~n Release: ~s"
+ "~n Banner Name: ~s"
+ "~n Instruction Set: ~s"
+ "~n CPUs: ~s (~s)"
+ "~n System Config: ~s"
+ "~n Memory Size: ~s"
+ "~n Num Online Schedulers: ~s"
"~n~n", [Version, Release, BannerName, InstructionSet,
NumPhysCPU, NumVCPU,
SysConf, MemSz,
@@ -2008,7 +2008,7 @@ analyze_and_print_win_host_info(Version) ->
"~n System Model: ~s"
"~n Number of Processor(s): ~s"
"~n Total Physical Memory: ~s"
- "~n Num Schedulers: ~s"
+ "~n Num Online Schedulers: ~s"
"~n~n", [OsName, OsVersion, Version,
SysMan, SysMod, NumProcs, TotPhysMem,
str_num_schedulers()]),
@@ -2134,14 +2134,14 @@ process_win_system_info([H|T], Acc) ->
str_num_schedulers() ->
- try erlang:system_info(schedulers) of
+ try erlang:system_info(schedulers_online) of
N -> f("~w", [N])
catch
_:_:_ -> "-"
end.
num_schedulers_to_factor() ->
- try erlang:system_info(schedulers) of
+ try erlang:system_info(schedulers_online) of
1 ->
10;
2 ->
--
2.26.2
