[CI-Examples,tests] Remove/shorten sleep invocations

Replace sleeps with more appropriate wait-for tools, or at least shorten the sleep interval. Signed-off-by: Dmitrii Kuvaiskii <[email protected]>
gramineproject · Sep 22, 2023 · 2ad54dd · 2ad54dd
1 parent ac8fc77
commit 2ad54dd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/CI-Examples/common_tools/benchmark-http.sh b/CI-Examples/common_tools/benchmark-http.sh
@@ -75,8 +75,6 @@ do
         echo "wrk -c $CONNECTIONS -d $DURATION -t $CONCURRENCY -R $REQUESTS $DOWNLOAD_HOST/$DOWNLOAD_FILE"
         wrk -c "$CONNECTIONS" -d "$DURATION" -t "$CONCURRENCY" -R "$REQUESTS" "$DOWNLOAD_HOST/$DOWNLOAD_FILE" > OUTPUT || exit $?
 
-        sleep 5
-
         THROUGHPUT_STR=$(grep -m1 "Req/Sec" OUTPUT | awk '{ print $2 }')
         THROUGHPUT=$(throughput_in_bytes "$THROUGHPUT_STR")
         if [ "$THROUGHPUT" = "0" ]; then

diff --git a/CI-Examples/ra-tls-mbedtls/Makefile b/CI-Examples/ra-tls-mbedtls/Makefile
@@ -112,7 +112,7 @@ sgx_sign_client_epid: client_epid.manifest client
 .PHONY: check_epid
 check_epid: app epid
 	gramine-sgx server & SERVER_ID=$$!; \
-	sleep 30; \
+	../../scripts/wait_for_server 60 127.0.0.1 4433; \
 	./client epid > OUTPUT; \
 	./client epid 0 0 0 0 >> OUTPUT; \
 	kill -9 $$SERVER_ID
@@ -125,14 +125,14 @@ check_epid: app epid
 .PHONY: check_epid_fail
 check_epid_fail: app epid
 	gramine-sgx server --test-malicious-quote >/dev/null & SERVER_ID=$$!; \
-	sleep 30; \
+	../../scripts/wait_for_server 60 127.0.0.1 4433; \
 	./client epid && exit 1 || echo "[ Success 1/1 ]"; \
 	kill -9 $$SERVER_ID
 
 .PHONY: check_dcap
 check_dcap: app dcap
 	gramine-sgx server >/dev/null & SERVER_ID=$$!; \
-	sleep 30; \
+	../../scripts/wait_for_server 60 127.0.0.1 4433; \
 	./client dcap > OUTPUT; \
 	./client dcap 0 0 0 0 >> OUTPUT; \
 	kill -9 $$SERVER_ID
@@ -145,7 +145,7 @@ check_dcap: app dcap
 .PHONY: check_dcap_fail
 check_dcap_fail: app dcap
 	gramine-sgx server --test-malicious-quote >/dev/null & SERVER_ID=$$!; \
-	sleep 30; \
+	../../scripts/wait_for_server 60 127.0.0.1 4433; \
 	./client dcap && exit 1 || echo "[ Success 1/1 ]"; \
 	kill -9 $$SERVER_ID
 

diff --git a/CI-Examples/ra-tls-nginx/run.sh b/CI-Examples/ra-tls-nginx/run.sh
@@ -5,7 +5,7 @@ set -e
 gramine-sgx nginx &
 pid=$!
 
-sleep 10
+../../scripts/wait_for_server 60 localhost 8000
 
 test "$(curl --insecure -s https://localhost:8000/)" = "$(cat html/index.html)"
 ret=$?

diff --git a/libos/test/regression/eventfd.c b/libos/test/regression/eventfd.c
@@ -47,7 +47,6 @@ static void* write_eventfd_thread(void* arg) {
     }
 
     for (int i = 0; i < MAX_EFDS; i++) {
-        sleep(1);
         if (write(efds[i], &count, sizeof(count)) != sizeof(count)) {
             perror("write error");
             return NULL;
@@ -91,7 +90,7 @@ static int eventfd_using_poll(void) {
     }
 
     while (1) {
-        poll_ret = poll(pollfds, MAX_EFDS, 5000);
+        poll_ret = poll(pollfds, MAX_EFDS, 1000);
 
         if (poll_ret == 0) {
             printf("Poll timed out. Exiting.\n");