Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vcl: refactor debugging
[vpp.git]
/
src
/
vnet
/
session-apps
/
echo_client.c
diff --git
a/src/vnet/session-apps/echo_client.c
b/src/vnet/session-apps/echo_client.c
index
3c1904c
..
6ee91f9
100644
(file)
--- a/
src/vnet/session-apps/echo_client.c
+++ b/
src/vnet/session-apps/echo_client.c
@@
-43,7
+43,7
@@
signal_evt_to_cli (int code)
}
static void
}
static void
-send_data_chunk (echo_client_main_t * ecm, session_t * s)
+send_data_chunk (echo_client_main_t * ecm,
eclient_
session_t * s)
{
u8 *test_data = ecm->connect_test_data;
int test_buf_len, test_buf_offset, rv;
{
u8 *test_data = ecm->connect_test_data;
int test_buf_len, test_buf_offset, rv;
@@
-140,7
+140,7
@@
send_data_chunk (echo_client_main_t * ecm, session_t * s)
}
static void
}
static void
-receive_data_chunk (echo_client_main_t * ecm, session_t * s)
+receive_data_chunk (echo_client_main_t * ecm,
eclient_
session_t * s)
{
svm_fifo_t *rx_fifo = s->data.rx_fifo;
u32 thread_index = vlib_get_thread_index ();
{
svm_fifo_t *rx_fifo = s->data.rx_fifo;
u32 thread_index = vlib_get_thread_index ();
@@
-207,7
+207,7
@@
echo_client_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
{
echo_client_main_t *ecm = &echo_client_main;
int my_thread_index = vlib_get_thread_index ();
{
echo_client_main_t *ecm = &echo_client_main;
int my_thread_index = vlib_get_thread_index ();
- session_t *sp;
+
eclient_
session_t *sp;
int i;
int delete_session;
u32 *connection_indices;
int i;
int delete_session;
u32 *connection_indices;
@@
-367,9
+367,9
@@
echo_clients_session_connected_callback (u32 app_index, u32 api_context,
stream_session_t * s, u8 is_fail)
{
echo_client_main_t *ecm = &echo_client_main;
stream_session_t * s, u8 is_fail)
{
echo_client_main_t *ecm = &echo_client_main;
- session_t *session;
+
eclient_
session_t *session;
u32 session_index;
u32 session_index;
- u8 thread_index =
vlib_get_thread_index ()
;
+ u8 thread_index =
s->thread_index
;
if (is_fail)
{
if (is_fail)
{
@@
-378,7
+378,8
@@
echo_clients_session_connected_callback (u32 app_index, u32 api_context,
return 0;
}
return 0;
}
- ASSERT (s->thread_index == thread_index);
+ ASSERT (thread_index == vlib_get_thread_index ()
+ || session_transport_service_type (s) == TRANSPORT_SERVICE_CL);
if (!ecm->vpp_event_queue[thread_index])
ecm->vpp_event_queue[thread_index] =
if (!ecm->vpp_event_queue[thread_index])
ecm->vpp_event_queue[thread_index] =
@@
-453,7
+454,7
@@
static int
echo_clients_rx_callback (stream_session_t * s)
{
echo_client_main_t *ecm = &echo_client_main;
echo_clients_rx_callback (stream_session_t * s)
{
echo_client_main_t *ecm = &echo_client_main;
- session_t *sp;
+
eclient_
session_t *sp;
sp = pool_elt_at_index (ecm->sessions,
s->server_rx_fifo->client_session_index);
sp = pool_elt_at_index (ecm->sessions,
s->server_rx_fifo->client_session_index);
@@
-757,13
+758,7
@@
echo_clients_command_fn (vlib_main_t * vm,
VLIB_NODE_STATE_POLLING);
if (preallocate_sessions)
VLIB_NODE_STATE_POLLING);
if (preallocate_sessions)
- {
- session_t *sp __attribute__ ((unused));
- for (i = 0; i < n_clients; i++)
- pool_get (ecm->sessions, sp);
- for (i = 0; i < n_clients; i++)
- pool_put_index (ecm->sessions, i);
- }
+ pool_init_fixed (ecm->sessions, 1.1 * n_clients);
/* Fire off connect requests */
time_before_connects = vlib_time_now (vm);
/* Fire off connect requests */
time_before_connects = vlib_time_now (vm);