8217848: [Graal] vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003/TestDescription.java fails

Reviewed-by: kvn, dlong
This commit is contained in:
Igor Ignatyev 2019-01-31 12:52:55 -08:00
parent 7f57d05d73
commit 96e6617ee7

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -148,7 +148,7 @@ void set_client_compilation_mode() {
FLAG_SET_ERGO(uintx, CodeCacheExpansionSize, 32*K); FLAG_SET_ERGO(uintx, CodeCacheExpansionSize, 32*K);
} }
if (FLAG_IS_DEFAULT(MetaspaceSize)) { if (FLAG_IS_DEFAULT(MetaspaceSize)) {
FLAG_SET_ERGO(size_t, MetaspaceSize, 12*M); FLAG_SET_ERGO(size_t, MetaspaceSize, MIN2(12*M, MaxMetaspaceSize));
} }
if (FLAG_IS_DEFAULT(MaxRAM)) { if (FLAG_IS_DEFAULT(MaxRAM)) {
// Do not use FLAG_SET_ERGO to update MaxRAM, as this will impact // Do not use FLAG_SET_ERGO to update MaxRAM, as this will impact
@ -264,7 +264,7 @@ void set_jvmci_specific_flags() {
FLAG_SET_DEFAULT(InitialCodeCacheSize, MAX2(16*M, InitialCodeCacheSize)); FLAG_SET_DEFAULT(InitialCodeCacheSize, MAX2(16*M, InitialCodeCacheSize));
} }
if (FLAG_IS_DEFAULT(MetaspaceSize)) { if (FLAG_IS_DEFAULT(MetaspaceSize)) {
FLAG_SET_DEFAULT(MetaspaceSize, MAX2(12*M, MetaspaceSize)); FLAG_SET_DEFAULT(MetaspaceSize, MIN2(MAX2(12*M, MetaspaceSize), MaxMetaspaceSize));
} }
if (FLAG_IS_DEFAULT(NewSizeThreadIncrease)) { if (FLAG_IS_DEFAULT(NewSizeThreadIncrease)) {
FLAG_SET_DEFAULT(NewSizeThreadIncrease, MAX2(4*K, NewSizeThreadIncrease)); FLAG_SET_DEFAULT(NewSizeThreadIncrease, MAX2(4*K, NewSizeThreadIncrease));