8186248: Allow more flexibility in selecting Heap % of available RAM

Reviewed-by: dholmes, drwhite
This commit is contained in:
Bob Vandette 2017-08-29 15:52:59 -04:00
parent 82859535c3
commit d74f4e6857

View File

@ -328,9 +328,9 @@ define SetupRunJtregTestBody
$1_JTREG_JOBS := 50 $1_JTREG_JOBS := 50
endif endif
# Make sure MaxRAMFraction is high enough to not cause OOM or swapping since # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since
# we may end up with a lot of JVM's # we may end up with a lot of JVM's
$1_JTREG_MAX_RAM_FRACTION := $$(shell $$(EXPR) $$($1_JTREG_JOBS) \* 4) $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
JTREG_TIMEOUT ?= 4 JTREG_TIMEOUT ?= 4
JTREG_VERBOSE ?= fail,error,summary JTREG_VERBOSE ?= fail,error,summary
@ -344,7 +344,7 @@ define SetupRunJtregTestBody
$1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \ $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
-verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \ -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
-concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT) \ -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT) \
-vmoption:-XX:MaxRAMFraction=$$($1_JTREG_MAX_RAM_FRACTION) -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE)
$1_JTREG_BASIC_OPTIONS += -automatic -keywords:\!ignore -ignore:quiet $1_JTREG_BASIC_OPTIONS += -automatic -keywords:\!ignore -ignore:quiet