vcl: refactor test client to support workers

[vpp.git] / src / vcl / sock_test_client.c

diff --git a/src/vcl/sock_test_client.c b/src/vcl/sock_test_client.c
index 1ed4b89..de77fc9 100644 (file)
--- a/src/vcl/sock_test_client.c
+++ b/src/vcl/sock_test_client.c
@@ -37,19 +37,20 @@ typedef struct
 #endif
   struct sockaddr_storage server_addr;
   uint32_t server_addr_size;
+  uint32_t cfg_seq_num;
   sock_test_socket_t ctrl_socket;
   sock_test_socket_t *test_socket;
   uint32_t num_test_sockets;
   uint8_t dump_cfg;
 } sock_client_main_t;
 
-sock_client_main_t sock_client_main;
+sock_client_main_t vcl_client_main;
 
 
 static int
 sock_test_cfg_sync (sock_test_socket_t * socket)
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   sock_test_cfg_t *rl_cfg = (sock_test_cfg_t *) socket->rxbuf;
   int rx_bytes, tx_bytes;
@@ -57,12 +58,18 @@ sock_test_cfg_sync (sock_test_socket_t * socket)
   if (socket->cfg.verbose)
     sock_test_cfg_dump (&socket->cfg, 1 /* is_client */ );
 
+  ctrl->cfg.seq_num = ++scm->cfg_seq_num;
+  if (socket->cfg.verbose)
+    {
+      printf ("CLIENT (fd %d): Sending config sent to server.\n", socket->fd);
+      sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+    }
   tx_bytes = sock_test_write (socket->fd, (uint8_t *) & ctrl->cfg,
                              sizeof (ctrl->cfg), NULL, ctrl->cfg.verbose);
   if (tx_bytes < 0)
     {
-      fprintf (stderr, "CLIENT: ERROR: write test cfg failed (%d)!\n",
-              tx_bytes);
+      fprintf (stderr, "CLIENT (fd %d): ERROR: write test cfg failed (%d)!\n",
+              socket->fd, tx_bytes);
       return tx_bytes;
     }
 
@@ -73,22 +80,34 @@ sock_test_cfg_sync (sock_test_socket_t * socket)
 
   if (rl_cfg->magic != SOCK_TEST_CFG_CTRL_MAGIC)
     {
-      fprintf (stderr, "CLIENT: ERROR: Bad server reply cfg -- aborting!\n");
+      fprintf (stderr, "CLIENT (fd %d): ERROR: Bad server reply cfg "
+              "-- aborting!\n", socket->fd);
       return -1;
     }
-  if (socket->cfg.verbose)
-    {
-      printf ("CLIENT (fd %d): Got config back from server.\n", socket->fd);
-      sock_test_cfg_dump (rl_cfg, 1 /* is_client */ );
-    }
   if ((rx_bytes != sizeof (sock_test_cfg_t))
       || !sock_test_cfg_verify (rl_cfg, &ctrl->cfg))
     {
-      fprintf (stderr, "CLIENT: ERROR: Invalid config received "
-              "from server -- aborting!\n");
-      sock_test_cfg_dump (rl_cfg, 1 /* is_client */ );
+      fprintf (stderr, "CLIENT (fd %d): ERROR: Invalid config received "
+              "from server!\n", socket->fd);
+      if (rx_bytes != sizeof (sock_test_cfg_t))
+       {
+         fprintf (stderr, "\tRx bytes %d != cfg size %lu\n",
+                  rx_bytes, sizeof (sock_test_cfg_t));
+       }
+      else
+       {
+         sock_test_cfg_dump (rl_cfg, 1 /* is_client */ );
+         fprintf (stderr, "CLIENT (fd %d): Valid config sent to server.\n",
+                  socket->fd);
+         sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+       }
       return -1;
     }
+  else if (socket->cfg.verbose)
+    {
+      printf ("CLIENT (fd %d): Got config back from server.\n", socket->fd);
+      sock_test_cfg_dump (rl_cfg, 1 /* is_client */ );
+    }
   ctrl->cfg.ctrl_handle = ((ctrl->cfg.ctrl_handle == ~0) ?
                           rl_cfg->ctrl_handle : ctrl->cfg.ctrl_handle);
 
