You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/07/31 07:10:07 UTC
[6/8] git commit: enable jamm for OpenJDK >= 1.6.0.23 Patch by paul
cannon, reviewed by brandonwilliams for CASSANDRA-4447
enable jamm for OpenJDK >= 1.6.0.23
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4447
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1209c9e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1209c9e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1209c9e7
Branch: refs/heads/trunk
Commit: 1209c9e71d800c9593c6c67d2ddb0de0b0cc9be9
Parents: 916acd4
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 30 11:04:37 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 30 11:15:54 2012 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1209c9e7/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index cef0efb..d23b83e 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -20,18 +20,15 @@ calculate_heap_sizes()
Linux)
system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'`
system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo`
- break
;;
FreeBSD)
system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'`
system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024`
system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'`
- break
;;
SunOS)
system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'`
system_cpu_cores=`psrinfo | wc -l`
- break
;;
*)
# assume reasonable defaults for e.g. a modern desktop or
@@ -84,6 +81,34 @@ calculate_heap_sizes()
fi
}
+# Determine the sort of JVM we'll be running on.
+
+java_ver_output=$("${JAVA:-java}" -version 2>&1)
+
+jvmver=$(echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}')
+JVM_VERSION=${jvmver%_*}
+JVM_PATCH_VERSION=${jvmver#*_}
+
+jvm=$(echo "$java_ver_output" | awk 'NR==2 {print $1}')
+case "$jvm" in
+ OpenJDK)
+ JVM_VENDOR=OpenJDK
+ # this will be "64-Bit" or "32-Bit"
+ JVM_ARCH=$(echo "$java_ver_output" | awk 'NR==3 {print $2}')
+ ;;
+ "Java(TM)")
+ JVM_VENDOR=Oracle
+ # this will be "64-Bit" or "32-Bit"
+ JVM_ARCH=$(echo "$java_ver_output" | awk 'NR==3 {print $3}')
+ ;;
+ *)
+ # Help fill in other JVM values
+ JVM_VENDOR=other
+ JVM_ARCH=unknown
+ ;;
+esac
+
+
# Override these to set the amount of memory to allocate to the JVM at
# start-up. For production use you almost certainly want to adjust
# this for your environment. MAX_HEAP_SIZE is the total amount of
@@ -124,8 +149,8 @@ JMX_PORT="7199"
JVM_OPTS="$JVM_OPTS -ea"
# add the jamm javaagent
-check_openjdk=`"${JAVA:-java}" -version 2>&1 | awk '{if (NR == 2) {print $1}}'`
-if [ "$check_openjdk" != "OpenJDK" ]
+if [[ "$JVM_VENDOR" != "OpenJDK" || "$JVM_VERSION" > "1.6.0"
+ || ( "$JVM_VERSION" = "1.6.0" && "$JVM_PATCH_VERSION" -ge 23 ) ]]
then
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
fi
@@ -153,12 +178,11 @@ fi
if [ "`uname`" = "Linux" ] ; then
- java_version=`"${JAVA:-java}" -version 2>&1 | awk '/version/ {print $3}' | egrep -o '[0-9]+\.[0-9]+'`
# reduce the per-thread stack size to minimize the impact of Thrift
# thread-per-client. (Best practice is for client connections to
# be pooled anyway.) Only do so on Linux where it is known to be
# supported.
- if [ "$java_version" = "1.7" ]
+ if [[ "$JVM_VERSION" == 1.7.* ]]
then
JVM_OPTS="$JVM_OPTS -Xss160k"
else