From b80335fcacdb10a149ea4e97d5aab1fb76756147 Mon Sep 17 00:00:00 2001 From: sharath Date: Tue, 18 Sep 2018 19:56:53 +0530 Subject: Fix: skip release_tar.sh Change-Id: Iedabc62eae8ee3103fc5d2441996048c04b5a0d1 Signed-off-by: sharath --- stacks/lwip_stack/run_stackx.txt | 140 ++++++-------------------- stacks/lwip_stack/vagrant/start_nstackMain.sh | 7 +- 2 files changed, 32 insertions(+), 115 deletions(-) diff --git a/stacks/lwip_stack/run_stackx.txt b/stacks/lwip_stack/run_stackx.txt index 7322635..71cdd20 100644 --- a/stacks/lwip_stack/run_stackx.txt +++ b/stacks/lwip_stack/run_stackx.txt @@ -14,118 +14,36 @@ # limitations under the License. ######################################################################### -#build DPDK -#Note: build path /root/dpdk/ , install path /root/dpdk_install/tmp -=================================================================== -if [ -d /root/dpdk_install/tmp ]; then - rm -rf /root/dpdk_install/tmp -fi - -mkdir -p /root/dpdk - -cd /root/dpdk -rm -rf dpdk-16.04/ -wget https://fast.dpdk.org/rel/dpdk-16.04.tar.xz -tar xvf dpdk-16.04.tar.xz -cd dpdk-16.04/ - -sed -i 's!CONFIG_RTE_EXEC_ENV=.*!CONFIG_RTE_EXEC_ENV=y!1' config/common_base -sed -i 's!CONFIG_RTE_BUILD_SHARED_LIB=.*!CONFIG_RTE_BUILD_SHARED_LIB=y!1' config/common_base -sed -i 's!CONFIG_RTE_LIBRTE_EAL=.*!CONFIG_RTE_LIBRTE_EAL=y!1' config/common_base - -make install T=x86_64-native-linuxapp-gcc DESTDIR=/root/dpdk_install/tmp -cd x86_64-native-linuxapp-gcc -make - -cp -r /root/dpdk/dpdk-16.04/tools/dpdk_nic_bind.py /root/dpdk/dpdk-16.04/tools/dpdk-devbind.py - -mount -t hugetlbfs -o pagesize=1G none /mnt/nstackhuge/ -mkdir /var/run/ip_module - -#verify hugepages 8GB free hugepages are required -================================================= -cat /proc/meminfo - -#build DMM -============ -#got to DMM/ - -cd thirdparty/glog/glog-0.3.4/ -sudo autoreconf -ivf - -cd - -cd build/ - -cmake .. -make -j 8 - -#build stackx -================ -cd ../thirdparty/glog/glog-0.3.4/ -sudo autoreconf -ivf - -cd - -cd ../stacks/lwip_stack/build/ - -cmake .. -make -j 8 - -#run app +#build DPDK, DMM, lwip stack by calling build script: +==================================================== + cd dmm/stacks/lwip_stack/vagrant + build.sh + +#update interface name if required(default enp0s8) in dmm/stacks/lwip_stack/vagrant/start_nstackMain.sh +#Start nStackMain: +================= + 1.for the first time (to configure json files and start nStackMain) + cd dmm/stacks/lwip_stack/vagrant + ./start_nstackMain.sh + + 2.from secod time: + cd dmm/stacks/lwip_stack/release + ./start_nstack.sh + +#get configured client/server ip from dmm/stacks/lwip_stack/release/bin/ip_data.json +#can get the log path details from dmm/stacks/lwip_stack/release/bin/nStackConfig.json + +#run app: ======== -cd ../ -chmod +x release_tar.sh -./release_tar.sh - -tar -zxf nStackServer.tar.gz - -cd nStackServer/ -cp configure/*.json bin/ - -##make json file changes -#I have copied the working configs in the path /home/sharath/working_config/ - -#server -cp -r /home/sharath/working_config/server/ip_data.json bin/ -cp -r /home/sharath/working_config/server/network_data_tonStack.json bin/ -cp -r /home/sharath/working_config/server/nStackConfig.json bin/ - -#client -cp -r /home/sharath/working_config/client/ip_data.json bin/ -cp -r /home/sharath/working_config/client/network_data_tonStack.json bin/ -cp -r /home/sharath/working_config/client/nStackConfig.json bin/ - -#dpdk download path : /root/dpdk/dpdk-16.04/ -sed -i 's!export DPDK_INSTALL_PATH.*!export DPDK_INSTALL_PATH="/root/dpdk/dpdk-16.04"!1' ../release/script/nstack_var.sh + cd dmm/stacks/lwip_stack/app_test -cd ../../../release/bin/ -cp ../configure/*.json . + #server + ./vs_epoll -p 20000 -d {client_ip} -a 10000 -s {ser_ip} -l 200 -t 5000000 -i 0 -f 1 -r 20000 -n 1 -w 10 -u 10000 -e 10 -x 1 -#server -cp -r /home/sharath/working_config/server/module_config.json . -cp -r /home/sharath/working_config/server/nStackConfig.json . -cp -r /home/sharath/working_config/server/rd_config.json . + #client + ./vc_epoll -p 20000 -d {ser_ip} -a 10000 -s {client_ip} -l 200 -t 50000 -i 1000 -f 1 -r 20000 -n 1 -w 10 -u 10000 -e 10 -x 1 -#client -cp -r /home/sharath/working_config/client/module_config.json . -cp -r /home/sharath/working_config/client/nStackConfig.json . -cp -r /home/sharath/working_config/client/rd_config.json . - -cd - -./stop_nstack.sh -./start_nstack.sh - -#verify process up -ps aux | grep nS - -cd bin -./nStackCtrl -a add -p ./network_data_tonStack.json -t network -./nStackCtrl -a add -p ./ip_data.json -t ip - -cd ../../../../release/bin/ -cp ../../stacks/lwip_stack/release/lib64/libnstack.so . - -#server -./vs_epoll -p 20000 -d 192.168.1.207 -a 10000 -s 192.168.1.206 -l 200 -t 5000000 -i 0 -f 1 -r 20000 -n 1 -w 10 -u 10000 -e 10 -x 1 - -#client -./vc_epoll -p 20000 -d 192.168.1.206 -a 10000 -s 192.168.1.207 -l 200 -t 50000 -i 1000 -f 1 -r 20000 -n 1 -w 10 -u 10000 -e 10 -x 1 +#stop nStackMain: +================ + cd dmm/stacks/lwip_stack/release + ./stop_nstack.sh diff --git a/stacks/lwip_stack/vagrant/start_nstackMain.sh b/stacks/lwip_stack/vagrant/start_nstackMain.sh index 72d1375..00d4370 100755 --- a/stacks/lwip_stack/vagrant/start_nstackMain.sh +++ b/stacks/lwip_stack/vagrant/start_nstackMain.sh @@ -60,9 +60,8 @@ elif [ "$OS_ID" == "ubuntu" ]; then fi cd $LWIP_BUILD_DIR/../ -bash ./release_tar.sh -cd nStackServer/script -sed -i 's!/root/dpdk/dpdk-18.02!'$DPDK_DOWNLOAD_PATH'/dpdk-18.02!1' nstack_var.sh +cd release/script +sed -i 's!DPDK_INSTALL_PATH=.*!DPDK_INSTALL_PATH='$DPDK_DOWNLOAD_PATH'/dpdk-18.02!1' nstack_var.sh cd ../ chmod 775 * @@ -105,7 +104,7 @@ sudo mkdir -p /var/log/nStack/ip_module/ export LD_LIBRARY_PATH=$LIB_PATH export NSTACK_LOG_ON=DBG -cd $LWIP_BUILD_DIR/../nStackServer +cd $LWIP_BUILD_DIR/../release bash -x ./stop_nstack.sh bash -x ./start_nstack.sh check_result=$(pgrep nStackMain) -- cgit 1.2.3-korg