From 4b828dac02c029a83f7dc36a358db110e0f7959e Mon Sep 17 00:00:00 2001 From: Yalei Wang Date: Fri, 15 Jun 2018 11:14:38 +0800 Subject: Fix some doc typo Change-Id: I373f7877fefc686586284e71ab48afca12fcdbd2 Signed-off-by: Yalei Wang --- scripts/build.sh | 64 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) (limited to 'scripts/build.sh') diff --git a/scripts/build.sh b/scripts/build.sh index 806b616..4224535 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -74,13 +74,6 @@ elif [ "$OS_ID" == "opensuse" ]; then sudo yum install -y git cmake gcc g++ automake libtool wget lsof lshw pciutils net-tools tcpdump vim sudo yum-utils pcre-devel zlib-devel fi -#set and check env -sudo sysctl -w vm.nr_hugepages=1024 -HUGEPAGES=`sysctl -n vm.nr_hugepages` -if [ $HUGEPAGES != 1024 ]; then - echo "ERROR: Unable to get 1024 hugepages, only got $HUGEPAGES. Cannot finish." - exit -fi #DPDK will be having dependancy on linux headers if [ "$OS_ID" == "ubuntu" ]; then @@ -95,28 +88,6 @@ elif [ "$OS_ID" == "opensuse" ]; then sudo yum install -y kernel-headers fi -hugepageTotal=$(cat /proc/meminfo | grep -c "HugePages_Total: 0") -if [ $hugepageTotal -ne 0 ]; then - echo "HugePages_Total is zero" - exit -fi - -hugepageFree=$(cat /proc/meminfo | grep -c "HugePages_Free: 0") -if [ $hugepageFree -ne 0 ]; then - echo "HugePages_Free is zero" - exit -fi - -hugepageSize=$(cat /proc/meminfo | grep -c "Hugepagesize: 0 kB") -if [ $hugepageSize -ne 0 ]; then - echo "Hugepagesize is zero" - exit -fi - - -sudo mkdir /mnt/nstackhuge -p -sudo mount -t hugetlbfs -o pagesize=2M none /mnt/nstackhuge/ -sudo mkdir -p /var/run/ip_module/ #===========build DPDK================ @@ -144,8 +115,6 @@ else fi fi -export LD_LIBRARY_PATH=$LIB_PATH -export NSTACK_LOG_ON=DBG #===========build DMM================= echo "DMM build started....." @@ -158,6 +127,39 @@ if [ "$OS_ID" == "centos" ]; then make pkg-rpm fi +#===========check running env ================= +sudo sysctl -w vm.nr_hugepages=1024 +HUGEPAGES=`sysctl -n vm.nr_hugepages` +if [ $HUGEPAGES != 1024 ]; then + echo "ERROR: Unable to get 1024 hugepages, only got $HUGEPAGES. Cannot finish." + exit +fi +hugepageTotal=$(cat /proc/meminfo | grep -c "HugePages_Total: 0") +if [ $hugepageTotal -ne 0 ]; then + echo "HugePages_Total is zero" + exit +fi + +hugepageFree=$(cat /proc/meminfo | grep -c "HugePages_Free: 0") +if [ $hugepageFree -ne 0 ]; then + echo "HugePages_Free is zero" + exit +fi + +hugepageSize=$(cat /proc/meminfo | grep -c "Hugepagesize: 0 kB") +if [ $hugepageSize -ne 0 ]; then + echo "Hugepagesize is zero" + exit +fi + + +sudo mkdir /mnt/nstackhuge -p +sudo mount -t hugetlbfs -o pagesize=2M none /mnt/nstackhuge/ +sudo mkdir -p /var/run/ip_module/ + +export LD_LIBRARY_PATH=$LIB_PATH +export NSTACK_LOG_ON=DBG + ############### Preapre APP test directory echo -e "\e[41m Preapring APP test directory.....\e[0m" -- cgit 1.2.3-korg