1*4882a593SmuzhiyunFrom 353e8a62bf3cb5f1b9504efa16b8b974e93cac49 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: He Zhe <zhe.he@windriver.com> 3*4882a593SmuzhiyunDate: Fri, 22 Jan 2021 10:58:41 +0800 4*4882a593SmuzhiyunSubject: [PATCH] lmbench: Point webpage-lm to target directory 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunAs webpage-lm.tar has been copied to ${datadir}\lmbench. 7*4882a593SmuzhiyunPlus improve 'hello' copying in lmbench script. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: He Zhe <zhe.he@windriver.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun scripts/lmbench | 18 +++++++++--------- 12*4882a593Smuzhiyun 1 file changed, 9 insertions(+), 9 deletions(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/scripts/lmbench b/scripts/lmbench 15*4882a593Smuzhiyunindex 7a52cb1..82e36b6 100755 16*4882a593Smuzhiyun--- a/scripts/lmbench 17*4882a593Smuzhiyun+++ b/scripts/lmbench 18*4882a593Smuzhiyun@@ -167,7 +167,7 @@ if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_UNIX = XYES ]; then 19*4882a593Smuzhiyun lat_unix -P $SYNC_MAX 20*4882a593Smuzhiyun fi 21*4882a593Smuzhiyun if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_PROC = XYES ]; then 22*4882a593Smuzhiyun- cp hello /tmp/hello 23*4882a593Smuzhiyun+ cp `which hello` /tmp/hello 24*4882a593Smuzhiyun for i in fork exec shell 25*4882a593Smuzhiyun do lat_proc -P $SYNC_MAX $i 26*4882a593Smuzhiyun done 27*4882a593Smuzhiyun@@ -237,14 +237,14 @@ fi 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun date >> ${OUTPUT} 30*4882a593Smuzhiyun echo Local networking >> ${OUTPUT} 31*4882a593Smuzhiyun-if [ ! -d ../../src/webpage-lm ] 32*4882a593Smuzhiyun-then (cd ../../src && tar xf webpage-lm.tar) 33*4882a593Smuzhiyun+if [ ! -d /usr/share/lmbench/webpage-lm ] 34*4882a593Smuzhiyun+then (cd /usr/share/lmbench && tar xf webpage-lm.tar) 35*4882a593Smuzhiyun sync 36*4882a593Smuzhiyun sleep 1 37*4882a593Smuzhiyun fi 38*4882a593Smuzhiyun SERVERS="lat_udp lat_tcp lat_rpc lat_connect bw_tcp" 39*4882a593Smuzhiyun for server in $SERVERS; do $server -s; done 40*4882a593Smuzhiyun-DOCROOT=../../src/webpage-lm lmhttp 8008 & 41*4882a593Smuzhiyun+DOCROOT=/usr/share/lmbench/webpage-lm lmhttp 8008 & 42*4882a593Smuzhiyun sleep 2; 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_UDP = XYES ]; then 45*4882a593Smuzhiyun@@ -280,15 +280,15 @@ bw_tcp -S localhost 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_HTTP = XYES ]; then 48*4882a593Smuzhiyun # I want a hot cache number 49*4882a593Smuzhiyun- lat_http localhost 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1 50*4882a593Smuzhiyun- lat_http localhost 8008 < ../../src/webpage-lm/URLS 51*4882a593Smuzhiyun+ lat_http localhost 8008 < /usr/share/lmbench/webpage-lm/URLS > /dev/null 2>&1 52*4882a593Smuzhiyun+ lat_http localhost 8008 < /usr/share/lmbench/webpage-lm/URLS 53*4882a593Smuzhiyun fi 54*4882a593Smuzhiyun lat_http -S localhost 8008 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun for remote in $REMOTE 57*4882a593Smuzhiyun do 58*4882a593Smuzhiyun echo Networking to $remote >> ${OUTPUT} 59*4882a593Smuzhiyun- $RCP $SERVERS lmhttp ../../src/webpage-lm.tar ${remote}:/tmp 60*4882a593Smuzhiyun+ $RCP $SERVERS lmhttp /usr/share/lmbench/webpage-lm.tar ${remote}:/tmp 61*4882a593Smuzhiyun for server in $SERVERS 62*4882a593Smuzhiyun do $RSH $remote -n /tmp/$server -s & 63*4882a593Smuzhiyun done 64*4882a593Smuzhiyun@@ -327,8 +327,8 @@ do 65*4882a593Smuzhiyun 66*4882a593Smuzhiyun if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_HTTP = XYES ]; then 67*4882a593Smuzhiyun # I want a hot cache number 68*4882a593Smuzhiyun- lat_http $remote 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1 69*4882a593Smuzhiyun- lat_http $remote 8008 < ../../src/webpage-lm/URLS 70*4882a593Smuzhiyun+ lat_http $remote 8008 < /usr/share/lmbench/webpage-lm/URLS > /dev/null 2>&1 71*4882a593Smuzhiyun+ lat_http $remote 8008 < /usr/share/lmbench/webpage-lm/URLS 72*4882a593Smuzhiyun fi 73*4882a593Smuzhiyun lat_http -S $remote 8008 74*4882a593Smuzhiyun 75*4882a593Smuzhiyun-- 76*4882a593Smuzhiyun2.17.1 77*4882a593Smuzhiyun 78