test(vsock): remove delay in measurement

Signed-off-by: Aaron Ang <aaron.angyd@gmail.com>

Author: aaron-ang

tests/host_tools/vsock_helper.c

@@ -33,15 +33,13 @@ int print_usage() {
     fprintf(stderr, "      Connect to echo server at CID:port. Pipe STDIN to server,\n");
     fprintf(stderr, "      server response to STDOUT.\n");
     fprintf(stderr, "\n");
-    fprintf(stderr, "  ping <cid> <port> <count> <delay>\n");
+    fprintf(stderr, "  ping <cid> <port> <count>\n");
     fprintf(stderr, "      Send <count> ping messages to echo server at CID:port.\n");
-    fprintf(stderr, "      <delay> is the delay in seconds between pings (float).\n");
     fprintf(stderr, "      Prints RTT for each ping in microseconds.\n");
     fprintf(stderr, "\n");
-    fprintf(stderr, "  ping-uds <uds_path> <port> <count> <delay>\n");
+    fprintf(stderr, "  ping-uds <uds_path> <port> <count>\n");
     fprintf(stderr, "      Send <count> ping messages to echo server at <uds_path>:port.\n");
     fprintf(stderr, "      Uses Unix Domain Socket with Firecracker CONNECT protocol.\n");
-    fprintf(stderr, "      <delay> is the delay in seconds between pings (float).\n");
     fprintf(stderr, "      Prints RTT for each ping in microseconds.\n");
     fprintf(stderr, "\n");
     return -1;
@@ -101,7 +99,7 @@ int run_echo(uint32_t cid, uint32_t port) {
 }
 
 
-int run_ping(uint32_t cid, uint32_t port, int count, double delay_sec) {
+int run_ping(uint32_t cid, uint32_t port, int count) {
 
     int sock = socket(AF_VSOCK, SOCK_STREAM, 0);
     if (sock < 0) {
@@ -123,10 +121,6 @@ int run_ping(uint32_t cid, uint32_t port, int count, double delay_sec) {
     char ping_msg[64];
     memset(ping_msg, 'A', sizeof(ping_msg));
 
-    struct timespec delay_ts;
-    delay_ts.tv_sec = (time_t)delay_sec;
-    delay_ts.tv_nsec = (long)((delay_sec - (time_t)delay_sec) * 1000000000);
-
     for (int seq = 1; seq <= count; seq++) {
         struct timespec start, end;
 
@@ -168,18 +162,14 @@ int run_ping(uint32_t cid, uint32_t port, int count, double delay_sec) {
 
         printf("rtt=%.3f us seq=%d\n", (double)rtt_us, seq);
         fflush(stdout);
-
-        if (seq < count && delay_sec > 0) {
-            nanosleep(&delay_ts, NULL);
-        }
     }
 
     close(sock);
     return 0;
 }
 
 
-int run_ping_uds(const char *uds_path, uint32_t port, int count, double delay_sec) {
+int run_ping_uds(const char *uds_path, uint32_t port, int count) {
 
     int sock = socket(AF_UNIX, SOCK_STREAM, 0);
     if (sock < 0) {
@@ -231,10 +221,6 @@ int run_ping_uds(const char *uds_path, uint32_t port, int count, double delay_se
     char ping_msg[64];
     memset(ping_msg, 'A', sizeof(ping_msg));
 
-    struct timespec delay_ts;
-    delay_ts.tv_sec = (time_t)delay_sec;
-    delay_ts.tv_nsec = (long)((delay_sec - (time_t)delay_sec) * 1000000000);
-
     for (int seq = 1; seq <= count; seq++) {
         struct timespec start, end;
 
@@ -276,10 +262,6 @@ int run_ping_uds(const char *uds_path, uint32_t port, int count, double delay_se
 
         printf("rtt=%.3f us seq=%d\n", (double)rtt_us, seq);
         fflush(stdout);
-
-        if (seq < count && delay_sec > 0) {
-            nanosleep(&delay_ts, NULL);
-        }
     }
 
     close(sock);
@@ -306,33 +288,31 @@ int main(int argc, char **argv) {
     }
 
     if (strcmp(argv[1], "ping") == 0) {
-        if (argc != 6) {
+        if (argc != 5) {
             return print_usage();
         }
         uint32_t cid = atoi(argv[2]);
         uint32_t port = atoi(argv[3]);
         int count = atoi(argv[4]);
-        double delay = atof(argv[5]);
 
-        if (!cid || !port || count <= 0 || delay < 0) {
+        if (!cid || !port || count <= 0) {
             return print_usage();
         }
-        return run_ping(cid, port, count, delay);
+        return run_ping(cid, port, count);
     }
 
     if (strcmp(argv[1], "ping-uds") == 0) {
-        if (argc != 6) {
+        if (argc != 5) {
             return print_usage();
         }
         const char *uds_path = argv[2];
         uint32_t port = atoi(argv[3]);
         int count = atoi(argv[4]);
-        double delay = atof(argv[5]);
 
-        if (!port || count <= 0 || delay < 0) {
+        if (!port || count <= 0) {
             return print_usage();
         }
-        return run_ping_uds(uds_path, port, count, delay);
+        return run_ping_uds(uds_path, port, count);
     }
 
     return print_usage();

tests/integration_tests/performance/test_vsock.py

@@ -157,7 +157,6 @@ def test_vsock_latency_g2h(uvm_plain_acpi, vcpus, metrics, bin_vsock_path):
     """
     rounds = 15
     requests_per_round = 30
-    delay_sec = 0.01
 
     mem_size_mib = 1024
     vm = uvm_plain_acpi
@@ -201,8 +200,7 @@ def test_vsock_latency_g2h(uvm_plain_acpi, vcpus, metrics, bin_vsock_path):
         samples = []
         for _ in range(rounds):
             _, ping_output, _ = vm.ssh.check_output(
-                f"/tmp/vsock_helper ping 2 {ECHO_SERVER_PORT} "
-                f"{requests_per_round} {delay_sec}"
+                f"/tmp/vsock_helper ping 2 {ECHO_SERVER_PORT} {requests_per_round}"
             )
             samples.extend(consume_vsock_ping_output(ping_output))
 
@@ -227,7 +225,6 @@ def test_vsock_latency_h2g(uvm_plain_acpi, vcpus, metrics, bin_vsock_path):
     """
     rounds = 15
     requests_per_round = 30
-    delay_sec = 0.01
 
     mem_size_mib = 1024
     vm = uvm_plain_acpi
@@ -258,7 +255,6 @@ def test_vsock_latency_h2g(uvm_plain_acpi, vcpus, metrics, bin_vsock_path):
                 uds_path,
                 str(ECHO_SERVER_PORT),
                 str(requests_per_round),
-                str(delay_sec),
             ],
             capture_output=True,
             text=True,