You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/01/15 18:27:55 UTC
[2/5] git commit: Detect memory for heap sizing on OSX. Patch by
Cathy Daw, reviewed by brandonwilliams for CASSANDRA-5157
Detect memory for heap sizing on OSX.
Patch by Cathy Daw, reviewed by brandonwilliams for CASSANDRA-5157
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4faed779
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4faed779
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4faed779
Branch: refs/heads/trunk
Commit: 4faed779d1cacedf524cb47711071a5a6ada8809
Parents: 7eb47c5
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 15 06:32:08 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 15 06:33:01 2013 -0600
----------------------------------------------------------------------
conf/cassandra-env.sh | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4faed779/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 95760dd..e38371f 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -30,6 +30,11 @@ calculate_heap_sizes()
system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'`
system_cpu_cores=`psrinfo | wc -l`
;;
+ Darwin)
+ system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'`
+ system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024`
+ system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'`
+ ;;
*)
# assume reasonable defaults for e.g. a modern desktop or
# cheap server