@@ -98,7 +117,7 @@ sock_test_cfg_sync (sock_test_socket_t * socket)
 static void
 echo_test_client ()
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   sock_test_socket_t *tsock;
   int rx_bytes, tx_bytes, nbytes;
@@ -118,7 +137,8 @@ echo_test_client ()
       tsock = &scm->test_socket[n];
       tsock->cfg = ctrl->cfg;
       sock_test_socket_buf_alloc (tsock);
-      sock_test_cfg_sync (tsock);
+      if (sock_test_cfg_sync (tsock))
+       return;
 
       memcpy (tsock->txbuf, ctrl->txbuf, nbytes);
       memset (&tsock->stats, 0, sizeof (tsock->stats));
@@ -341,7 +361,7 @@ echo_test_client ()
 static void
 stream_test_client (sock_test_t test)
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   sock_test_socket_t *tsock;
   int tx_bytes;
@@ -435,10 +455,9 @@ stream_test_client (sock_test_t test)
          if (FD_ISSET (tsock->fd, wfdset) &&
              (tsock->stats.tx_bytes < ctrl->cfg.total_bytes))
            {
-             tx_bytes =
-               sock_test_write (tsock->fd, (uint8_t *) tsock->txbuf,
-                                ctrl->cfg.txbuf_size, &tsock->stats,
-                                ctrl->cfg.verbose);
+             tx_bytes = sock_test_write (tsock->fd, (uint8_t *) tsock->txbuf,
+                                         ctrl->cfg.txbuf_size, &tsock->stats,
+                                         ctrl->cfg.verbose);
              if (tx_bytes < 0)
                {
                  fprintf (stderr, "\nCLIENT: ERROR: sock_test_write(%d) "
@@ -517,7 +536,7 @@ stream_test_client (sock_test_t test)
 static void
 exit_client (void)
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   sock_test_socket_t *tsock;
   int i;
@@ -559,7 +578,7 @@ exit_client (void)
 static int
 sock_test_connect_test_sockets (uint32_t num_test_sockets)
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   sock_test_socket_t *tsock;
   int i, rv, errno_val;
@@ -692,7 +711,7 @@ dump_help (void)
 static void
 cfg_txbuf_size_set (void)
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_TXBUF_SIZE);
   uint64_t txbuf_size = strtoull ((const char *) p, NULL, 10);
@@ -714,7 +733,7 @@ cfg_txbuf_size_set (void)
 static void
 cfg_num_writes_set (void)
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_NUM_WRITES);
   uint32_t num_writes = strtoul ((const char *) p, NULL, 10);
@@ -734,7 +753,7 @@ cfg_num_writes_set (void)
 static void
 cfg_num_test_sockets_set (void)
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_NUM_TEST_SCKTS);
   uint32_t num_test_sockets = strtoul ((const char *) p, NULL, 10);
@@ -758,7 +777,7 @@ cfg_num_test_sockets_set (void)
 static void
 cfg_rxbuf_size_set (void)
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_RXBUF_SIZE);
   uint64_t rxbuf_size = strtoull ((const char *) p, NULL, 10);
@@ -779,7 +798,7 @@ cfg_rxbuf_size_set (void)
 static void
 cfg_verbose_toggle (void)
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
 
   ctrl->cfg.verbose = ctrl->cfg.verbose ? 0 : 1;
@@ -790,7 +809,7 @@ cfg_verbose_toggle (void)
 static sock_test_t
 parse_input ()
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   sock_test_t rv = SOCK_TEST_TYPE_NONE;
 
@@ -865,7 +884,7 @@ print_usage_and_exit (void)
 int
 main (int argc, char **argv)
 {
-  sock_client_main_t *scm = &sock_client_main;
+  sock_client_main_t *scm = &vcl_client_main;
   sock_test_socket_t *ctrl = &scm->ctrl_socket;
   int c, rv, errno_val;
   sock_test_t post_test = SOCK_TEST_TYPE_NONE;