Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
compute capacity description adjustment and HT check added
[yardstick.git]
/
yardstick
/
benchmark
/
scenarios
/
compute
/
computecapacity.bash
diff --git
a/yardstick/benchmark/scenarios/compute/computecapacity.bash
b/yardstick/benchmark/scenarios/compute/computecapacity.bash
index
98d4b8f
..
68741a9
100644
(file)
--- a/
yardstick/benchmark/scenarios/compute/computecapacity.bash
+++ b/
yardstick/benchmark/scenarios/compute/computecapacity.bash
@@
-9,13
+9,15
@@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-#
Measure
compute capacity and scale of a host
+# compute capacity and scale of a host
set -e
# run capacity test
run_capacity()
{
set -e
# run capacity test
run_capacity()
{
+ #parameter used for HT(Hyper-Thread) check
+ HT_Para=2
# Number of CPUs
CPU=$(grep 'physical id' /proc/cpuinfo | sort -u | wc -l)
# Number of physical cores in a single CPU
# Number of CPUs
CPU=$(grep 'physical id' /proc/cpuinfo | sort -u | wc -l)
# Number of physical cores in a single CPU
@@
-31,6
+33,12
@@
run_capacity()
CACHE=$(grep 'cache size' /proc/cpuinfo | sort -u)
CA=$(echo $CACHE | awk '/ /{printf "%s", $4}')
CACHES=$[$CA * $CPU]
CACHE=$(grep 'cache size' /proc/cpuinfo | sort -u)
CA=$(echo $CACHE | awk '/ /{printf "%s", $4}')
CACHES=$[$CA * $CPU]
+ HT_Value=$[$HT_Para * $CORES]
+ if [ $HT_Value -eq $THREAD ]; then
+ HT_OPEN=1
+ else
+ HT_OPEN=0
+ fi
}
# write the result to stdout in json format
}
# write the result to stdout in json format
@@
-41,7
+49,8
@@
output_json()
\"Core_number\":\"$CORES\", \
\"Thread_number\":\"$THREAD\", \
\"Memory_size\": \"$ME\", \
\"Core_number\":\"$CORES\", \
\"Thread_number\":\"$THREAD\", \
\"Memory_size\": \"$ME\", \
- \"Cache_size\": \"$CACHES KB\" \
+ \"Cache_size\": \"$CACHES KB\", \
+ \"HT_Open\": \"$HT_OPEN\" \
}"
}
}"
}