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