Author: pmouawad
Date: Sun Feb  4 19:48:55 2018
New Revision: 1823105

URL: http://svn.apache.org/viewvc?rev=1823105&view=rev
Log:
Rename JMETER_HEAP to HEAP

Modified:
    jmeter/trunk/bin/jmeter
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
    jmeter/trunk/xdocs/usermanual/get-started.xml

Modified: jmeter/trunk/bin/jmeter
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1823105&r1=1823104&r2=1823105&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Sun Feb  4 19:48:55 2018
@@ -37,7 +37,7 @@
 ##                    algorithm
 ##                    Defaults to "-XX:+UseG1GC -XX:MaxGCPauseMillis=100 
-XX:G1ReservePercent=20"
 ##
-##   JMETER_HEAP      (Optional) Java runtime options for memory management
+##   HEAP      (Optional) Java runtime options for memory management
 ##                    used when JMeter is started.
 ##                    Defaults to "-Xms1g -Xmx1g -X:MaxMetaspaceSize=256m"
 ##
@@ -156,7 +156,7 @@ esac
 
 # This is the base heap size -- you may increase or decrease it to fit your
 # system's memory availability:
-: "${JMETER_HEAP:="-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m"}"
+: "${HEAP:="-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m"}"
 
 # Set language
 # Default to en_EN
@@ -184,7 +184,7 @@ SYSTEM_PROPS="-Djava.security.egd=file:/
 SERVER="-server"
 
 if [ -z "${JMETER_COMPLETE_ARGS}" ]; then
-    ARGS="$JAVA9_OPTS $SERVER $DUMP $JMETER_HEAP $VERBOSE_GC $JMETER_GC_ALGO 
$SYSTEM_PROPS $JMETER_LANGUAGE $RUN_IN_DOCKER"
+    ARGS="$JAVA9_OPTS $SERVER $DUMP $HEAP $VERBOSE_GC $JMETER_GC_ALGO 
$SYSTEM_PROPS $JMETER_LANGUAGE $RUN_IN_DOCKER"
 else
     ARGS=""
 fi

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1823105&r1=1823104&r2=1823105&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Feb  4 19:48:55 2018
@@ -349,7 +349,7 @@ public class JMeter implements JMeterPlu
         System.out.println("For load testing, use NON GUI Mode:");//NOSONAR
         System.out.println("   jmeter -n -t [jmx file] -l [results file] -e -o 
[Path to web report folder]");//NOSONAR
         System.out.println("& increase Java Heap to meet your test 
requirements:");//NOSONAR
-        System.out.println("   Modify current env variable 
JMETER_HEAP=\"-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m\" in the jmeter batch 
file");//NOSONAR
+        System.out.println("   Modify current env variable HEAP=\"-Xms1g 
-Xmx1g -XX:MaxMetaspaceSize=256m\" in the jmeter batch file");//NOSONAR
         System.out.println("Check : 
https://jmeter.apache.org/usermanual/best-practices.html";);//NOSONAR
         
System.out.println("================================================================================");//NOSONAR
         

Modified: jmeter/trunk/xdocs/usermanual/get-started.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/get-started.xml?rev=1823105&r1=1823104&r2=1823105&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/get-started.xml (original)
+++ jmeter/trunk/xdocs/usermanual/get-started.xml Sun Feb  4 19:48:55 2018
@@ -313,7 +313,7 @@ will override the HEAP settings in the s
 # it will be sourced in by bin/jmeter
 
 # Use a bigger heap, but a smaller metaspace, than the default
-export JMETER_HEAP="-Xms1G -Xmx1G -XMaxMetaspaceSize=192m"
+export HEAP="-Xms1G -Xmx1G -XMaxMetaspaceSize=192m"
 
 # Try to guess the locale from the OS. The space as value is on purpose!
 export JMETER_LANGUAGE=" "
@@ -324,7 +324,7 @@ export JMETER_LANGUAGE=" "
 <dt><code>JAVA_HOME</code></dt><dd>Must point at your Java Development Kit 
installation. Required to run the with the "<code>debug</code>" argument. On 
some OSes it JMeter will try its best to guess the location of the JVM.</dd>
 <dt><code>JRE_HOME</code></dt><dd>Must point at your Java Runtime 
installation. Defaults to <code>JAVA_HOME</code> if empty. If 
<code>JRE_HOME</code> and <code>JAVA_HOME</code> are both empty, JMeter will 
try to guess <code>JAVA_HOME</code>. If <code>JRE_HOME</code> and 
<code>JAVA_HOME</code> are both set, <code>JAVA_HOME</code> is used.</dd>
 <dt><code>JMETER_GC_ALGO</code></dt><dd>Java runtime options to specify JVM 
garbage collection algorithm. Defaults to <code>-XX:+UseG1GC 
-XX:MaxGCPauseMillis=250 -XX:G1ReservePercent=20</code></dd>
-<dt><code>JMETER_HEAP</code></dt><dd>Java runtime options for memory 
management used when JMeter is started. Defaults to <code>-Xms512m -Xmx512m 
-X:MaxMetaspaceSize=256m</code></dd>
+<dt><code>HEAP</code></dt><dd>Java runtime options for memory management used 
when JMeter is started. Defaults to <code>-Xms512m -Xmx512m 
-X:MaxMetaspaceSize=256m</code></dd>
 <dt><code>JMETER_HOME</code></dt><dd>May point to your JMeter install dir. If 
empty it will be set relative to the <code>jmeter</code> script.</dd>
 <dt><code>JMETER_LANGUAGE</code></dt><dd>Java runtime options to specify used 
language. Defaults to <code>-Duser.language=en -Duser.region=EN</code></dd>
 <dt><code>JMETER_OPTS</code></dt><dd>Java runtime options used when JMeter is 
started. Special options for operating systems might be added by JMeter.</dd>


Reply via email to