summaryrefslogtreecommitdiffstats
path: root/src/plugins/hs_apps/echo_client.h
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2022-03-29 14:47:29 -0700
committerFlorin Coras <fcoras@cisco.com>2022-03-29 16:58:36 -0700
commit591efc2f573baed38d79a0b9937ca4ff50732c1b (patch)
tree7f39ffa3ef9aa195db416773192f919631fe3335 /src/plugins/hs_apps/echo_client.h
parent8f63d38e993e74a4d811438aca9f6c8e69dea479 (diff)
hsa: refactor echo clients
Type: refactor Signed-off-by: Florin Coras <fcoras@cisco.com> Change-Id: I30cc31c438d357d48576fba84e54809455960eaa
Diffstat (limited to 'src/plugins/hs_apps/echo_client.h')
-rw-r--r--src/plugins/hs_apps/echo_client.h61
1 files changed, 30 insertions, 31 deletions
diff --git a/src/plugins/hs_apps/echo_client.h b/src/plugins/hs_apps/echo_client.h
index a0e844d7e6d..b5f6c981f7b 100644
--- a/src/plugins/hs_apps/echo_client.h
+++ b/src/plugins/hs_apps/echo_client.h
@@ -18,42 +18,39 @@
#ifndef __included_echo_client_h__
#define __included_echo_client_h__
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
#include <vnet/session/session.h>
#include <vnet/session/application_interface.h>
-typedef struct
+typedef struct ec_session_
{
CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
app_session_t data;
+ u32 vpp_session_index;
+ u32 thread_index;
u64 bytes_to_send;
u64 bytes_sent;
u64 bytes_to_receive;
u64 bytes_received;
u64 vpp_session_handle;
- u8 thread_index;
-} eclient_session_t;
+} ec_session_t;
+
+typedef struct ec_worker_
+{
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+ ec_session_t *sessions; /**< session pool */
+ u8 *rx_buf; /**< prealloced rx buffer */
+ u32 *conn_indices; /**< sessions handled by worker */
+ u32 *conns_this_batch; /**< sessions handled in batch */
+ svm_msg_q_t *vpp_event_queue; /**< session layer worker mq */
+ u32 thread_index; /**< thread index for worker */
+} ec_worker_t;
typedef struct
{
- /*
- * Test state variables
- */
- eclient_session_t *sessions; /**< Session pool, shared */
- clib_spinlock_t sessions_lock; /**< Session pool lock */
- u8 **rx_buf; /**< intermediate rx buffers */
+ ec_worker_t *wrk; /**< Per-thread state */
u8 *connect_test_data; /**< Pre-computed test data */
- u32 **quic_session_index_by_thread;
- u32 **connection_index_by_thread;
- u32 **connections_this_batch_by_thread; /**< active connection batch */
volatile u32 ready_connections;
- volatile u32 finished_connections;
volatile u64 rx_total;
volatile u64 tx_total;
volatile int run_test; /**< Signal start of test */
@@ -64,16 +61,14 @@ typedef struct
u32 prev_conns;
u32 repeats;
- u32 connect_conn_index; /**< Conencts attempted progress */
+ u32 connect_conn_index; /**< Connects attempted progress */
/*
* Application setup parameters
*/
- svm_msg_q_t **vpp_event_queue;
u32 cli_node_index; /**< cli process node index */
u32 app_index; /**< app index after attach */
- pthread_t client_thread_handle;
/*
* Configuration params
@@ -116,19 +111,23 @@ typedef struct
u8 barrier_acq_needed;
vlib_main_t *vlib_main;
-} echo_client_main_t;
+} ec_main_t;
-enum
+typedef enum ec_state_
{
- ECHO_CLIENTS_STARTING,
- ECHO_CLIENTS_RUNNING,
- ECHO_CLIENTS_EXITING
-} echo_clients_test_state_e;
+ EC_STARTING,
+ EC_RUNNING,
+ EC_EXITING
+} ec_state_t;
-extern echo_client_main_t echo_client_main;
-vlib_node_registration_t echo_clients_node;
+typedef enum ec_cli_signal_
+{
+ EC_CLI_CONNECTS_DONE = 1,
+ EC_CLI_CONNECTS_FAILED,
+ EC_CLI_TEST_DONE
+} ec_cli_signal_t;
-void echo_clients_program_connects (void);
+void ec_program_connects (void);
#endif /* __included_echo_client_h__ */