aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-11-20 14:34:06 +0100
committerLukas Larsson <[email protected]>2013-11-25 10:00:50 +0100
commite9c04e92199deb274e1bb74e4caecd296443ca5f (patch)
tree0065b91b67fbb09b94fc40926e3a9b62a90ff9e5 /erts/emulator/test
parent81a497cc1fd21cdd4f545c3ed7c64705ca5fc65c (diff)
downloadotp-e9c04e92199deb274e1bb74e4caecd296443ca5f.tar.gz
otp-e9c04e92199deb274e1bb74e4caecd296443ca5f.tar.bz2
otp-e9c04e92199deb274e1bb74e4caecd296443ca5f.zip
Improve error info when main carrier creation fails
Also fix testcase that failed due to main carrier creation failure.
Diffstat (limited to 'erts/emulator/test')
-rw-r--r--erts/emulator/test/alloc_SUITE.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index f6ff6bb813..bc83c94c41 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -127,7 +127,12 @@ erts_mmap(Config) when is_list(Config) ->
erts_mmap_do(Config, SCO, SCRPM, SCMGC) ->
- SCS = 100, % Mb
+ %% We use the number of schedulers + 1 * approx main carriers size
+ %% to calculate how large the super carrier has to be
+ %% and then use a minimum of 100 for systems with a low amount of
+ %% schedulers
+ Schldr = erlang:system_info(schedulers_online)+1,
+ SCS = max(round((262144 * 6 + 3 * 1048576) * Schldr / 1024 / 1024),100),
O1 = "+MMscs" ++ integer_to_list(SCS)
++ " +MMsco" ++ atom_to_list(SCO)
++ " +MMscrpm" ++ atom_to_list(SCRPM),