#include <time.h>
#include <arpa/inet.h>
#include <vcl/vcl_test.h>
+#include <pthread.h>
typedef struct
{
+ vcl_test_session_t *sessions;
+ uint32_t n_sessions;
+ uint32_t wrk_index;
+ fd_set wr_fdset;
+ fd_set rd_fdset;
+ int max_fd_index;
+ pthread_t thread_handle;
+ vcl_test_cfg_t cfg;
+} vcl_test_client_worker_t;
+
+typedef struct
+{
+ vcl_test_client_worker_t *workers;
vppcom_endpt_t server_endpt;
- 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;
+ vcl_test_session_t ctrl_session;
+ vcl_test_session_t *sessions;
uint8_t dump_cfg;
-} sock_client_main_t;
+ vcl_test_t post_test;
+ uint32_t proto;
+ uint32_t n_workers;
+ volatile int active_workers;
+ struct sockaddr_storage server_addr;
+} vcl_test_client_main_t;
+
+static __thread int __wrk_index = 0;
-sock_client_main_t sock_client_main;
+vcl_test_client_main_t vcl_client_main;
+#define vtc_min(a, b) (a < b ? a : b)
+#define vtc_max(a, b) (a > b ? a : b)
static int
-sock_test_cfg_sync (sock_test_socket_t * socket)
+vtc_cfg_sync (vcl_test_session_t * ts)
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
- sock_test_cfg_t *rl_cfg = (sock_test_cfg_t *) socket->rxbuf;
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_cfg_t *rx_cfg = (vcl_test_cfg_t *) ts->rxbuf;
int rx_bytes, tx_bytes;
- 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)
+ vt_atomic_add (&ts->cfg.seq_num, 1);
+ if (ts->cfg.verbose)
{
- printf ("CLIENT (fd %d): Sending config sent to server.\n", socket->fd);
- sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+ vtinf ("(fd %d): Sending config to server.", ts->fd);
+ vcl_test_cfg_dump (&ts->cfg, 1 /* is_client */ );
}
- tx_bytes = vcl_test_write (socket->fd, (uint8_t *) & ctrl->cfg,
- sizeof (ctrl->cfg), NULL, ctrl->cfg.verbose);
+ tx_bytes = vcl_test_write (ts->fd, (uint8_t *) & ts->cfg,
+ sizeof (ts->cfg), NULL, ts->cfg.verbose);
if (tx_bytes < 0)
{
- fprintf (stderr, "CLIENT (fd %d): ERROR: write test cfg failed (%d)!\n",
- socket->fd, tx_bytes);
+ vtwrn ("(fd %d): write test cfg failed (%d)!", ts->fd, tx_bytes);
return tx_bytes;
}
- rx_bytes = vcl_test_read (socket->fd, (uint8_t *) socket->rxbuf,
- sizeof (sock_test_cfg_t), NULL);
+ rx_bytes = vcl_test_read (ts->fd, (uint8_t *) ts->rxbuf,
+ sizeof (vcl_test_cfg_t), NULL);
if (rx_bytes < 0)
return rx_bytes;
- if (rl_cfg->magic != SOCK_TEST_CFG_CTRL_MAGIC)
+ if (rx_cfg->magic != VCL_TEST_CFG_CTRL_MAGIC)
{
- fprintf (stderr, "CLIENT (fd %d): ERROR: Bad server reply cfg "
- "-- aborting!\n", socket->fd);
+ vtwrn ("(fd %d): Bad server reply cfg -- aborting!", ts->fd);
return -1;
}
- if ((rx_bytes != sizeof (sock_test_cfg_t))
- || !sock_test_cfg_verify (rl_cfg, &ctrl->cfg))
+ if ((rx_bytes != sizeof (vcl_test_cfg_t))
+ || !vcl_test_cfg_verify (rx_cfg, &ts->cfg))
{
- fprintf (stderr, "CLIENT (fd %d): ERROR: Invalid config received "
- "from server!\n", socket->fd);
- if (rx_bytes != sizeof (sock_test_cfg_t))
+ vtwrn ("(fd %d): Invalid config received from server!", ts->fd);
+ if (rx_bytes != sizeof (vcl_test_cfg_t))
{
- fprintf (stderr, "\tRx bytes %d != cfg size %lu\n",
- rx_bytes, sizeof (sock_test_cfg_t));
+ vtinf ("\tRx bytes %d != cfg size %lu", rx_bytes,
+ sizeof (vcl_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 */ );
+ vcl_test_cfg_dump (rx_cfg, 1 /* is_client */ );
+ vtinf ("(fd %d): Valid config sent to server.", ts->fd);
+ vcl_test_cfg_dump (&ts->cfg, 1 /* is_client */ );
}
return -1;
}
- else if (socket->cfg.verbose)
+ if (ts->cfg.verbose)
{
- printf ("CLIENT (fd %d): Got config back from server.\n", socket->fd);
- sock_test_cfg_dump (rl_cfg, 1 /* is_client */ );
+ vtinf ("(fd %d): Got config back from server.", ts->fd);
+ vcl_test_cfg_dump (rx_cfg, 1 /* is_client */ );
}
- ctrl->cfg.ctrl_handle = ((ctrl->cfg.ctrl_handle == ~0) ?
- rl_cfg->ctrl_handle : ctrl->cfg.ctrl_handle);
return 0;
}
-static void
-echo_test_client ()
+static int
+vtc_connect_test_sessions (vcl_test_client_worker_t * wrk)
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
- sock_test_socket_t *tsock;
- int rx_bytes, tx_bytes, nbytes;
- uint32_t i, n;
- int rv;
- int nfds = 0;
- fd_set wr_fdset, rd_fdset;
- fd_set _wfdset, *wfdset = &_wfdset;
- fd_set _rfdset, *rfdset = &_rfdset;
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ts;
+ uint32_t n_test_sessions;
+ int i, rv;
- FD_ZERO (&wr_fdset);
- FD_ZERO (&rd_fdset);
- memset (&ctrl->stats, 0, sizeof (ctrl->stats));
- ctrl->cfg.total_bytes = nbytes = strlen (ctrl->txbuf) + 1;
- for (n = 0; n != ctrl->cfg.num_test_sockets; n++)
+ n_test_sessions = wrk->cfg.num_test_sessions;
+ if (n_test_sessions < 1)
{
- tsock = &scm->test_socket[n];
- tsock->cfg = ctrl->cfg;
- sock_test_socket_buf_alloc (tsock);
- if (sock_test_cfg_sync (tsock))
- return;
-
- memcpy (tsock->txbuf, ctrl->txbuf, nbytes);
- memset (&tsock->stats, 0, sizeof (tsock->stats));
-
- FD_SET (tsock->fd, &wr_fdset);
- FD_SET (tsock->fd, &rd_fdset);
- nfds = ((tsock->fd + 1) > nfds) ? (tsock->fd + 1) : nfds;
+ errno = EINVAL;
+ return -1;
}
- nfds++;
- clock_gettime (CLOCK_REALTIME, &ctrl->stats.start);
- while (n)
+ if (wrk->n_sessions >= n_test_sessions)
+ goto done;
+
+ if (wrk->n_sessions)
+ wrk->sessions = realloc (wrk->sessions,
+ n_test_sessions * sizeof (vcl_test_session_t));
+ else
+ wrk->sessions = calloc (n_test_sessions, sizeof (vcl_test_session_t));
+
+ if (!wrk->sessions)
{
- _wfdset = wr_fdset;
- _rfdset = rd_fdset;
+ vterr ("failed to alloc sessions", -errno);
+ return errno;
+ }
- rv = vppcom_select (nfds, (uint64_t *) rfdset, (uint64_t *) wfdset,
- NULL, 0);
+ for (i = 0; i < n_test_sessions; i++)
+ {
+ ts = &wrk->sessions[i];
+ ts->fd = vppcom_session_create (vcm->proto, 1 /* is_nonblocking */ );
+ if (ts->fd < 0)
+ {
+ vterr ("vppcom_session_create()", ts->fd);
+ return ts->fd;
+ }
+
+ rv = vppcom_session_connect (ts->fd, &vcm->server_endpt);
if (rv < 0)
{
- perror ("select()");
- fprintf (stderr, "\nCLIENT: ERROR: select() failed -- "
- "aborting test!\n");
- return;
+ vterr ("vppcom_session_connect()", rv);
+ return rv;
}
- else if (rv == 0)
- continue;
+ vtinf ("Test session %d (fd %d) connected.", i, ts->fd);
+ }
+ wrk->n_sessions = n_test_sessions;
- for (i = 0; i < ctrl->cfg.num_test_sockets; i++)
+done:
+ vtinf ("All test sessions (%d) connected!", n_test_sessions);
+ return 0;
+}
+
+static int
+vtc_worker_test_setup (vcl_test_client_worker_t * wrk)
+{
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ vcl_test_cfg_t *cfg = &wrk->cfg;
+ vcl_test_session_t *ts;
+ uint32_t sidx;
+ int i, j;
+
+ FD_ZERO (&wrk->wr_fdset);
+ FD_ZERO (&wrk->rd_fdset);
+
+ for (i = 0; i < cfg->num_test_sessions; i++)
+ {
+ ts = &wrk->sessions[i];
+ ts->cfg = wrk->cfg;
+ vcl_test_session_buf_alloc (ts);
+
+ switch (cfg->test)
{
- tsock = &scm->test_socket[i];
- if (!((tsock->stats.stop.tv_sec == 0) &&
- (tsock->stats.stop.tv_nsec == 0)))
- continue;
+ case VCL_TEST_TYPE_ECHO:
+ memcpy (ts->txbuf, ctrl->txbuf, cfg->total_bytes);
+ break;
+ case VCL_TEST_TYPE_UNI:
+ case VCL_TEST_TYPE_BI:
+ for (j = 0; j < ts->txbuf_size; j++)
+ ts->txbuf[j] = j & 0xff;
+ break;
+ }
- if (FD_ISSET (tsock->fd, wfdset)
- && (tsock->stats.tx_bytes < ctrl->cfg.total_bytes))
+ FD_SET (vppcom_session_index (ts->fd), &wrk->wr_fdset);
+ FD_SET (vppcom_session_index (ts->fd), &wrk->rd_fdset);
+ sidx = vppcom_session_index (ts->fd);
+ wrk->max_fd_index = vtc_max (sidx, wrk->max_fd_index);
+ }
+ wrk->max_fd_index += 1;
- {
- tx_bytes = vcl_test_write (tsock->fd, (uint8_t *) tsock->txbuf,
- nbytes, &tsock->stats,
- ctrl->cfg.verbose);
- if (tx_bytes < 0)
- {
- fprintf (stderr, "\nCLIENT: ERROR: vcl_test_write(%d) "
- "failed -- aborting test!\n", tsock->fd);
- return;
- }
+ return 0;
+}
- }
+static int
+vtc_worker_init (vcl_test_client_worker_t * wrk)
+{
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ vcl_test_cfg_t *cfg = &wrk->cfg;
+ vcl_test_session_t *ts;
+ uint32_t i, n;
+ int rv, nbytes;
- if ((FD_ISSET (tsock->fd, rfdset)) &&
- (tsock->stats.rx_bytes < ctrl->cfg.total_bytes))
- {
- rx_bytes = vcl_test_read (tsock->fd, (uint8_t *) tsock->rxbuf,
- nbytes, &tsock->stats);
- if (rx_bytes > 0)
- {
- printf ("CLIENT (fd %d): RX (%d bytes) - '%s'\n",
- tsock->fd, rx_bytes, tsock->rxbuf);
+ __wrk_index = wrk->wrk_index;
- if (tsock->stats.rx_bytes != tsock->stats.tx_bytes)
- printf ("CLIENT: WARNING: bytes read (%lu) "
- "!= bytes written (%lu)!\n",
- tsock->stats.rx_bytes, tsock->stats.tx_bytes);
- }
- }
+ vtinf ("Initializing worker %u ...", wrk->wrk_index);
- if (tsock->stats.rx_bytes >= ctrl->cfg.total_bytes)
- {
- clock_gettime (CLOCK_REALTIME, &tsock->stats.stop);
- n--;
- }
+ if (wrk->wrk_index)
+ {
+ if (vppcom_worker_register ())
+ {
+ vtwrn ("failed to register worker");
+ return -1;
}
+ vt_atomic_add (&vcm->active_workers, 1);
}
- clock_gettime (CLOCK_REALTIME, &ctrl->stats.stop);
-
- for (i = 0; i < ctrl->cfg.num_test_sockets; i++)
+ rv = vtc_connect_test_sessions (wrk);
+ if (rv)
{
- tsock = &scm->test_socket[i];
- tsock->stats.start = ctrl->stats.start;
+ vterr ("vtc_connect_test_sessions ()", rv);
+ return rv;
+ }
- if (ctrl->cfg.verbose)
- {
- static char buf[64];
+ if (vtc_worker_test_setup (wrk))
+ return -1;
- sprintf (buf, "CLIENT (fd %d) RESULTS", tsock->fd);
- sock_test_stats_dump (buf, &tsock->stats,
- 1 /* show_rx */ , 1 /* show tx */ ,
- ctrl->cfg.verbose);
- }
+ vtinf ("Sending config to server on all sessions ...");
- sock_test_stats_accumulate (&ctrl->stats, &tsock->stats);
+ for (n = 0; n < cfg->num_test_sessions; n++)
+ {
+ ts = &wrk->sessions[n];
+ if (vtc_cfg_sync (ts))
+ return -1;
+ memset (&ts->stats, 0, sizeof (ts->stats));
}
- if (ctrl->cfg.verbose)
+ return 0;
+}
+
+static int stats_lock = 0;
+
+static void
+vtc_accumulate_stats (vcl_test_client_worker_t * wrk,
+ vcl_test_session_t * ctrl)
+{
+ vcl_test_session_t *ts;
+ static char buf[64];
+ int i, show_rx = 0;
+
+ while (__sync_lock_test_and_set (&stats_lock, 1))
+ ;
+
+ if (ctrl->cfg.test == VCL_TEST_TYPE_BI
+ || ctrl->cfg.test == VCL_TEST_TYPE_ECHO)
+ show_rx = 1;
+
+ for (i = 0; i < wrk->cfg.num_test_sessions; i++)
{
- sock_test_stats_dump ("CLIENT RESULTS", &ctrl->stats,
- 1 /* show_rx */ , 1 /* show tx */ ,
- ctrl->cfg.verbose);
- sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+ ts = &wrk->sessions[i];
+ ts->stats.start = ctrl->stats.start;
if (ctrl->cfg.verbose > 1)
{
- printf (" ctrl socket info\n"
- SOCK_TEST_SEPARATOR_STRING
- " fd: %d (0x%08x)\n"
- " rxbuf: %p\n"
- " rxbuf size: %u (0x%08x)\n"
- " txbuf: %p\n"
- " txbuf size: %u (0x%08x)\n"
- SOCK_TEST_SEPARATOR_STRING,
- ctrl->fd, (uint32_t) ctrl->fd,
- ctrl->rxbuf, ctrl->rxbuf_size, ctrl->rxbuf_size,
- ctrl->txbuf, ctrl->txbuf_size, ctrl->txbuf_size);
+ sprintf (buf, "CLIENT (fd %d) RESULTS", ts->fd);
+ vcl_test_stats_dump (buf, &ts->stats, show_rx, 1 /* show tx */ ,
+ ctrl->cfg.verbose);
}
+
+ vcl_test_stats_accumulate (&ctrl->stats, &ts->stats);
+ if (vcl_comp_tspec (&ctrl->stats.stop, &ts->stats.stop) < 0)
+ ctrl->stats.stop = ts->stats.stop;
}
+
+ __sync_lock_release (&stats_lock);
}
static void
-stream_test_client (sock_test_t test)
+vtc_worker_sessions_exit (vcl_test_client_worker_t * wrk)
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
- sock_test_socket_t *tsock;
- int tx_bytes;
- uint32_t i, n;
- int rv;
- int nfds = 0;
- fd_set wr_fdset, rd_fdset;
- fd_set _wfdset, *wfdset = &_wfdset;
- fd_set _rfdset, *rfdset = (test == SOCK_TEST_TYPE_BI) ? &_rfdset : 0;
-
- ctrl->cfg.total_bytes = ctrl->cfg.num_writes * ctrl->cfg.txbuf_size;
- ctrl->cfg.ctrl_handle = ~0;
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ vcl_test_session_t *ts;
+ int i, verbose = ctrl->cfg.verbose;
- printf ("\n" SOCK_TEST_BANNER_STRING
- "CLIENT (fd %d): %s-directional Stream Test!\n\n"
- "CLIENT (fd %d): Sending config to server on ctrl socket...\n",
- ctrl->fd, test == SOCK_TEST_TYPE_BI ? "Bi" : "Uni", ctrl->fd);
-
- if (sock_test_cfg_sync (ctrl))
+ for (i = 0; i < wrk->cfg.num_test_sessions; i++)
{
- fprintf (stderr, "CLIENT: ERROR: test cfg sync failed -- aborting!");
- return;
+ ts = &wrk->sessions[i];
+ ts->cfg.test = VCL_TEST_TYPE_EXIT;
+
+ if (verbose)
+ {
+ vtinf ("(fd %d): Sending exit cfg to server...", ts->fd);
+ vcl_test_cfg_dump (&ts->cfg, 1 /* is_client */ );
+ }
+ (void) vcl_test_write (ts->fd, (uint8_t *) & ts->cfg,
+ sizeof (ts->cfg), &ts->stats, verbose);
}
+ wrk->n_sessions = 0;
+}
- FD_ZERO (&wr_fdset);
- FD_ZERO (&rd_fdset);
- memset (&ctrl->stats, 0, sizeof (ctrl->stats));
- for (n = 0; n != ctrl->cfg.num_test_sockets; n++)
+static void *
+vtc_worker_loop (void *arg)
+{
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ vcl_test_client_worker_t *wrk = arg;
+ uint32_t n_active_sessions, n_bytes;
+ fd_set _wfdset, *wfdset = &_wfdset;
+ fd_set _rfdset, *rfdset = &_rfdset;
+ vcl_test_session_t *ts;
+ int i, rv, check_rx = 0;
+
+ rv = vtc_worker_init (wrk);
+ if (rv)
{
- tsock = &scm->test_socket[n];
- tsock->cfg = ctrl->cfg;
- sock_test_socket_buf_alloc (tsock);
- printf ("CLIENT (fd %d): Sending config to server on "
- "test socket %d...\n", tsock->fd, n);
- sock_test_cfg_sync (tsock);
-
- /* Fill payload with incrementing uint32's */
- for (i = 0; i < tsock->txbuf_size; i++)
- tsock->txbuf[i] = i & 0xff;
-
- memset (&tsock->stats, 0, sizeof (tsock->stats));
- FD_SET (tsock->fd, &wr_fdset);
- FD_SET (tsock->fd, &rd_fdset);
- nfds = ((tsock->fd + 1) > nfds) ? (tsock->fd + 1) : nfds;
+ vterr ("vtc_worker_init()", rv);
+ return 0;
}
- nfds++;
- clock_gettime (CLOCK_REALTIME, &ctrl->stats.start);
- while (n)
+ vtinf ("Starting test ...");
+
+ if (wrk->wrk_index == 0)
+ clock_gettime (CLOCK_REALTIME, &ctrl->stats.start);
+
+ check_rx = wrk->cfg.test != VCL_TEST_TYPE_UNI;
+ n_active_sessions = wrk->cfg.num_test_sessions;
+ while (n_active_sessions)
{
- _wfdset = wr_fdset;
- _rfdset = rd_fdset;
+ _wfdset = wrk->wr_fdset;
+ _rfdset = wrk->rd_fdset;
- rv = vppcom_select (nfds, (uint64_t *) rfdset, (uint64_t *) wfdset,
- NULL, 0);
+ rv = vppcom_select (wrk->max_fd_index, (uint64_t *) rfdset,
+ (uint64_t *) wfdset, NULL, 0);
if (rv < 0)
{
- perror ("select()");
- fprintf (stderr, "\nCLIENT: ERROR: select() failed -- "
- "aborting test!\n");
- return;
+ vterr ("vppcom_select()", rv);
+ goto exit;
}
else if (rv == 0)
continue;
- for (i = 0; i < ctrl->cfg.num_test_sockets; i++)
+ for (i = 0; i < wrk->cfg.num_test_sessions; i++)
{
- tsock = &scm->test_socket[i];
- if (!((tsock->stats.stop.tv_sec == 0) &&
- (tsock->stats.stop.tv_nsec == 0)))
+ ts = &wrk->sessions[i];
+ if (!((ts->stats.stop.tv_sec == 0) &&
+ (ts->stats.stop.tv_nsec == 0)))
continue;
- if ((test == SOCK_TEST_TYPE_BI) &&
- FD_ISSET (tsock->fd, rfdset) &&
- (tsock->stats.rx_bytes < ctrl->cfg.total_bytes))
+ if (FD_ISSET (vppcom_session_index (ts->fd), rfdset)
+ && ts->stats.rx_bytes < ts->cfg.total_bytes)
{
- (void) vcl_test_read (tsock->fd,
- (uint8_t *) tsock->rxbuf,
- tsock->rxbuf_size, &tsock->stats);
+ (void) vcl_test_read (ts->fd, (uint8_t *) ts->rxbuf,
+ ts->rxbuf_size, &ts->stats);
}
- if (FD_ISSET (tsock->fd, wfdset)
- && (tsock->stats.tx_bytes < ctrl->cfg.total_bytes))
+ if (FD_ISSET (vppcom_session_index (ts->fd), wfdset)
+ && ts->stats.tx_bytes < ts->cfg.total_bytes)
{
- tx_bytes = vcl_test_write (tsock->fd, (uint8_t *) tsock->txbuf,
- ctrl->cfg.txbuf_size, &tsock->stats,
- ctrl->cfg.verbose);
- if (tx_bytes < 0)
+ n_bytes = ts->cfg.txbuf_size;
+ if (ts->cfg.test == VCL_TEST_TYPE_ECHO)
+ n_bytes = strlen (ctrl->txbuf) + 1;
+ rv = vcl_test_write (ts->fd, (uint8_t *) ts->txbuf,
+ n_bytes, &ts->stats, ts->cfg.verbose);
+ if (rv < 0)
{
- fprintf (stderr, "\nCLIENT: ERROR: vcl_test_write(%d) "
- "failed -- aborting test!\n", tsock->fd);
- return;
+ vtwrn ("vppcom_test_write (%d) failed -- aborting test",
+ ts->fd);
+ goto exit;
}
}
- if (((test == SOCK_TEST_TYPE_UNI) &&
- (tsock->stats.tx_bytes >= ctrl->cfg.total_bytes)) ||
- ((test == SOCK_TEST_TYPE_BI) &&
- (tsock->stats.rx_bytes >= ctrl->cfg.total_bytes)))
+ if ((!check_rx && ts->stats.tx_bytes >= ts->cfg.total_bytes)
+ || (check_rx && ts->stats.rx_bytes >= ts->cfg.total_bytes))
{
- clock_gettime (CLOCK_REALTIME, &tsock->stats.stop);
- n--;
+ clock_gettime (CLOCK_REALTIME, &ts->stats.stop);
+ n_active_sessions--;
}
}
}
- clock_gettime (CLOCK_REALTIME, &ctrl->stats.stop);
-
- printf ("CLIENT (fd %d): Sending config to server on ctrl socket...\n",
- ctrl->fd);
-
- if (sock_test_cfg_sync (ctrl))
- {
- fprintf (stderr, "CLIENT: ERROR: test cfg sync failed -- aborting!");
- return;
- }
-
- for (i = 0; i < ctrl->cfg.num_test_sockets; i++)
- {
- tsock = &scm->test_socket[i];
-
- if (ctrl->cfg.verbose)
- {
- static char buf[64];
+exit:
+ vtinf ("Worker %d done ...", wrk->wrk_index);
+ if (wrk->cfg.test != VCL_TEST_TYPE_ECHO)
+ vtc_accumulate_stats (wrk, ctrl);
+ sleep (VCL_TEST_DELAY_DISCONNECT);
+ vtc_worker_sessions_exit (wrk);
+ if (wrk->wrk_index)
+ vt_atomic_add (&vcm->active_workers, -1);
+ return 0;
+}
- sprintf (buf, "CLIENT (fd %d) RESULTS", tsock->fd);
- sock_test_stats_dump (buf, &tsock->stats,
- test == SOCK_TEST_TYPE_BI /* show_rx */ ,
- 1 /* show tx */ , ctrl->cfg.verbose);
- }
+static void
+vtc_print_stats (vcl_test_session_t * ctrl)
+{
+ int is_echo = ctrl->cfg.test == VCL_TEST_TYPE_ECHO;
+ int show_rx = 0;
+ char buf[64];
- sock_test_stats_accumulate (&ctrl->stats, &tsock->stats);
- }
+ if (ctrl->cfg.test == VCL_TEST_TYPE_BI
+ || ctrl->cfg.test == VCL_TEST_TYPE_ECHO)
+ show_rx = 1;
- sock_test_stats_dump ("CLIENT RESULTS", &ctrl->stats,
- test == SOCK_TEST_TYPE_BI /* show_rx */ ,
- 1 /* show tx */ , ctrl->cfg.verbose);
- sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+ vcl_test_stats_dump ("CLIENT RESULTS", &ctrl->stats,
+ show_rx, 1 /* show tx */ ,
+ ctrl->cfg.verbose);
+ vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
if (ctrl->cfg.verbose)
{
- printf (" ctrl socket info\n"
- SOCK_TEST_SEPARATOR_STRING
- " fd: %d (0x%08x)\n"
- " rxbuf: %p\n"
- " rxbuf size: %u (0x%08x)\n"
- " txbuf: %p\n"
- " txbuf size: %u (0x%08x)\n"
- SOCK_TEST_SEPARATOR_STRING,
- ctrl->fd, (uint32_t) ctrl->fd,
- ctrl->rxbuf, ctrl->rxbuf_size, ctrl->rxbuf_size,
- ctrl->txbuf, ctrl->txbuf_size, ctrl->txbuf_size);
+ vtinf (" ctrl session info\n"
+ VCL_TEST_SEPARATOR_STRING
+ " fd: %d (0x%08x)\n"
+ " rxbuf: %p\n"
+ " rxbuf size: %u (0x%08x)\n"
+ " txbuf: %p\n"
+ " txbuf size: %u (0x%08x)\n"
+ VCL_TEST_SEPARATOR_STRING,
+ ctrl->fd, (uint32_t) ctrl->fd,
+ ctrl->rxbuf, ctrl->rxbuf_size, ctrl->rxbuf_size,
+ ctrl->txbuf, ctrl->txbuf_size, ctrl->txbuf_size);
}
- ctrl->cfg.test = SOCK_TEST_TYPE_ECHO;
- if (sock_test_cfg_sync (ctrl))
- fprintf (stderr, "CLIENT: ERROR: post-test cfg sync failed!");
-
- printf ("CLIENT (fd %d): %s-directional Stream Test Complete!\n"
- SOCK_TEST_BANNER_STRING "\n", ctrl->fd,
- test == SOCK_TEST_TYPE_BI ? "Bi" : "Uni");
+ if (is_echo)
+ sprintf (buf, "Echo");
+ else
+ sprintf (buf, "%s-directional Stream",
+ ctrl->cfg.test == VCL_TEST_TYPE_BI ? "Bi" : "Uni");
}
static void
-exit_client (void)
+vtc_echo_client (vcl_test_client_main_t * vcm)
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
- sock_test_socket_t *tsock;
- int i;
+ vcl_test_client_worker_t *wrk;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ vcl_test_cfg_t *cfg = &ctrl->cfg;
- for (i = 0; i < ctrl->cfg.num_test_sockets; i++)
- {
- tsock = &scm->test_socket[i];
- tsock->cfg.test = SOCK_TEST_TYPE_EXIT;
+ cfg->total_bytes = strlen (ctrl->txbuf) + 1;
+ memset (&ctrl->stats, 0, sizeof (ctrl->stats));
- /* coverity[COPY_PASTE_ERROR] */
- if (ctrl->cfg.verbose)
- {
- printf ("\nCLIENT (fd %d): Sending exit cfg to server...\n",
- tsock->fd);
- sock_test_cfg_dump (&tsock->cfg, 1 /* is_client */ );
- }
- (void) vcl_test_write (tsock->fd, (uint8_t *) & tsock->cfg,
- sizeof (tsock->cfg), &tsock->stats,
- ctrl->cfg.verbose);
- }
+ /* Echo works with only one worker */
+ wrk = vcm->workers;
+ wrk->wrk_index = 0;
+ wrk->cfg = *cfg;
- ctrl->cfg.test = SOCK_TEST_TYPE_EXIT;
- if (ctrl->cfg.verbose)
- {
- printf ("\nCLIENT (fd %d): Sending exit cfg to server...\n", ctrl->fd);
- sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
- }
- (void) vcl_test_write (ctrl->fd, (uint8_t *) & ctrl->cfg,
- sizeof (ctrl->cfg), &ctrl->stats, ctrl->cfg.verbose);
- printf ("\nCLIENT: So long and thanks for all the fish!\n\n");
- sleep (1);
+ vtc_worker_loop (wrk);
+
+ /* Not relevant for echo test
+ clock_gettime (CLOCK_REALTIME, &ctrl->stats.stop);
+ vtc_accumulate_stats (wrk, ctrl);
+ vtc_print_stats (ctrl);
+ */
}
-static int
-sock_test_connect_test_sockets (uint32_t num_test_sockets)
+static void
+vtc_stream_client (vcl_test_client_main_t * vcm)
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
- sock_test_socket_t *tsock;
- int i, rv, errno_val;
-
- if (num_test_sockets < 1)
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ vcl_test_cfg_t *cfg = &ctrl->cfg;
+ vcl_test_client_worker_t *wrk;
+ vcl_test_session_t *ts;
+ int tx_bytes, rv;
+ uint32_t i, n, sidx, n_conn, n_conn_per_wrk;
+
+ vtinf ("%s-directional Stream Test Starting!",
+ ctrl->cfg.test == VCL_TEST_TYPE_BI ? "Bi" : "Uni");
+
+ cfg->total_bytes = cfg->num_writes * cfg->txbuf_size;
+ cfg->ctrl_handle = ~0;
+ if (vtc_cfg_sync (ctrl))
{
- errno = EINVAL;
- return -1;
+ vtwrn ("test cfg sync failed -- aborting!");
+ return;
}
+ cfg->ctrl_handle = ((vcl_test_cfg_t *) ctrl->rxbuf)->ctrl_handle;
+ memset (&ctrl->stats, 0, sizeof (ctrl->stats));
- if (num_test_sockets < scm->num_test_sockets)
+ n_conn = cfg->num_test_sessions;
+ n_conn_per_wrk = n_conn / vcm->n_workers;
+ for (i = 0; i < vcm->n_workers; i++)
{
- for (i = scm->num_test_sockets - 1; i >= num_test_sockets; i--)
- {
- tsock = &scm->test_socket[i];
- vppcom_session_close (tsock->fd);
- free (tsock->txbuf);
- free (tsock->rxbuf);
- }
+ wrk = &vcm->workers[i];
+ wrk->wrk_index = i;
+ wrk->cfg = ctrl->cfg;
+ wrk->cfg.num_test_sessions = vtc_min (n_conn_per_wrk, n_conn);
+ n_conn -= wrk->cfg.num_test_sessions;
}
- else if (num_test_sockets > scm->num_test_sockets)
+ for (i = 1; i < vcm->n_workers; i++)
{
- tsock = realloc (scm->test_socket,
- sizeof (sock_test_socket_t) * num_test_sockets);
- if (!tsock)
- {
- errno_val = errno;
- perror ("ERROR in sock_test_connect_test_sockets()");
- fprintf (stderr, "CLIENT: ERROR: socket failed (errno = %d)!\n",
- errno_val);
- return -1;
- }
-
- if (!scm->test_socket)
- memset (tsock, 0, sizeof (*tsock));
-
- scm->test_socket = tsock;
- for (i = scm->num_test_sockets; i < num_test_sockets; i++)
- {
- tsock = &scm->test_socket[i];
- tsock->fd = vppcom_session_create (ctrl->cfg.transport_udp ?
- VPPCOM_PROTO_UDP :
- VPPCOM_PROTO_TCP,
- 1 /* is_nonblocking */ );
- if (tsock->fd < 0)
- {
- errno = -tsock->fd;
- tsock->fd = -1;
- }
- if (tsock->fd < 0)
- {
- errno_val = errno;
- perror ("ERROR in sock_test_connect_test_sockets()");
- fprintf (stderr, "CLIENT: ERROR: socket failed (errno = %d)!\n",
- errno_val);
- return tsock->fd;
- }
+ wrk = &vcm->workers[i];
+ pthread_create (&wrk->thread_handle, NULL, vtc_worker_loop,
+ (void *) wrk);
+ }
+ vtc_worker_loop (&vcm->workers[0]);
- rv = vppcom_session_connect (tsock->fd, &scm->server_endpt);
- if (rv)
- {
- errno = -rv;
- rv = -1;
- }
- if (rv < 0)
- {
- errno_val = errno;
- perror ("ERROR in sock_test_connect_test_sockets()");
- fprintf (stderr, "CLIENT: ERROR: connect failed "
- "(errno = %d)!\n", errno_val);
- return -1;
- }
- tsock->cfg = ctrl->cfg;
- sock_test_socket_buf_alloc (tsock);
- sock_test_cfg_sync (tsock);
+ while (vcm->active_workers > 0)
+ ;
- printf ("CLIENT (fd %d): Test socket %d connected.\n",
- tsock->fd, i);
- }
+ vtinf ("Sending config on ctrl session (fd %d) for stats...", ctrl->fd);
+ if (vtc_cfg_sync (ctrl))
+ {
+ vtwrn ("test cfg sync failed -- aborting!");
+ return;
}
- scm->num_test_sockets = num_test_sockets;
- printf ("CLIENT: All sockets (%d) connected!\n", scm->num_test_sockets + 1);
- return 0;
+ vtc_print_stats (ctrl);
+
+ ctrl->cfg.test = VCL_TEST_TYPE_ECHO;
+ ctrl->cfg.total_bytes = 0;
+ if (vtc_cfg_sync (ctrl))
+ vtwrn ("post-test cfg sync failed!");
}
static void
#define INDENT "\n "
printf ("CLIENT: Test configuration commands:"
- INDENT SOCK_TEST_TOKEN_HELP
+ INDENT VCL_TEST_TOKEN_HELP
"\t\t\tDisplay help."
- INDENT SOCK_TEST_TOKEN_EXIT
+ INDENT VCL_TEST_TOKEN_EXIT
"\t\t\tExit test client & server."
- INDENT SOCK_TEST_TOKEN_SHOW_CFG
+ INDENT VCL_TEST_TOKEN_SHOW_CFG
"\t\t\tShow the current test cfg."
- INDENT SOCK_TEST_TOKEN_RUN_UNI
+ INDENT VCL_TEST_TOKEN_RUN_UNI
"\t\t\tRun the Uni-directional test."
- INDENT SOCK_TEST_TOKEN_RUN_BI
+ INDENT VCL_TEST_TOKEN_RUN_BI
"\t\t\tRun the Bi-directional test."
- INDENT SOCK_TEST_TOKEN_VERBOSE
+ INDENT VCL_TEST_TOKEN_VERBOSE
"\t\t\tToggle verbose setting."
- INDENT SOCK_TEST_TOKEN_RXBUF_SIZE
+ INDENT VCL_TEST_TOKEN_RXBUF_SIZE
"<rxbuf size>\tRx buffer size (bytes)."
- INDENT SOCK_TEST_TOKEN_TXBUF_SIZE
+ INDENT VCL_TEST_TOKEN_TXBUF_SIZE
"<txbuf size>\tTx buffer size (bytes)."
- INDENT SOCK_TEST_TOKEN_NUM_WRITES
+ INDENT VCL_TEST_TOKEN_NUM_WRITES
"<# of writes>\tNumber of txbuf writes to server." "\n");
}
static void
cfg_txbuf_size_set (void)
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
- char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_TXBUF_SIZE);
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ char *p = ctrl->txbuf + strlen (VCL_TEST_TOKEN_TXBUF_SIZE);
uint64_t txbuf_size = strtoull ((const char *) p, NULL, 10);
- if (txbuf_size >= SOCK_TEST_CFG_BUF_SIZE_MIN)
+ if (txbuf_size >= VCL_TEST_CFG_BUF_SIZE_MIN)
{
ctrl->cfg.txbuf_size = txbuf_size;
ctrl->cfg.total_bytes = ctrl->cfg.num_writes * ctrl->cfg.txbuf_size;
- sock_test_buf_alloc (&ctrl->cfg, 0 /* is_rxbuf */ ,
- (uint8_t **) & ctrl->txbuf, &ctrl->txbuf_size);
- sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+ vcl_test_buf_alloc (&ctrl->cfg, 0 /* is_rxbuf */ ,
+ (uint8_t **) & ctrl->txbuf, &ctrl->txbuf_size);
+ vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
}
else
- fprintf (stderr, "CLIENT: ERROR: Invalid txbuf size (%lu) < "
- "minimum buf size (%u)!\n",
- txbuf_size, SOCK_TEST_CFG_BUF_SIZE_MIN);
+ vtwrn ("Invalid txbuf size (%lu) < minimum buf size (%u)!",
+ txbuf_size, VCL_TEST_CFG_BUF_SIZE_MIN);
}
static void
cfg_num_writes_set (void)
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
- char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_NUM_WRITES);
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ char *p = ctrl->txbuf + strlen (VCL_TEST_TOKEN_NUM_WRITES);
uint32_t num_writes = strtoul ((const char *) p, NULL, 10);
if (num_writes > 0)
{
ctrl->cfg.num_writes = num_writes;
ctrl->cfg.total_bytes = ctrl->cfg.num_writes * ctrl->cfg.txbuf_size;
- sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+ vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
}
else
{
- fprintf (stderr, "CLIENT: ERROR: invalid num writes: %u\n", num_writes);
+ vtwrn ("invalid num writes: %u", num_writes);
}
}
static void
-cfg_num_test_sockets_set (void)
+cfg_num_test_sessions_set (void)
{
- sock_client_main_t *scm = &sock_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);
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ char *p = ctrl->txbuf + strlen (VCL_TEST_TOKEN_NUM_TEST_SESS);
+ uint32_t num_test_sessions = strtoul ((const char *) p, NULL, 10);
- if ((num_test_sockets > 0) &&
- (num_test_sockets <= SOCK_TEST_CFG_MAX_TEST_SCKTS))
+ if ((num_test_sessions > 0) &&
+ (num_test_sessions <= VCL_TEST_CFG_MAX_TEST_SESS))
{
- ctrl->cfg.num_test_sockets = num_test_sockets;
- sock_test_connect_test_sockets (num_test_sockets);
-
- sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+ ctrl->cfg.num_test_sessions = num_test_sessions;
+ vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
}
else
{
- fprintf (stderr, "CLIENT: ERROR: invalid num test sockets: "
- "%u, (%d max)\n",
- num_test_sockets, SOCK_TEST_CFG_MAX_TEST_SCKTS);
+ vtwrn ("invalid num test sessions: %u, (%d max)",
+ num_test_sessions, VCL_TEST_CFG_MAX_TEST_SESS);
}
}
static void
cfg_rxbuf_size_set (void)
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
- char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_RXBUF_SIZE);
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ char *p = ctrl->txbuf + strlen (VCL_TEST_TOKEN_RXBUF_SIZE);
uint64_t rxbuf_size = strtoull ((const char *) p, NULL, 10);
- if (rxbuf_size >= SOCK_TEST_CFG_BUF_SIZE_MIN)
+ if (rxbuf_size >= VCL_TEST_CFG_BUF_SIZE_MIN)
{
ctrl->cfg.rxbuf_size = rxbuf_size;
- sock_test_buf_alloc (&ctrl->cfg, 1 /* is_rxbuf */ ,
- (uint8_t **) & ctrl->rxbuf, &ctrl->rxbuf_size);
- sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+ vcl_test_buf_alloc (&ctrl->cfg, 1 /* is_rxbuf */ ,
+ (uint8_t **) & ctrl->rxbuf, &ctrl->rxbuf_size);
+ vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
}
else
- fprintf (stderr, "CLIENT: ERROR: Invalid rxbuf size (%lu) < "
- "minimum buf size (%u)!\n",
- rxbuf_size, SOCK_TEST_CFG_BUF_SIZE_MIN);
+ vtwrn ("Invalid rxbuf size (%lu) < minimum buf size (%u)!",
+ rxbuf_size, VCL_TEST_CFG_BUF_SIZE_MIN);
}
static void
cfg_verbose_toggle (void)
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
ctrl->cfg.verbose = ctrl->cfg.verbose ? 0 : 1;
- sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+ vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
}
-static sock_test_t
+static vcl_test_t
parse_input ()
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
- sock_test_t rv = SOCK_TEST_TYPE_NONE;
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ vcl_test_t rv = VCL_TEST_TYPE_NONE;
- if (!strncmp (SOCK_TEST_TOKEN_EXIT, ctrl->txbuf,
- strlen (SOCK_TEST_TOKEN_EXIT)))
- rv = SOCK_TEST_TYPE_EXIT;
+ if (!strncmp (VCL_TEST_TOKEN_EXIT, ctrl->txbuf,
+ strlen (VCL_TEST_TOKEN_EXIT)))
+ rv = VCL_TEST_TYPE_EXIT;
- else if (!strncmp (SOCK_TEST_TOKEN_HELP, ctrl->txbuf,
- strlen (SOCK_TEST_TOKEN_HELP)))
+ else if (!strncmp (VCL_TEST_TOKEN_HELP, ctrl->txbuf,
+ strlen (VCL_TEST_TOKEN_HELP)))
dump_help ();
- else if (!strncmp (SOCK_TEST_TOKEN_SHOW_CFG, ctrl->txbuf,
- strlen (SOCK_TEST_TOKEN_SHOW_CFG)))
- scm->dump_cfg = 1;
+ else if (!strncmp (VCL_TEST_TOKEN_SHOW_CFG, ctrl->txbuf,
+ strlen (VCL_TEST_TOKEN_SHOW_CFG)))
+ vcm->dump_cfg = 1;
- else if (!strncmp (SOCK_TEST_TOKEN_VERBOSE, ctrl->txbuf,
- strlen (SOCK_TEST_TOKEN_VERBOSE)))
+ else if (!strncmp (VCL_TEST_TOKEN_VERBOSE, ctrl->txbuf,
+ strlen (VCL_TEST_TOKEN_VERBOSE)))
cfg_verbose_toggle ();
- else if (!strncmp (SOCK_TEST_TOKEN_TXBUF_SIZE, ctrl->txbuf,
- strlen (SOCK_TEST_TOKEN_TXBUF_SIZE)))
+ else if (!strncmp (VCL_TEST_TOKEN_TXBUF_SIZE, ctrl->txbuf,
+ strlen (VCL_TEST_TOKEN_TXBUF_SIZE)))
cfg_txbuf_size_set ();
- else if (!strncmp (SOCK_TEST_TOKEN_NUM_TEST_SCKTS, ctrl->txbuf,
- strlen (SOCK_TEST_TOKEN_NUM_TEST_SCKTS)))
- cfg_num_test_sockets_set ();
+ else if (!strncmp (VCL_TEST_TOKEN_NUM_TEST_SESS, ctrl->txbuf,
+ strlen (VCL_TEST_TOKEN_NUM_TEST_SESS)))
+ cfg_num_test_sessions_set ();
- else if (!strncmp (SOCK_TEST_TOKEN_NUM_WRITES, ctrl->txbuf,
- strlen (SOCK_TEST_TOKEN_NUM_WRITES)))
+ else if (!strncmp (VCL_TEST_TOKEN_NUM_WRITES, ctrl->txbuf,
+ strlen (VCL_TEST_TOKEN_NUM_WRITES)))
cfg_num_writes_set ();
- else if (!strncmp (SOCK_TEST_TOKEN_RXBUF_SIZE, ctrl->txbuf,
- strlen (SOCK_TEST_TOKEN_RXBUF_SIZE)))
+ else if (!strncmp (VCL_TEST_TOKEN_RXBUF_SIZE, ctrl->txbuf,
+ strlen (VCL_TEST_TOKEN_RXBUF_SIZE)))
cfg_rxbuf_size_set ();
- else if (!strncmp (SOCK_TEST_TOKEN_RUN_UNI, ctrl->txbuf,
- strlen (SOCK_TEST_TOKEN_RUN_UNI)))
- rv = ctrl->cfg.test = SOCK_TEST_TYPE_UNI;
+ else if (!strncmp (VCL_TEST_TOKEN_RUN_UNI, ctrl->txbuf,
+ strlen (VCL_TEST_TOKEN_RUN_UNI)))
+ rv = ctrl->cfg.test = VCL_TEST_TYPE_UNI;
- else if (!strncmp (SOCK_TEST_TOKEN_RUN_BI, ctrl->txbuf,
- strlen (SOCK_TEST_TOKEN_RUN_BI)))
- rv = ctrl->cfg.test = SOCK_TEST_TYPE_BI;
+ else if (!strncmp (VCL_TEST_TOKEN_RUN_BI, ctrl->txbuf,
+ strlen (VCL_TEST_TOKEN_RUN_BI)))
+ rv = ctrl->cfg.test = VCL_TEST_TYPE_BI;
else
- rv = SOCK_TEST_TYPE_ECHO;
+ rv = VCL_TEST_TYPE_ECHO;
return rv;
}
print_usage_and_exit (void)
{
fprintf (stderr,
- "
sock_test_client [OPTIONS] <ipaddr> <port>\n"
+ "
vcl_test_client [OPTIONS] <ipaddr> <port>\n"
" OPTIONS\n"
" -h Print this message and exit.\n"
" -6 Use IPv6\n"
exit (1);
}
-int
-main (int argc, char **argv)
+static void
+vtc_process_opts (vcl_test_client_main_t * vcm, int argc, char **argv)
{
- sock_client_main_t *scm = &sock_client_main;
- sock_test_socket_t *ctrl = &scm->ctrl_socket;
- int c, rv, errno_val;
- sock_test_t post_test = SOCK_TEST_TYPE_NONE;
-
- sock_test_cfg_init (&ctrl->cfg);
- sock_test_socket_buf_alloc (ctrl);
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ int c, v;
opterr = 0;
while ((c = getopt (argc, argv, "chn:w:XE:I:N:R:T:UBV6D")) != -1)
switch (c)
{
case 'c':
- scm->dump_cfg = 1;
+ vcm->dump_cfg = 1;
break;
case 's':
- if (sscanf (optarg, "0x%x", &ctrl->cfg.num_test_sockets) != 1)
- if (sscanf (optarg, "%u", &ctrl->cfg.num_test_sockets) != 1)
+ if (sscanf (optarg, "0x%x", &ctrl->cfg.num_test_sessions) != 1)
+ if (sscanf (optarg, "%u", &ctrl->cfg.num_test_sessions) != 1)
{
- fprintf (stderr, "CLIENT: ERROR: Invalid value for "
- "option -%c!\n", c);
+ vtwrn ("Invalid value for option -%c!", c);
print_usage_and_exit ();
}
- if (!ctrl->cfg.num_test_sockets ||
- (ctrl->cfg.num_test_sockets > FD_SETSIZE))
+ if (!ctrl->cfg.num_test_sessions ||
+ (ctrl->cfg.num_test_sessions > FD_SETSIZE))
{
- fprintf (stderr, "CLIENT: ERROR: Invalid number of "
- "sockets (%d) specified for option -%c!\n"
- " Valid range is 1 - %d\n",
- ctrl->cfg.num_test_sockets, c, FD_SETSIZE);
+ vtwrn ("Invalid number of sessions (%d) specified for option -%c!"
+ "\n Valid range is 1 - %d",
+ ctrl->cfg.num_test_sessions, c, FD_SETSIZE);
print_usage_and_exit ();
}
break;
case 'w':
- fprintf (stderr, "CLIENT: Writing test results to files is TBD.\n");
+ if (sscanf (optarg, "%d", &v) != 1)
+ {
+ vtwrn ("Invalid value for option -%c!", c);
+ print_usage_and_exit ();
+ }
+ if (v > 1)
+ vcm->n_workers = v;
break;
case 'X':
- post_test = SOCK_TEST_TYPE_EXIT;
+ vcm->post_test = VCL_TEST_TYPE_EXIT;
break;
case 'E':
if (strlen (optarg) > ctrl->txbuf_size)
{
- fprintf (stderr, "CLIENT: ERROR: Option -%c value "
- "larger than txbuf size (%d)!\n",
- optopt, ctrl->txbuf_size);
+ vtwrn ("Option -%c value larger than txbuf size (%d)!",
+ optopt, ctrl->txbuf_size);
print_usage_and_exit ();
}
strcpy (ctrl->txbuf, optarg);
- ctrl->cfg.test = SOCK_TEST_TYPE_ECHO;
+ ctrl->cfg.test = VCL_TEST_TYPE_ECHO;
break;
case 'I':
- if (sscanf (optarg, "0x%x", &ctrl->cfg.num_test_sockets) != 1)
- if (sscanf (optarg, "%d", &ctrl->cfg.num_test_sockets) != 1)
+ if (sscanf (optarg, "0x%x", &ctrl->cfg.num_test_sessions) != 1)
+ if (sscanf (optarg, "%d", &ctrl->cfg.num_test_sessions) != 1)
{
- fprintf (stderr, "CLIENT: ERROR: Invalid value for "
- "option -%c!\n", c);
+ vtwrn ("Invalid value for option -%c!", c);
print_usage_and_exit ();
}
- if (ctrl->cfg.num_test_sockets > SOCK_TEST_CFG_MAX_TEST_SCKTS)
+ if (ctrl->cfg.num_test_sessions > VCL_TEST_CFG_MAX_TEST_SESS)
{
- fprintf (stderr, "CLIENT: ERROR: value greater than max "
- "number test sockets (%d)!",
- SOCK_TEST_CFG_MAX_TEST_SCKTS);
+ vtwrn ("value greater than max number test sessions (%d)!",
+ VCL_TEST_CFG_MAX_TEST_SESS);
print_usage_and_exit ();
}
break;
if (sscanf (optarg, "0x%lx", &ctrl->cfg.num_writes) != 1)
if (sscanf (optarg, "%ld", &ctrl->cfg.num_writes) != 1)
{
- fprintf (stderr, "CLIENT: ERROR: Invalid value for "
- "option -%c!\n", c);
+ vtwrn ("Invalid value for option -%c!", c);
print_usage_and_exit ();
}
ctrl->cfg.total_bytes = ctrl->cfg.num_writes * ctrl->cfg.txbuf_size;
if (sscanf (optarg, "0x%lx", &ctrl->cfg.rxbuf_size) != 1)
if (sscanf (optarg, "%ld", &ctrl->cfg.rxbuf_size) != 1)
{
- fprintf (stderr, "CLIENT: ERROR: Invalid value for "
- "option -%c!\n", c);
+ vtwrn ("Invalid value for option -%c!", c);
print_usage_and_exit ();
}
- if (ctrl->cfg.rxbuf_size >= SOCK_TEST_CFG_BUF_SIZE_MIN)
+ if (ctrl->cfg.rxbuf_size >= VCL_TEST_CFG_BUF_SIZE_MIN)
{
ctrl->rxbuf_size = ctrl->cfg.rxbuf_size;
- sock_test_buf_alloc (&ctrl->cfg, 1 /* is_rxbuf */ ,
- (uint8_t **) & ctrl->rxbuf,
- &ctrl->rxbuf_size);
+ vcl_test_buf_alloc (&ctrl->cfg, 1 /* is_rxbuf */ ,
+ (uint8_t **) & ctrl->rxbuf,
+ &ctrl->rxbuf_size);
}
else
{
- fprintf (stderr, "CLIENT: ERROR: rxbuf size (%lu) "
- "less than minumum (%u)\n",
- ctrl->cfg.rxbuf_size, SOCK_TEST_CFG_BUF_SIZE_MIN);
+ vtwrn ("rxbuf size (%lu) less than minumum (%u)",
+ ctrl->cfg.rxbuf_size, VCL_TEST_CFG_BUF_SIZE_MIN);
print_usage_and_exit ();
}
if (sscanf (optarg, "0x%lx", &ctrl->cfg.txbuf_size) != 1)
if (sscanf (optarg, "%ld", &ctrl->cfg.txbuf_size) != 1)
{
- fprintf (stderr, "CLIENT: ERROR: Invalid value "
- "for option -%c!\n", c);
+ vtwrn ("Invalid value for option -%c!", c);
print_usage_and_exit ();
}
- if (ctrl->cfg.txbuf_size >= SOCK_TEST_CFG_BUF_SIZE_MIN)
+ if (ctrl->cfg.txbuf_size >= VCL_TEST_CFG_BUF_SIZE_MIN)
{
ctrl->txbuf_size = ctrl->cfg.txbuf_size;
- sock_test_buf_alloc (&ctrl->cfg, 0 /* is_rxbuf */ ,
- (uint8_t **) & ctrl->txbuf,
- &ctrl->txbuf_size);
+ vcl_test_buf_alloc (&ctrl->cfg, 0 /* is_rxbuf */ ,
+ (uint8_t **) & ctrl->txbuf,
+ &ctrl->txbuf_size);
ctrl->cfg.total_bytes =
ctrl->cfg.num_writes * ctrl->cfg.txbuf_size;
}
else
{
- fprintf (stderr, "CLIENT: ERROR: txbuf size (%lu) "
- "less than minumum (%u)!\n",
- ctrl->cfg.txbuf_size, SOCK_TEST_CFG_BUF_SIZE_MIN);
+ vtwrn ("txbuf size (%lu) less than minumum (%u)!",
+ ctrl->cfg.txbuf_size, VCL_TEST_CFG_BUF_SIZE_MIN);
print_usage_and_exit ();
}
break;
case 'U':
- ctrl->cfg.test = SOCK_TEST_TYPE_UNI;
+ ctrl->cfg.test = VCL_TEST_TYPE_UNI;
break;
case 'B':
- ctrl->cfg.test = SOCK_TEST_TYPE_BI;
+ ctrl->cfg.test = VCL_TEST_TYPE_BI;
break;
case 'V':
case 'R':
case 'T':
case 'w':
- fprintf (stderr, "CLIENT: ERROR: Option -%c "
- "requires an argument.\n", optopt);
+ vtwrn ("Option -%c requires an argument.", optopt);
break;
default:
if (isprint (optopt))
- fprintf (stderr, "CLIENT: ERROR: Unknown "
- "option `-%c'.\n", optopt);
+ vtwrn ("Unknown option `-%c'.", optopt);
else
- fprintf (stderr, "CLIENT: ERROR: Unknown "
- "option character `\\x%x'.\n", optopt);
+ vtwrn ("Unknown option character `\\x%x'.", optopt);
}
/* fall thru */
case 'h':
if (argc < (optind + 2))
{
- fprintf (stderr, "CLIENT: ERROR: Insufficient number of arguments!\n");
+ vtwrn ("Insufficient number of arguments!");
print_usage_and_exit ();
}
+ vcm->proto = ctrl->cfg.transport_udp ? VPPCOM_PROTO_UDP : VPPCOM_PROTO_TCP;
- ctrl->fd = vppcom_app_create ("vcl_test_client");
- if (ctrl->fd < 0)
+ memset (&vcm->server_addr, 0, sizeof (vcm->server_addr));
+ if (ctrl->cfg.address_ip6)
{
- errno = -ctrl->fd;
- ctrl->fd = -1;
+ struct sockaddr_in6 *sddr6 = (struct sockaddr_in6 *) &vcm->server_addr;
+ sddr6->sin6_family = AF_INET6;
+ inet_pton (AF_INET6, argv[optind++], &(sddr6->sin6_addr));
+ sddr6->sin6_port = htons (atoi (argv[optind]));
+
+ vcm->server_endpt.is_ip4 = 0;
+ vcm->server_endpt.ip = (uint8_t *) & sddr6->sin6_addr;
+ vcm->server_endpt.port = (uint16_t) sddr6->sin6_port;
}
else
{
- ctrl->fd = vppcom_session_create (ctrl->cfg.transport_udp ?
- VPPCOM_PROTO_UDP :
- VPPCOM_PROTO_TCP,
- 0 /* is_nonblocking */ );
- if (ctrl->fd < 0)
- {
- errno = -ctrl->fd;
- ctrl->fd = -1;
- }
+ struct sockaddr_in *saddr4 = (struct sockaddr_in *) &vcm->server_addr;
+ saddr4->sin_family = AF_INET;
+ inet_pton (AF_INET, argv[optind++], &(saddr4->sin_addr));
+ saddr4->sin_port = htons (atoi (argv[optind]));
+
+ vcm->server_endpt.is_ip4 = 1;
+ vcm->server_endpt.ip = (uint8_t *) & saddr4->sin_addr;
+ vcm->server_endpt.port = (uint16_t) saddr4->sin_port;
}
+}
- if (ctrl->fd < 0)
- {
- errno_val = errno;
- perror ("ERROR in main()");
- fprintf (stderr, "CLIENT: ERROR: socket "
- "failed (errno = %d)!\n", errno_val);
- return ctrl->fd;
- }
+static void
+vtc_read_user_input (vcl_test_session_t * ctrl)
+{
+ printf ("\nType some characters and hit <return>\n"
+ "('" VCL_TEST_TOKEN_HELP "' for help): ");
- memset (&scm->server_addr, 0, sizeof (scm->server_addr));
- if (ctrl->cfg.address_ip6)
- {
- struct sockaddr_in6 *server_addr =
- (struct sockaddr_in6 *) &scm->server_addr;
- scm->server_addr_size = sizeof (*server_addr);
- server_addr->sin6_family = AF_INET6;
- inet_pton (AF_INET6, argv[optind++], &(server_addr->sin6_addr));
- server_addr->sin6_port = htons (atoi (argv[optind]));
- }
- else
+ if (fgets (ctrl->txbuf, ctrl->txbuf_size, stdin) != NULL)
{
- struct sockaddr_in *server_addr =
- (struct sockaddr_in *) &scm->server_addr;
- scm->server_addr_size = sizeof (*server_addr);
- server_addr->sin_family = AF_INET;
- inet_pton (AF_INET, argv[optind++], &(server_addr->sin_addr));
- server_addr->sin_port = htons (atoi (argv[optind]));
- }
+ if (strlen (ctrl->txbuf) == 1)
+ {
+ printf ("\nNothing to send! Please try again...\n");
+ return;
+ }
+ ctrl->txbuf[strlen (ctrl->txbuf) - 1] = 0; // chomp the newline.
- if (ctrl->cfg.address_ip6)
- {
- struct sockaddr_in6 *server_addr =
- (struct sockaddr_in6 *) &scm->server_addr;
- scm->server_endpt.is_ip4 = 0;
- scm->server_endpt.ip = (uint8_t *) & server_addr->sin6_addr;
- scm->server_endpt.port = (uint16_t) server_addr->sin6_port;
+ /* Parse input for keywords */
+ ctrl->cfg.test = parse_input ();
}
- else
+}
+
+static void
+vtc_ctrl_session_exit (void)
+{
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ int verbose = ctrl->cfg.verbose;
+
+ ctrl->cfg.test = VCL_TEST_TYPE_EXIT;
+ if (verbose)
{
- struct sockaddr_in *server_addr =
- (struct sockaddr_in *) &scm->server_addr;
- scm->server_endpt.is_ip4 = 1;
- scm->server_endpt.ip = (uint8_t *) & server_addr->sin_addr;
- scm->server_endpt.port = (uint16_t) server_addr->sin_port;
+ vtinf ("(fd %d): Sending exit cfg to server...", ctrl->fd);
+ vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
}
+ (void) vcl_test_write (ctrl->fd, (uint8_t *) & ctrl->cfg,
+ sizeof (ctrl->cfg), &ctrl->stats, verbose);
+ sleep (1);
+}
- do
- {
- printf ("\nCLIENT: Connecting to server...\n");
+int
+main (int argc, char **argv)
+{
+ vcl_test_client_main_t *vcm = &vcl_client_main;
+ vcl_test_session_t *ctrl = &vcm->ctrl_session;
+ int rv, errno_val;
- rv = vppcom_session_connect (ctrl->fd, &scm->server_endpt);
- if (rv)
- {
- errno = -rv;
- rv = -1;
- }
- if (rv < 0)
- {
- errno_val = errno;
- perror ("ERROR in main()");
- fprintf (stderr, "CLIENT: ERROR: connect failed (errno = %d)!\n",
- errno_val);
- return -1;
- }
+ vcm->n_workers = 1;
+ vcl_test_cfg_init (&ctrl->cfg);
+ vcl_test_session_buf_alloc (ctrl);
+ vtc_process_opts (vcm, argc, argv);
- sock_test_cfg_sync (ctrl);
- printf ("CLIENT (fd %d): Control socket connected.\n", ctrl->fd);
- }
- while (rv < 0);
+ vcm->workers = calloc (vcm->n_workers, sizeof (vcl_test_client_worker_t));
+ rv = vppcom_app_create ("vcl_test_client");
+ if (rv < 0)
+ vtfail ("vppcom_app_create()", rv);
+
+ ctrl->fd = vppcom_session_create (vcm->proto, 0 /* is_nonblocking */ );
+ if (ctrl->fd < 0)
+ vtfail ("vppcom_session_create()", ctrl->fd);
+
+ vtinf ("Connecting to server...");
+ rv = vppcom_session_connect (ctrl->fd, &vcm->server_endpt);
+ if (rv)
+ vtfail ("vppcom_session_connect()", rv);
+ vtinf ("Control session (fd %d) connected.", ctrl->fd);
- sock_test_connect_test_sockets (ctrl->cfg.num_test_sockets);
+ rv = vtc_cfg_sync (ctrl);
+ if (rv)
+ vtfail ("vtc_cfg_sync()", rv);
- while (ctrl->cfg.test != SOCK_TEST_TYPE_EXIT)
+ ctrl->cfg.ctrl_handle = ((vcl_test_cfg_t *) ctrl->rxbuf)->ctrl_handle;
+ memset (&ctrl->stats, 0, sizeof (ctrl->stats));
+
+ while (ctrl->cfg.test != VCL_TEST_TYPE_EXIT)
{
- if (scm->dump_cfg)
+ if (vcm->dump_cfg)
{
- sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
- scm->dump_cfg = 0;
+ vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ );
+ vcm->dump_cfg = 0;
}
switch (ctrl->cfg.test)
{
- case SOCK_TEST_TYPE_ECHO:
- echo_test_client ();
+ case VCL_TEST_TYPE_ECHO:
+ vtc_echo_client (vcm);
break;
- case SOCK_TEST_TYPE_UNI:
- case SOCK_TEST_TYPE_BI:
- stream_test_client (ctrl->cfg.test);
+ case VCL_TEST_TYPE_UNI:
+ case VCL_TEST_TYPE_BI:
+ vtc_stream_client (vcm);
break;
- case SOCK_TEST_TYPE_EXIT:
+ case VCL_TEST_TYPE_EXIT:
continue;
- case SOCK_TEST_TYPE_NONE:
+ case VCL_TEST_TYPE_NONE:
default:
break;
}
- switch (post_test)
+ switch (vcm->post_test)
{
- case SOCK_TEST_TYPE_EXIT:
+ case VCL_TEST_TYPE_EXIT:
switch (ctrl->cfg.test)
{
- case SOCK_TEST_TYPE_EXIT:
- case SOCK_TEST_TYPE_UNI:
- case SOCK_TEST_TYPE_BI:
- case SOCK_TEST_TYPE_ECHO:
- ctrl->cfg.test = SOCK_TEST_TYPE_EXIT;
+ case VCL_TEST_TYPE_EXIT:
+ case VCL_TEST_TYPE_UNI:
+ case VCL_TEST_TYPE_BI:
+ case VCL_TEST_TYPE_ECHO:
+ ctrl->cfg.test = VCL_TEST_TYPE_EXIT;
continue;
- case SOCK_TEST_TYPE_NONE:
+ case VCL_TEST_TYPE_NONE:
default:
break;
}
break;
- case SOCK_TEST_TYPE_NONE:
- case SOCK_TEST_TYPE_ECHO:
- case SOCK_TEST_TYPE_UNI:
- case SOCK_TEST_TYPE_BI:
+ case VCL_TEST_TYPE_NONE:
+ case VCL_TEST_TYPE_ECHO:
+ case VCL_TEST_TYPE_UNI:
+ case VCL_TEST_TYPE_BI:
default:
break;
}
memset (ctrl->txbuf, 0, ctrl->txbuf_size);
memset (ctrl->rxbuf, 0, ctrl->rxbuf_size);
- printf ("\nCLIENT: Type some characters and hit <return>\n"
- "('" SOCK_TEST_TOKEN_HELP "' for help): ");
-
- if (fgets (ctrl->txbuf, ctrl->txbuf_size, stdin) != NULL)
- {
- if (strlen (ctrl->txbuf) == 1)
- {
- printf ("\nCLIENT: Nothing to send! Please try again...\n");
- continue;
- }
- ctrl->txbuf[strlen (ctrl->txbuf) - 1] = 0; // chomp the newline.
-
- /* Parse input for keywords */
- ctrl->cfg.test = parse_input ();
- }
+ vtc_read_user_input (ctrl);
}
- exit_client ();
+ vtc_ctrl_session_exit ();
vppcom_session_close (ctrl->fd);
vppcom_app_destroy ();
+ free (vcm->workers);
return 0;
}
Code Review / vpp.git / blobdiff