1.1 --- a/common/autoconf/generated-configure.sh Wed May 22 13:49:12 2013 +0100
1.2 +++ b/common/autoconf/generated-configure.sh Wed May 22 17:26:31 2013 +0200
1.3 @@ -599,7 +599,6 @@
1.4 USE_PRECOMPILED_HEADER
1.5 SJAVAC_SERVER_DIR
1.6 ENABLE_SJAVAC
1.7 -SJAVAC_SERVER_CORES
1.8 SJAVAC_SERVER_JAVA
1.9 JOBS
1.10 MEMORY_SIZE
1.11 @@ -1025,7 +1024,6 @@
1.12 with_memory_size
1.13 with_jobs
1.14 with_sjavac_server_java
1.15 -with_sjavac_server_cores
1.16 enable_sjavac
1.17 enable_precompiled_headers
1.18 enable_ccache
1.19 @@ -1796,9 +1794,6 @@
1.20 --with-sjavac-server-java
1.21 use this java binary for running the sjavac
1.22 background server [Boot JDK java]
1.23 - --with-sjavac-server-cores
1.24 - use at most this number of concurrent threads on the
1.25 - sjavac server [probed]
1.26 --with-ccache-dir where to store ccache files [~/.ccache]
1.27
1.28 Some influential environment variables:
1.29 @@ -3077,6 +3072,9 @@
1.30 # questions.
1.31 #
1.32
1.33 +# Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
1.34 +# If so, then append $1 to $2\
1.35 +# Also set JVM_ARG_OK to true/false depending on outcome.
1.36
1.37
1.38 # This will make sure the given variable points to a full and proper
1.39 @@ -3775,7 +3773,7 @@
1.40 #CUSTOM_AUTOCONF_INCLUDE
1.41
1.42 # Do not change or remove the following line, it is needed for consistency checks:
1.43 -DATE_WHEN_GENERATED=1367502949
1.44 +DATE_WHEN_GENERATED=1369236348
1.45
1.46 ###############################################################################
1.47 #
1.48 @@ -15705,73 +15703,115 @@
1.49
1.50 # Minimum amount of heap memory.
1.51
1.52 - # Test if -Xms64M is a valid argument to $JAVA (often is $JAVA passed as $JAVA)
1.53 - # If so, then append -Xms64M to boot_jdk_jvmargs
1.54 - FOUND_WARN=`$JAVA -Xms64M -version 2>&1 | grep -i warn`
1.55 - FOUND_VERSION=`$JAVA -Xms64M -version 2>&1 | grep " version \""`
1.56 + $ECHO "Check if jvm arg is ok: -Xms64M" >&5
1.57 + $ECHO "Command: $JAVA -Xms64M -version" >&5
1.58 + OUTPUT=`$JAVA -Xms64M -version 2>&1`
1.59 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.60 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.61 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.62 boot_jdk_jvmargs="$boot_jdk_jvmargs -Xms64M"
1.63 + JVM_ARG_OK=true
1.64 + else
1.65 + $ECHO "Arg failed:" >&5
1.66 + $ECHO "$OUTPUT" >&5
1.67 + JVM_ARG_OK=false
1.68 fi
1.69
1.70 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.71 # Why does macosx need more heap? Its the huge JDK batch.
1.72
1.73 - # Test if -Xmx1600M is a valid argument to $JAVA (often is $JAVA passed as $JAVA)
1.74 - # If so, then append -Xmx1600M to boot_jdk_jvmargs
1.75 - FOUND_WARN=`$JAVA -Xmx1600M -version 2>&1 | grep -i warn`
1.76 - FOUND_VERSION=`$JAVA -Xmx1600M -version 2>&1 | grep " version \""`
1.77 + $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5
1.78 + $ECHO "Command: $JAVA -Xmx1600M -version" >&5
1.79 + OUTPUT=`$JAVA -Xmx1600M -version 2>&1`
1.80 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.81 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.82 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.83 boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1600M"
1.84 - fi
1.85 -
1.86 - else
1.87 -
1.88 - # Test if -Xmx1100M is a valid argument to $JAVA (often is $JAVA passed as $JAVA)
1.89 - # If so, then append -Xmx1100M to boot_jdk_jvmargs
1.90 - FOUND_WARN=`$JAVA -Xmx1100M -version 2>&1 | grep -i warn`
1.91 - FOUND_VERSION=`$JAVA -Xmx1100M -version 2>&1 | grep " version \""`
1.92 + JVM_ARG_OK=true
1.93 + else
1.94 + $ECHO "Arg failed:" >&5
1.95 + $ECHO "$OUTPUT" >&5
1.96 + JVM_ARG_OK=false
1.97 + fi
1.98 +
1.99 + else
1.100 +
1.101 + $ECHO "Check if jvm arg is ok: -Xmx1100M" >&5
1.102 + $ECHO "Command: $JAVA -Xmx1100M -version" >&5
1.103 + OUTPUT=`$JAVA -Xmx1100M -version 2>&1`
1.104 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.105 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.106 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.107 boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1100M"
1.108 + JVM_ARG_OK=true
1.109 + else
1.110 + $ECHO "Arg failed:" >&5
1.111 + $ECHO "$OUTPUT" >&5
1.112 + JVM_ARG_OK=false
1.113 fi
1.114
1.115 fi
1.116 # When is adding -client something that speeds up the JVM?
1.117 # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA])
1.118
1.119 - # Test if -XX:PermSize=32m is a valid argument to $JAVA (often is $JAVA passed as $JAVA)
1.120 - # If so, then append -XX:PermSize=32m to boot_jdk_jvmargs
1.121 - FOUND_WARN=`$JAVA -XX:PermSize=32m -version 2>&1 | grep -i warn`
1.122 - FOUND_VERSION=`$JAVA -XX:PermSize=32m -version 2>&1 | grep " version \""`
1.123 + $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5
1.124 + $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5
1.125 + OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1`
1.126 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.127 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.128 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.129 boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:PermSize=32m"
1.130 - fi
1.131 -
1.132 -
1.133 - # Test if -XX:MaxPermSize=160m is a valid argument to $JAVA (often is $JAVA passed as $JAVA)
1.134 - # If so, then append -XX:MaxPermSize=160m to boot_jdk_jvmargs
1.135 - FOUND_WARN=`$JAVA -XX:MaxPermSize=160m -version 2>&1 | grep -i warn`
1.136 - FOUND_VERSION=`$JAVA -XX:MaxPermSize=160m -version 2>&1 | grep " version \""`
1.137 + JVM_ARG_OK=true
1.138 + else
1.139 + $ECHO "Arg failed:" >&5
1.140 + $ECHO "$OUTPUT" >&5
1.141 + JVM_ARG_OK=false
1.142 + fi
1.143 +
1.144 +
1.145 + $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5
1.146 + $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5
1.147 + OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1`
1.148 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.149 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.150 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.151 boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:MaxPermSize=160m"
1.152 - fi
1.153 -
1.154 -
1.155 - # Test if -XX:ThreadStackSize=$STACK_SIZE is a valid argument to $JAVA (often is $JAVA passed as $JAVA)
1.156 - # If so, then append -XX:ThreadStackSize=$STACK_SIZE to boot_jdk_jvmargs
1.157 - FOUND_WARN=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1 | grep -i warn`
1.158 - FOUND_VERSION=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1 | grep " version \""`
1.159 + JVM_ARG_OK=true
1.160 + else
1.161 + $ECHO "Arg failed:" >&5
1.162 + $ECHO "$OUTPUT" >&5
1.163 + JVM_ARG_OK=false
1.164 + fi
1.165 +
1.166 +
1.167 + $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5
1.168 + $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5
1.169 + OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1`
1.170 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.171 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.172 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.173 boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:ThreadStackSize=$STACK_SIZE"
1.174 + JVM_ARG_OK=true
1.175 + else
1.176 + $ECHO "Arg failed:" >&5
1.177 + $ECHO "$OUTPUT" >&5
1.178 + JVM_ARG_OK=false
1.179 fi
1.180
1.181 # Disable special log output when a debug build is used as Boot JDK...
1.182
1.183 - # Test if -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput is a valid argument to $JAVA (often is $JAVA passed as $JAVA)
1.184 - # If so, then append -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput to boot_jdk_jvmargs
1.185 - FOUND_WARN=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1 | grep -i warn`
1.186 - FOUND_VERSION=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1 | grep " version \""`
1.187 + $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5
1.188 + $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5
1.189 + OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1`
1.190 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.191 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.192 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.193 boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput"
1.194 + JVM_ARG_OK=true
1.195 + else
1.196 + $ECHO "Arg failed:" >&5
1.197 + $ECHO "$OUTPUT" >&5
1.198 + JVM_ARG_OK=false
1.199 fi
1.200
1.201 fi
1.202 @@ -32664,192 +32704,183 @@
1.203 SJAVAC_SERVER_JAVA=""
1.204 # Hotspot specific options.
1.205
1.206 - # Test if -verbosegc is a valid argument to $JAVA (often is $JAVA passed as $JAVA)
1.207 - # If so, then append -verbosegc to SJAVAC_SERVER_JAVA
1.208 - FOUND_WARN=`$JAVA -verbosegc -version 2>&1 | grep -i warn`
1.209 - FOUND_VERSION=`$JAVA -verbosegc -version 2>&1 | grep " version \""`
1.210 + $ECHO "Check if jvm arg is ok: -verbosegc" >&5
1.211 + $ECHO "Command: $JAVA -verbosegc -version" >&5
1.212 + OUTPUT=`$JAVA -verbosegc -version 2>&1`
1.213 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.214 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.215 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.216 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -verbosegc"
1.217 + JVM_ARG_OK=true
1.218 + else
1.219 + $ECHO "Arg failed:" >&5
1.220 + $ECHO "$OUTPUT" >&5
1.221 + JVM_ARG_OK=false
1.222 fi
1.223
1.224 # JRockit specific options.
1.225
1.226 - # Test if -Xverbose:gc is a valid argument to $JAVA (often is $JAVA passed as $JAVA)
1.227 - # If so, then append -Xverbose:gc to SJAVAC_SERVER_JAVA
1.228 - FOUND_WARN=`$JAVA -Xverbose:gc -version 2>&1 | grep -i warn`
1.229 - FOUND_VERSION=`$JAVA -Xverbose:gc -version 2>&1 | grep " version \""`
1.230 + $ECHO "Check if jvm arg is ok: -Xverbose:gc" >&5
1.231 + $ECHO "Command: $JAVA -Xverbose:gc -version" >&5
1.232 + OUTPUT=`$JAVA -Xverbose:gc -version 2>&1`
1.233 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.234 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.235 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.236 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xverbose:gc"
1.237 + JVM_ARG_OK=true
1.238 + else
1.239 + $ECHO "Arg failed:" >&5
1.240 + $ECHO "$OUTPUT" >&5
1.241 + JVM_ARG_OK=false
1.242 fi
1.243
1.244 SJAVAC_SERVER_JAVA="$JAVA $SJAVAC_SERVER_JAVA"
1.245 fi
1.246
1.247
1.248 -
1.249 -# Check whether --with-sjavac-server-cores was given.
1.250 -if test "${with_sjavac_server_cores+set}" = set; then :
1.251 - withval=$with_sjavac_server_cores;
1.252 -fi
1.253 -
1.254 -if test "x$with_sjavac_server_cores" != x; then
1.255 - SJAVAC_SERVER_CORES="$with_sjavac_server_cores"
1.256 -else
1.257 - if test "$NUM_CORES" -gt 16; then
1.258 - # We set this arbitrary limit because we want to limit the heap
1.259 - # size of the javac server.
1.260 - # In the future we will make the javac compilers in the server
1.261 - # share more and more state, thus enabling us to use more and
1.262 - # more concurrent threads in the server.
1.263 - SJAVAC_SERVER_CORES="16"
1.264 - else
1.265 - SJAVAC_SERVER_CORES="$NUM_CORES"
1.266 - fi
1.267 -
1.268 - if test "$MEMORY_SIZE" -gt "17000"; then
1.269 - MAX_HEAP_MEM=10000
1.270 -
1.271 - # Test if -d64 is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.272 - # If so, then append -d64 to SJAVAC_SERVER_JAVA
1.273 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep -i warn`
1.274 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep " version \""`
1.275 +if test "$MEMORY_SIZE" -gt "2500"; then
1.276 +
1.277 + $ECHO "Check if jvm arg is ok: -d64" >&5
1.278 + $ECHO "Command: $SJAVAC_SERVER_JAVA -d64 -version" >&5
1.279 + OUTPUT=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1`
1.280 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.281 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.282 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.283 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -d64"
1.284 - fi
1.285 -
1.286 -
1.287 - # Test if -Xms10G -Xmx10G is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.288 - # If so, then append -Xms10G -Xmx10G to SJAVAC_SERVER_JAVA
1.289 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version 2>&1 | grep -i warn`
1.290 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version 2>&1 | grep " version \""`
1.291 + JVM_ARG_OK=true
1.292 + else
1.293 + $ECHO "Arg failed:" >&5
1.294 + $ECHO "$OUTPUT" >&5
1.295 + JVM_ARG_OK=false
1.296 + fi
1.297 +
1.298 + if test "$JVM_ARG_OK" = true; then
1.299 + JVM_64BIT=true
1.300 + JVM_ARG_OK=false
1.301 + fi
1.302 + fi
1.303 +
1.304 +if test "$JVM_64BIT" = true; then
1.305 + if test "$MEMORY_SIZE" -gt "17000"; then
1.306 +
1.307 + $ECHO "Check if jvm arg is ok: -Xms10G -Xmx10G" >&5
1.308 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version" >&5
1.309 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version 2>&1`
1.310 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.311 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.312 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.313 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G"
1.314 - fi
1.315 -
1.316 - elif test "$MEMORY_SIZE" -gt "10000"; then
1.317 - MAX_HEAP_MEM=6000
1.318 -
1.319 - # Test if -d64 is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.320 - # If so, then append -d64 to SJAVAC_SERVER_JAVA
1.321 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep -i warn`
1.322 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep " version \""`
1.323 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.324 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -d64"
1.325 - fi
1.326 -
1.327 -
1.328 - # Test if -Xms6G -Xmx6G is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.329 - # If so, then append -Xms6G -Xmx6G to SJAVAC_SERVER_JAVA
1.330 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version 2>&1 | grep -i warn`
1.331 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version 2>&1 | grep " version \""`
1.332 + JVM_ARG_OK=true
1.333 + else
1.334 + $ECHO "Arg failed:" >&5
1.335 + $ECHO "$OUTPUT" >&5
1.336 + JVM_ARG_OK=false
1.337 + fi
1.338 +
1.339 + fi
1.340 + if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then
1.341 +
1.342 + $ECHO "Check if jvm arg is ok: -Xms6G -Xmx6G" >&5
1.343 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version" >&5
1.344 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version 2>&1`
1.345 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.346 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.347 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.348 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G"
1.349 - fi
1.350 -
1.351 - elif test "$MEMORY_SIZE" -gt "5000"; then
1.352 - MAX_HEAP_MEM=3000
1.353 -
1.354 - # Test if -d64 is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.355 - # If so, then append -d64 to SJAVAC_SERVER_JAVA
1.356 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep -i warn`
1.357 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep " version \""`
1.358 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.359 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -d64"
1.360 - fi
1.361 -
1.362 -
1.363 - # Test if -Xms1G -Xmx3G is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.364 - # If so, then append -Xms1G -Xmx3G to SJAVAC_SERVER_JAVA
1.365 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version 2>&1 | grep -i warn`
1.366 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version 2>&1 | grep " version \""`
1.367 + JVM_ARG_OK=true
1.368 + else
1.369 + $ECHO "Arg failed:" >&5
1.370 + $ECHO "$OUTPUT" >&5
1.371 + JVM_ARG_OK=false
1.372 + fi
1.373 +
1.374 + fi
1.375 + if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then
1.376 +
1.377 + $ECHO "Check if jvm arg is ok: -Xms1G -Xmx3G" >&5
1.378 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version" >&5
1.379 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version 2>&1`
1.380 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.381 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.382 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.383 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G"
1.384 - fi
1.385 -
1.386 - elif test "$MEMORY_SIZE" -gt "3800"; then
1.387 - MAX_HEAP_MEM=2500
1.388 -
1.389 - # Test if -Xms1G -Xmx2500M is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.390 - # If so, then append -Xms1G -Xmx2500M to SJAVAC_SERVER_JAVA
1.391 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version 2>&1 | grep -i warn`
1.392 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version 2>&1 | grep " version \""`
1.393 + JVM_ARG_OK=true
1.394 + else
1.395 + $ECHO "Arg failed:" >&5
1.396 + $ECHO "$OUTPUT" >&5
1.397 + JVM_ARG_OK=false
1.398 + fi
1.399 +
1.400 + fi
1.401 + if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then
1.402 +
1.403 + $ECHO "Check if jvm arg is ok: -Xms1G -Xmx2500M" >&5
1.404 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version" >&5
1.405 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version 2>&1`
1.406 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.407 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.408 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.409 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M"
1.410 - fi
1.411 -
1.412 - elif test "$MEMORY_SIZE" -gt "1900"; then
1.413 - MAX_HEAP_MEM=1200
1.414 -
1.415 - # Test if -Xms700M -Xmx1400M is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.416 - # If so, then append -Xms700M -Xmx1400M to SJAVAC_SERVER_JAVA
1.417 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms700M -Xmx1400M -version 2>&1 | grep -i warn`
1.418 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms700M -Xmx1400M -version 2>&1 | grep " version \""`
1.419 + JVM_ARG_OK=true
1.420 + else
1.421 + $ECHO "Arg failed:" >&5
1.422 + $ECHO "$OUTPUT" >&5
1.423 + JVM_ARG_OK=false
1.424 + fi
1.425 +
1.426 + fi
1.427 +fi
1.428 +if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then
1.429 +
1.430 + $ECHO "Check if jvm arg is ok: -Xms1000M -Xmx1500M" >&5
1.431 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M -version" >&5
1.432 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M -version 2>&1`
1.433 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.434 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.435 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.436 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms700M -Xmx1400M"
1.437 - fi
1.438 -
1.439 - elif test "$MEMORY_SIZE" -gt "1000"; then
1.440 - MAX_HEAP_MEM=900
1.441 -
1.442 - # Test if -Xms400M -Xmx1100M is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.443 - # If so, then append -Xms400M -Xmx1100M to SJAVAC_SERVER_JAVA
1.444 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version 2>&1 | grep -i warn`
1.445 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version 2>&1 | grep " version \""`
1.446 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M"
1.447 + JVM_ARG_OK=true
1.448 + else
1.449 + $ECHO "Arg failed:" >&5
1.450 + $ECHO "$OUTPUT" >&5
1.451 + JVM_ARG_OK=false
1.452 + fi
1.453 +
1.454 +fi
1.455 +if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then
1.456 +
1.457 + $ECHO "Check if jvm arg is ok: -Xms400M -Xmx1100M" >&5
1.458 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version" >&5
1.459 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version 2>&1`
1.460 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.461 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.462 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.463 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M"
1.464 - fi
1.465 -
1.466 - else
1.467 - MAX_HEAP_MEM=512
1.468 -
1.469 - # Test if -Xms256M -Xmx512M is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.470 - # If so, then append -Xms256M -Xmx512M to SJAVAC_SERVER_JAVA
1.471 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version 2>&1 | grep -i warn`
1.472 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version 2>&1 | grep " version \""`
1.473 + JVM_ARG_OK=true
1.474 + else
1.475 + $ECHO "Arg failed:" >&5
1.476 + $ECHO "$OUTPUT" >&5
1.477 + JVM_ARG_OK=false
1.478 + fi
1.479 +
1.480 +fi
1.481 +if test "$JVM_ARG_OK" = false; then
1.482 +
1.483 + $ECHO "Check if jvm arg is ok: -Xms256M -Xmx512M" >&5
1.484 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version" >&5
1.485 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version 2>&1`
1.486 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.487 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.488 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.489 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M"
1.490 - fi
1.491 -
1.492 - fi
1.493 -
1.494 -
1.495 - # Test if -XX:PermSize=32m is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.496 - # If so, then append -XX:PermSize=32m to SJAVAC_SERVER_JAVA
1.497 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -XX:PermSize=32m -version 2>&1 | grep -i warn`
1.498 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -XX:PermSize=32m -version 2>&1 | grep " version \""`
1.499 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.500 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -XX:PermSize=32m"
1.501 - fi
1.502 -
1.503 -
1.504 - # Test if -XX:MaxPermSize=160m is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.505 - # If so, then append -XX:MaxPermSize=160m to SJAVAC_SERVER_JAVA
1.506 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -XX:MaxPermSize=160m -version 2>&1 | grep -i warn`
1.507 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -XX:MaxPermSize=160m -version 2>&1 | grep " version \""`
1.508 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.509 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -XX:MaxPermSize=160m"
1.510 - fi
1.511 -
1.512 -
1.513 - # Test if -XX:ThreadStackSize=$STACK_SIZE is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA)
1.514 - # If so, then append -XX:ThreadStackSize=$STACK_SIZE to SJAVAC_SERVER_JAVA
1.515 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1 | grep -i warn`
1.516 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1 | grep " version \""`
1.517 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.518 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -XX:ThreadStackSize=$STACK_SIZE"
1.519 - fi
1.520 -
1.521 -
1.522 - MAX_COMPILERS_IN_HEAP=`expr $MAX_HEAP_MEM / 501`
1.523 - if test "$SJAVAC_SERVER_CORES" -gt "$MAX_COMPILERS_IN_HEAP"; then
1.524 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if number of server cores must be reduced" >&5
1.525 -$as_echo_n "checking if number of server cores must be reduced... " >&6; }
1.526 - SJAVAC_SERVER_CORES="$MAX_COMPILERS_IN_HEAP"
1.527 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, to $SJAVAC_SERVER_CORES with max heap size $MAX_HEAP_MEM MB" >&5
1.528 -$as_echo "yes, to $SJAVAC_SERVER_CORES with max heap size $MAX_HEAP_MEM MB" >&6; }
1.529 - fi
1.530 -fi
1.531 -
1.532 + JVM_ARG_OK=true
1.533 + else
1.534 + $ECHO "Arg failed:" >&5
1.535 + $ECHO "$OUTPUT" >&5
1.536 + JVM_ARG_OK=false
1.537 + fi
1.538 +
1.539 +fi
1.540
1.541 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use sjavac" >&5
1.542 $as_echo_n "checking whether to use sjavac... " >&6; }
