tcp: add builtin server/client transfer test

[vpp.git] / src / vnet / tcp / builtin_client.h

diff --git a/src/vnet/tcp/builtin_client.h b/src/vnet/tcp/builtin_client.h
index 3462e0e..a214ae1 100644 (file)
--- a/src/vnet/tcp/builtin_client.h
+++ b/src/vnet/tcp/builtin_client.h
@@ -48,8 +48,7 @@ typedef struct
    * Application setup parameters
    */
   unix_shared_memory_queue_t *vl_input_queue;  /**< vpe input queue */
-  unix_shared_memory_queue_t *our_event_queue; /**< Our event queue */
-  unix_shared_memory_queue_t *vpp_event_queue; /**< $$$ single thread */
+  unix_shared_memory_queue_t **vpp_event_queue;
 
   u32 cli_node_index;                  /**< cli process node index */
   u32 my_client_index;                 /**< loopback API client handle */
@@ -63,15 +62,19 @@ typedef struct
   u32 configured_segment_size;
   u32 fifo_size;
   u32 expected_connections;            /**< Number of clients/connections */
+  u32 connections_per_batch;           /**< Connections to rx/tx at once */
+  u32 private_segment_count;           /**< Number of private fifo segs */
+  u32 private_segment_size;            /**< size of private fifo segs */
 
   /*
    * Test state variables
    */
-  session_t *sessions;                 /**< Sessions pool */
-  u8 *rx_buf;                          /**< intermediate rx buffer */
-  uword *session_index_by_vpp_handles; /**< Hash table for disconnecting */
+  session_t *sessions;                 /**< Session pool, shared */
+  clib_spinlock_t sessions_lock;
+  u8 **rx_buf;                         /**< intermediate rx buffers */
   u8 *connect_test_data;               /**< Pre-computed test data */
   u32 **connection_index_by_thread;
+  u32 **connections_this_batch_by_thread; /**< active connection batch */
   pthread_t client_thread_handle;
 
   volatile u32 ready_connections;
@@ -82,7 +85,8 @@ typedef struct
 
   f64 test_start_time;
   f64 test_end_time;
-
+  u32 prev_conns;
+  u32 repeats;
   /*
    * Flags
    */
@@ -93,6 +97,9 @@ typedef struct
   int i_am_master;
   int drop_packets;            /**< drop all packets */
   u8 prealloc_fifos;           /**< Request fifo preallocation */
+  u8 no_output;
+  u8 test_bytes;
+  u8 test_failed;
 
   /*
    * Convenience
@@ -102,7 +109,7 @@ typedef struct
   ethernet_main_t *ethernet_main;
 } tclient_main_t;
 
-tclient_main_t tclient_main;
+extern tclient_main_t tclient_main;
 
 vlib_node_registration_t tclient_node;