- add httpterm server

Author: Sashan

bench-scripts/bench_run_haproxy.sh

@@ -22,6 +22,8 @@ HOST=${BENCH_HOST:-'127.0.0.1'}
 CERT_SUBJ=${BENCH_CERT_SUBJ:-'/CN=localhost'}
 CERT_ALT_SUBJ=${BENCH_CERT_ALT_SUBJ:-'subjectAltName=DNS:localhost,IP:127.0.0.1'}
 HOST=${BENCH_HOST:-'127.0.0.1'}
+HTTPTERM_HOST=${BENCH_HTTPTERM_HOST:-${HOST}}
+HTTPTERM_PORT=${BENCH_HTTPTERM_PORT:-9000}
 PROXY_CHAIN=${BENCH_PROXY_CHAIN:-21}
 HAPROXY_VERSION='v3.2.0'
 TEST_TIME=${BENCH_TEST_TIME:-'10'}
@@ -49,11 +51,30 @@ function run_haproxy {
     fi
 }
 
-function kill_haproxy {
-    typeset HAPPIDFILE=$1
+function run_httpterm {
+    typeset SSL_LIB=$1
+    typeset HTTPTERMPIDFILE=$2
+    if [[ -z "${SSL_LIB}" ]] ; then
+        SSL_LIB="openssl-master"
+    fi
+    typeset OPENSSL_DIR="${INSTALL_ROOT}/${SSL_LIB}"
+    typeset HTTPTERM="${OPENSSL_DIR}"/bin/httpterm
+
+    LD_LIBRARY_PATH="${OPENSSL_DIR}/lib" "${HAPROXY}" \
+	-p ${HTTPTERMPIDFILE} \
+        -L ${HTTPTERM_HOST}:${HTTPTERM_PORT} \
+        -D
+    if [[ $? -ne 0 ]] ; then
+        echo "could not start httpterm"
+        exit 1
+    fi
+}
+
+function kill_daemon {
+    typeset PIDFILE=$1
 
-    kill -TERM `cat ${HAPPIDFILE}`
-    rm -f ${HAPPIDFILE}
+    kill -TERM `cat ${PIDFILE}`
+    rm -f ${PIDFILE}
 }
 
 function run_test {
@@ -65,9 +86,11 @@ function run_test {
     typeset BASE_URL="https://${HOST}:"
     typeset RESULT=''
     typeset HAPPIDFILE=${OPENSSL_DIR}/haproxy.pid
+    typeset HTTPTERMPIDFILE=${OPENSSL_DIR}/httpterm.pid
     typeset PORT=''
 
     run_haproxy ${SSL_LIB} ${HAPPIDFILE}
+    run_httpterm ${SSL_LIB} ${HTTPTERMPIDFILE}
 
     echo "proxy running for ${SSL_LIB} ${THREAD_COUNT}"
     RESULT=${RESULT_DIR}/h1load-dh-rsa-reuse-${THREAD_COUNT}-${SSL_LIB}.out
@@ -132,7 +155,8 @@ function run_test {
             -t ${TEST_TIME}S ${BASE_URL}:${SIEGE_PORT_EC} 2> ${RESULT}
     fi
 
-    kill_haproxy ${HAPPIDFILE}
+    kill_daemon ${HAPPIDFILE}
+    kill_daemon ${HTTPTERMPIDFILE}
 }
 
 function run_tests {