#include <vnet/session/session.h>
#include <vnet/session/session_rules_table.h>
#include <vnet/tcp/tcp.h>
+#include <sys/epoll.h>
#define SESSION_TEST_I(_cond, _comment, _args...) \
({ \
} \
}
+#define ST_DBG(_comment, _args...) \
+ fformat(stderr, _comment "\n", ##_args); \
+
void
-dummy_session_reset_callback (session_t * s)
+placeholder_session_reset_callback (session_t * s)
{
clib_warning ("called...");
}
volatile u32 connected_session_index = ~0;
volatile u32 connected_session_thread = ~0;
int
-dummy_session_connected_callback (u32 app_index, u32 api_context,
- session_t * s, u8 is_fail)
+placeholder_session_connected_callback (u32 app_index, u32 api_context,
+ session_t * s, session_error_t err)
{
if (s)
{
return 0;
}
-static u32 dummy_segment_count;
+static u32 placeholder_segment_count;
int
-dummy_add_segment_callback (u32 client_index, u64 segment_handle)
+placeholder_add_segment_callback (u32 client_index, u64 segment_handle)
{
- dummy_segment_count = 1;
+ placeholder_segment_count = 1;
return 0;
}
int
-dummy_del_segment_callback (u32 client_index, u64 segment_handle)
+placeholder_del_segment_callback (u32 client_index, u64 segment_handle)
{
- dummy_segment_count = 0;
+ placeholder_segment_count = 0;
return 0;
}
void
-dummy_session_disconnect_callback (session_t * s)
+placeholder_session_disconnect_callback (session_t * s)
{
clib_warning ("called...");
}
-static u32 dummy_accept;
+static u32 placeholder_accept;
volatile u32 accepted_session_index;
volatile u32 accepted_session_thread;
int
-dummy_session_accept_callback (session_t * s)
+placeholder_session_accept_callback (session_t * s)
{
- dummy_accept = 1;
+ placeholder_accept = 1;
accepted_session_index = s->session_index;
accepted_session_thread = s->thread_index;
s->session_state = SESSION_STATE_READY;
}
int
-dummy_server_rx_callback (session_t * s)
+placeholder_server_rx_callback (session_t * s)
{
clib_warning ("called...");
return -1;
}
/* *INDENT-OFF* */
-static session_cb_vft_t dummy_session_cbs = {
- .session_reset_callback = dummy_session_reset_callback,
- .session_connected_callback = dummy_session_connected_callback,
- .session_accept_callback = dummy_session_accept_callback,
- .session_disconnect_callback = dummy_session_disconnect_callback,
- .builtin_app_rx_callback = dummy_server_rx_callback,
- .add_segment_callback = dummy_add_segment_callback,
- .del_segment_callback = dummy_del_segment_callback,
+static session_cb_vft_t placeholder_session_cbs = {
+ .session_reset_callback = placeholder_session_reset_callback,
+ .session_connected_callback = placeholder_session_connected_callback,
+ .session_accept_callback = placeholder_session_accept_callback,
+ .session_disconnect_callback = placeholder_session_disconnect_callback,
+ .builtin_app_rx_callback = placeholder_server_rx_callback,
+ .add_segment_callback = placeholder_add_segment_callback,
+ .del_segment_callback = placeholder_del_segment_callback,
};
/* *INDENT-ON* */
{
/* fails spectacularly */
/* vnet_delete_loopback_interface (sw_if_index); */
+
+ vnet_sw_interface_set_flags (vnet_get_main (), sw_if_index, 0);
}
static int
session_test_basic (vlib_main_t * vm, unformat_input_t * input)
{
- session_endpoint_t server_sep = SESSION_ENDPOINT_NULL;
+ session_endpoint_cfg_t server_sep = SESSION_ENDPOINT_CFG_NULL;
u64 options[APP_OPTIONS_N_OPTIONS], bind4_handle, bind6_handle;
- clib_error_t *error = 0;
u32 server_index;
+ int error = 0;
clib_memset (options, 0, sizeof (options));
options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN;
.api_client_index = ~0,
.options = options,
.namespace_id = 0,
- .session_cb_vft = &dummy_session_cbs,
+ .session_cb_vft = &placeholder_session_cbs,
.name = format (0, "session_test"),
};
server_sep.is_ip4 = 1;
vnet_listen_args_t bind_args = {
- .sep = server_sep,
+ .sep_ext = server_sep,
.app_index = 0,
+ .wrk_map_index = 0,
};
bind_args.app_index = server_index;
error = vnet_listen (&bind_args);
SESSION_TEST ((error != 0), "double server bind6 should not work");
- vnet_unbind_args_t unbind_args = {
+ vnet_unlisten_args_t unbind_args = {
.handle = bind4_handle,
.app_index = server_index,
};
{
session_endpoint_cfg_t client_sep = SESSION_ENDPOINT_CFG_NULL;
u32 server_index, client_index, sw_if_index[2], tries = 0;
- u64 options[APP_OPTIONS_N_OPTIONS], dummy_secret = 1234;
- u16 dummy_server_port = 1234, dummy_client_port = 5678;
- session_endpoint_t server_sep = SESSION_ENDPOINT_NULL;
+ u64 options[APP_OPTIONS_N_OPTIONS], placeholder_secret = 1234;
+ u16 placeholder_server_port = 1234, placeholder_client_port = 5678;
+ session_endpoint_cfg_t server_sep = SESSION_ENDPOINT_CFG_NULL;
ip4_address_t intf_addr[3];
transport_connection_t *tc;
session_t *s;
- clib_error_t *error;
u8 *appns_id;
+ int error;
/*
* Create the loopbacks
appns_id = format (0, "appns1");
vnet_app_namespace_add_del_args_t ns_args = {
.ns_id = appns_id,
- .secret = dummy_secret,
+ .secret = placeholder_secret,
.sw_if_index = sw_if_index[1],
.ip4_fib_id = 0,
.is_add = 1
};
error = vnet_app_namespace_add_del (&ns_args);
- SESSION_TEST ((error == 0), "app ns insertion should succeed: %d",
- clib_error_get_code (error));
+ SESSION_TEST ((error == 0), "app ns insertion should succeed: %d", error);
/*
* Attach client/server
.api_client_index = ~0,
.options = options,
.namespace_id = 0,
- .session_cb_vft = &dummy_session_cbs,
+ .session_cb_vft = &placeholder_session_cbs,
.name = format (0, "session_test_client"),
};
attach_args.name = format (0, "session_test_server");
attach_args.namespace_id = appns_id;
- attach_args.options[APP_OPTIONS_NAMESPACE_SECRET] = dummy_secret;
+ attach_args.options[APP_OPTIONS_NAMESPACE_SECRET] = placeholder_secret;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "server app attached: %U", format_clib_error,
error);
server_index = attach_args.app_index;
server_sep.is_ip4 = 1;
- server_sep.port = dummy_server_port;
+ server_sep.port = placeholder_server_port;
vnet_listen_args_t bind_args = {
- .sep = server_sep,
+ .sep_ext = server_sep,
.app_index = server_index,
};
error = vnet_listen (&bind_args);
*/
client_sep.is_ip4 = 1;
client_sep.ip.ip4.as_u32 = clib_host_to_net_u32 (0x02020202);
- client_sep.port = dummy_server_port;
+ client_sep.port = placeholder_server_port;
client_sep.peer.is_ip4 = 1;
client_sep.peer.ip.ip4.as_u32 = clib_host_to_net_u32 (0x01010101);
- client_sep.peer.port = dummy_client_port;
+ client_sep.peer.port = placeholder_client_port;
client_sep.transport_proto = TRANSPORT_PROTO_TCP;
vnet_connect_args_t connect_args = {
SESSION_TEST ((error == 0), "connect should work");
/* wait for stuff to happen */
- while ((connected_session_index == ~0
- || vec_len (tcp_main.wrk_ctx[0].pending_acks)) && ++tries < 100)
- vlib_process_suspend (vm, 100e-3);
+ while (connected_session_index == ~0 && ++tries < 100)
+ {
+ vlib_worker_thread_barrier_release (vm);
+ vlib_process_suspend (vm, 100e-3);
+ vlib_worker_thread_barrier_sync (vm);
+ }
+ while (accepted_session_index == ~0 && ++tries < 100)
+ {
+ vlib_worker_thread_barrier_release (vm);
+ vlib_process_suspend (vm, 100e-3);
+ vlib_worker_thread_barrier_sync (vm);
+ }
+
clib_warning ("waited %.1f seconds for connections", tries / 10.0);
SESSION_TEST ((connected_session_index != ~0), "session should exist");
SESSION_TEST ((connected_session_thread != ~0), "thread should exist");
SESSION_TEST ((tc != 0), "transport should exist");
SESSION_TEST ((memcmp (&tc->lcl_ip, &client_sep.peer.ip,
sizeof (tc->lcl_ip)) == 0), "ips should be equal");
- SESSION_TEST ((tc->lcl_port == dummy_client_port), "ports should be equal");
+ SESSION_TEST ((tc->lcl_port == placeholder_client_port),
+ "ports should be equal");
/* These sessions, because of the way they're established are pinned to
* main thread, even when we have workers and we avoid polling main thread,
static int
session_test_namespace (vlib_main_t * vm, unformat_input_t * input)
{
- u64 options[APP_OPTIONS_N_OPTIONS], dummy_secret = 1234;
+ u64 options[APP_OPTIONS_N_OPTIONS], placeholder_secret = 1234, tries;
u32 server_index, server_st_index, server_local_st_index;
- u32 dummy_port = 1234, client_index, server_wrk_index;
- u32 dummy_api_context = 4321, dummy_client_api_index = ~0;
- u32 dummy_server_api_index = ~0, sw_if_index = 0;
+ u32 placeholder_port = 1234, client_index, server_wrk_index;
+ u32 placeholder_api_context = 4321, placeholder_client_api_index = ~0;
+ u32 placeholder_server_api_index = ~0, sw_if_index = 0;
session_endpoint_t server_sep = SESSION_ENDPOINT_NULL;
session_endpoint_t client_sep = SESSION_ENDPOINT_NULL;
session_endpoint_t intf_sep = SESSION_ENDPOINT_NULL;
- clib_error_t *error = 0;
- u8 *ns_id = format (0, "appns1");
+ u8 *ns_id, *server_name, *client_name;
app_namespace_t *app_ns;
application_t *server;
session_t *s;
u64 handle;
- int code;
+ int error = 0;
+
+ ns_id = format (0, "appns1");
+ server_name = format (0, "session_test");
+ client_name = format (0, "session_test_client");
server_sep.is_ip4 = 1;
- server_sep.port = dummy_port;
+ server_sep.port = placeholder_port;
client_sep.is_ip4 = 1;
- client_sep.port = dummy_port;
+ client_sep.port = placeholder_port;
clib_memset (options, 0, sizeof (options));
options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN;
.api_client_index = ~0,
.options = options,
.namespace_id = 0,
- .session_cb_vft = &dummy_session_cbs,
- .name = format (0, "session_test"),
+ .session_cb_vft = &placeholder_session_cbs,
+ .name = server_name,
};
vnet_listen_args_t bind_args = {
};
clib_memcpy (&connect_args.sep, &client_sep, sizeof (client_sep));
- vnet_unbind_args_t unbind_args = {
+ vnet_unlisten_args_t unbind_args = {
.handle = bind_args.handle,
.app_index = 0,
};
intf_sep.ip.ip4 = intf_addr;
intf_sep.is_ip4 = 1;
- intf_sep.port = dummy_port;
+ intf_sep.port = placeholder_port;
/*
* Insert namespace and lookup
vnet_app_namespace_add_del_args_t ns_args = {
.ns_id = ns_id,
- .secret = dummy_secret,
+ .secret = placeholder_secret,
.sw_if_index = APP_NAMESPACE_INVALID_INDEX,
.is_add = 1
};
error = vnet_app_namespace_add_del (&ns_args);
- SESSION_TEST ((error == 0), "app ns insertion should succeed: %d",
- clib_error_get_code (error));
+ SESSION_TEST ((error == 0), "app ns insertion should succeed: %d", error);
app_ns = app_namespace_get_from_id (ns_id);
SESSION_TEST ((app_ns != 0), "should find ns %v status", ns_id);
- SESSION_TEST ((app_ns->ns_secret == dummy_secret), "secret should be %d",
- dummy_secret);
+ SESSION_TEST ((app_ns->ns_secret == placeholder_secret),
+ "secret should be %d", placeholder_secret);
SESSION_TEST ((app_ns->sw_if_index == APP_NAMESPACE_INVALID_INDEX),
"sw_if_index should be invalid");
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE;
- options[APP_OPTIONS_NAMESPACE_SECRET] = dummy_secret - 1;
+ options[APP_OPTIONS_NAMESPACE_SECRET] = placeholder_secret - 1;
attach_args.namespace_id = ns_id;
- attach_args.api_client_index = dummy_server_api_index;
+ attach_args.api_client_index = placeholder_server_api_index;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error != 0), "app attachment should fail");
- code = clib_error_get_code (error);
- SESSION_TEST ((code == VNET_API_ERROR_APP_WRONG_NS_SECRET),
- "code should be wrong ns secret: %d", code);
+ SESSION_TEST ((error == VNET_API_ERROR_APP_WRONG_NS_SECRET),
+ "code should be wrong ns secret: %d", error);
/*
* Attach server with global default scope
options[APP_OPTIONS_FLAGS] &= ~APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE;
options[APP_OPTIONS_NAMESPACE_SECRET] = 0;
attach_args.namespace_id = 0;
- attach_args.api_client_index = dummy_server_api_index;
+ attach_args.api_client_index = placeholder_server_api_index;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "server attachment should work");
server_index = attach_args.app_index;
*/
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE;
- options[APP_OPTIONS_NAMESPACE_SECRET] = dummy_secret;
+ options[APP_OPTIONS_NAMESPACE_SECRET] = placeholder_secret;
attach_args.namespace_id = ns_id;
- attach_args.api_client_index = dummy_server_api_index;
+ attach_args.api_client_index = placeholder_server_api_index;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "server attachment should work");
server_index = attach_args.app_index;
* Try client connect with 1) local scope 2) global scope
*/
options[APP_OPTIONS_FLAGS] &= ~APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
- attach_args.api_client_index = dummy_client_api_index;
+ attach_args.name = client_name;
+ attach_args.api_client_index = placeholder_client_api_index;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "client attachment should work");
client_index = attach_args.app_index;
- connect_args.api_context = dummy_api_context;
+ connect_args.api_context = placeholder_api_context;
connect_args.app_index = client_index;
error = vnet_connect (&connect_args);
SESSION_TEST ((error != 0), "client connect should return error code");
- code = clib_error_get_code (error);
- SESSION_TEST ((code == VNET_API_ERROR_INVALID_VALUE),
+ SESSION_TEST ((error == SESSION_E_INVALID_RMT_IP),
"error code should be invalid value (zero ip)");
- SESSION_TEST ((dummy_segment_count == 0),
+ SESSION_TEST ((placeholder_segment_count == 0),
"shouldn't have received request to map new segment");
connect_args.sep.ip.ip4.as_u8[0] = 127;
error = vnet_connect (&connect_args);
SESSION_TEST ((error == 0), "client connect should not return error code");
- code = clib_error_get_code (error);
- SESSION_TEST ((dummy_segment_count == 1),
+
+ /* wait for accept */
+ if (vlib_num_workers ())
+ {
+ tries = 0;
+ while (!placeholder_accept && ++tries < 100)
+ {
+ vlib_worker_thread_barrier_release (vm);
+ vlib_process_suspend (vm, 100e-3);
+ vlib_worker_thread_barrier_sync (vm);
+ }
+ }
+
+ SESSION_TEST ((placeholder_segment_count == 1),
"should've received request to map new segment");
- SESSION_TEST ((dummy_accept == 1), "should've received accept request");
+ SESSION_TEST ((placeholder_accept == 1),
+ "should've received accept request");
detach_args.app_index = client_index;
vnet_application_detach (&detach_args);
options[APP_OPTIONS_FLAGS] &= ~APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE;
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
- attach_args.api_client_index = dummy_client_api_index;
+ attach_args.api_client_index = placeholder_client_api_index;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "client attachment should work");
error = vnet_connect (&connect_args);
SESSION_TEST ((error != 0), "client connect should return error code");
- code = clib_error_get_code (error);
- SESSION_TEST ((code == VNET_API_ERROR_SESSION_CONNECT),
+ SESSION_TEST ((error == SESSION_E_NOINTF),
"error code should be connect (nothing in local scope)");
detach_args.app_index = client_index;
vnet_application_detach (&detach_args);
options[APP_OPTIONS_FLAGS] &= ~APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE;
- attach_args.api_client_index = dummy_server_api_index;
+ attach_args.api_client_index = placeholder_server_api_index;
+ attach_args.name = server_name;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "app attachment should work");
server_index = attach_args.app_index;
options[APP_OPTIONS_FLAGS] &= ~APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE;
attach_args.namespace_id = 0;
- attach_args.api_client_index = dummy_client_api_index;
+ attach_args.api_client_index = placeholder_client_api_index;
+ attach_args.name = client_name;
vnet_application_attach (&attach_args);
error = vnet_connect (&connect_args);
SESSION_TEST ((error != 0), "client connect should return error code");
- code = clib_error_get_code (error);
- SESSION_TEST ((code == VNET_API_ERROR_SESSION_CONNECT),
- "error code should be connect (not in same ns)");
+ SESSION_TEST ((error == SESSION_E_NOROUTE),
+ "error code should be noroute (not in same ns)");
detach_args.app_index = client_index;
vnet_application_detach (&detach_args);
*/
ns_args.sw_if_index = sw_if_index;
error = vnet_app_namespace_add_del (&ns_args);
- SESSION_TEST ((error == 0), "app ns insertion should succeed: %d",
- clib_error_get_code (error));
+ SESSION_TEST ((error == 0), "app ns insertion should succeed: %d", error);
/*
* Attach server with local and global scope
*/
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE;
- options[APP_OPTIONS_NAMESPACE_SECRET] = dummy_secret;
+ options[APP_OPTIONS_NAMESPACE_SECRET] = placeholder_secret;
attach_args.namespace_id = ns_id;
- attach_args.api_client_index = dummy_server_api_index;
+ attach_args.api_client_index = placeholder_server_api_index;
+ attach_args.name = server_name;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "server attachment should work");
server_index = attach_args.app_index;
/*
* Cleanup
*/
- vec_free (attach_args.name);
+ vec_free (server_name);
+ vec_free (client_name);
vec_free (ns_id);
session_delete_loopback (sw_if_index);
return 0;
u16 lcl_port = 1234, rmt_port = 4321;
u32 action_index = 1, res;
ip4_address_t lcl_lkup, rmt_lkup;
- clib_error_t *error;
- int verbose = 0;
+ int verbose = 0, error;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
u64 options[APP_OPTIONS_N_OPTIONS];
u16 lcl_port = 1234, rmt_port = 4321;
u32 server_index, server_index2;
- u32 dummy_server_api_index = ~0;
+ u32 placeholder_server_api_index = ~0;
transport_connection_t *tc;
- u32 dummy_port = 1111;
- clib_error_t *error = 0;
+ u32 placeholder_port = 1111;
u8 is_filtered = 0, *ns_id = format (0, "appns1");
session_t *listener, *s;
app_namespace_t *default_ns = app_namespace_get_default ();
u32 local_ns_index = default_ns->local_table_index;
- int verbose = 0, rv;
+ int verbose = 0;
app_namespace_t *app_ns;
app_listener_t *al;
+ int error = 0;
u64 handle;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
}
server_sep.is_ip4 = 1;
- server_sep.port = dummy_port;
+ server_sep.port = placeholder_port;
clib_memset (options, 0, sizeof (options));
vnet_app_attach_args_t attach_args = {
.api_client_index = ~0,
.options = options,
.namespace_id = 0,
- .session_cb_vft = &dummy_session_cbs,
+ .session_cb_vft = &placeholder_session_cbs,
.name = format (0, "session_test"),
};
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE;
attach_args.namespace_id = 0;
- attach_args.api_client_index = dummy_server_api_index;
+ attach_args.api_client_index = placeholder_server_api_index;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "server attached");
server_index = attach_args.app_index;
/* Try connecting */
error = vnet_connect (&connect_args);
SESSION_TEST ((error != 0), "connect should fail");
- rv = clib_error_get_code (error);
- SESSION_TEST ((rv == VNET_API_ERROR_APP_CONNECT_FILTERED),
- "connect should be filtered");
+ SESSION_TEST ((error == SESSION_E_FILTERED), "connect should be filtered");
sep.ip.ip4.as_u32 -= 1 << 24;
.is_add = 1
};
error = vnet_app_namespace_add_del (&ns_args);
- SESSION_TEST ((error == 0), "app ns insertion should succeed: %d",
- clib_error_get_code (error));
+ SESSION_TEST ((error == 0), "app ns insertion should succeed: %d", error);
app_ns = app_namespace_get_from_id (ns_id);
attach_args.namespace_id = ns_id;
- attach_args.api_client_index = dummy_server_api_index;
+ attach_args.api_client_index = placeholder_server_api_index;
+ vec_free (attach_args.name);
+ attach_args.name = format (0, "server_test2");
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "server2 attached");
server_index2 = attach_args.app_index;
error = vnet_connect (&connect_args);
SESSION_TEST ((error != 0), "connect should fail");
- rv = clib_error_get_code (error);
- SESSION_TEST ((rv == VNET_API_ERROR_APP_CONNECT_FILTERED),
- "connect should be filtered");
+ SESSION_TEST ((error == SESSION_E_FILTERED), "connect should be filtered");
/*
* Lookup test namespace
connect_args.app_index = server_index;
error = vnet_connect (&connect_args);
SESSION_TEST ((error != 0), "connect should fail");
- rv = clib_error_get_code (error);
- SESSION_TEST ((rv == VNET_API_ERROR_APP_CONNECT_FILTERED),
- "connect should be filtered");
+ SESSION_TEST ((error == SESSION_E_FILTERED), "connect should be filtered");
args.table_args.is_add = 0;
vnet_session_rule_add_del (&args);
char *show_local_listeners = "sh app ns table default";
unformat_input_t tmp_input;
u32 server_index, app_index;
- u32 dummy_server_api_index = ~0, sw_if_index = 0;
- clib_error_t *error = 0;
+ u32 placeholder_server_api_index = ~0, sw_if_index = 0;
u8 is_filtered = 0;
session_t *s;
transport_connection_t *tc;
u16 lcl_port = 1234, rmt_port = 4321;
app_namespace_t *app_ns;
- int verbose = 0;
+ int verbose = 0, error = 0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
.api_client_index = ~0,
.options = options,
.namespace_id = 0,
- .session_cb_vft = &dummy_session_cbs,
+ .session_cb_vft = &placeholder_session_cbs,
.name = format (0, "session_test"),
};
- attach_args.api_client_index = dummy_server_api_index;
+ attach_args.api_client_index = placeholder_server_api_index;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "server attachment should work");
server_index = attach_args.app_index;
if (verbose)
unformat_free (&tmp_input);
vec_free (attach_args.name);
+ session_delete_loopback (sw_if_index);
+ return 0;
+}
+
+static inline void
+wait_for_event (svm_msg_q_t * mq, int fd, int epfd, u8 use_eventfd)
+{
+ if (!use_eventfd)
+ {
+ svm_msg_q_lock (mq);
+ while (svm_msg_q_is_empty (mq))
+ svm_msg_q_wait (mq);
+ }
+ else
+ {
+ int __clib_unused n_read, rv;
+ struct epoll_event ep_evt;
+ u64 buf;
+
+ while (1)
+ {
+ rv = epoll_wait (epfd, &ep_evt, 1, -1);
+ if (rv < 0)
+ {
+ ST_DBG ("epoll error");
+ exit (1);
+ }
+ else if (rv > 0 && (ep_evt.events & EPOLLIN))
+ {
+ n_read = read (fd, &buf, sizeof (buf));
+ }
+ else
+ continue;
+
+ if (!svm_msg_q_is_empty (mq))
+ {
+ svm_msg_q_lock (mq);
+ break;
+ }
+ }
+ }
+}
+
+static int
+session_test_mq_speed (vlib_main_t * vm, unformat_input_t * input)
+{
+ int error, __clib_unused verbose, use_eventfd = 0;
+ u64 i, n_test_msgs = 1 << 10, *counter;
+ u64 options[APP_OPTIONS_N_OPTIONS];
+ int epfd = -1, rv, prod_fd = -1;
+ svm_fifo_t *rx_fifo, *tx_fifo;
+ vl_api_registration_t *reg;
+ struct epoll_event ep_evt;
+ u32 app_index, api_index;
+ app_worker_t *app_wrk;
+ segment_manager_t *sm;
+ svm_msg_q_msg_t msg;
+ application_t *app;
+ svm_msg_q_t *mq;
+ f64 start, diff;
+ svm_queue_t *q;
+ session_t s;
+ pid_t pid;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "verbose"))
+ verbose = 1;
+ else if (unformat (input, "%d", &n_test_msgs))
+ ;
+ else if (unformat (input, "use-eventfd"))
+ use_eventfd = 1;
+ else
+ {
+ vlib_cli_output (vm, "parse error: '%U'", format_unformat_error,
+ input);
+ return -1;
+ }
+ }
+
+ q = clib_mem_alloc (sizeof (*q));
+ api_index = vl_api_memclnt_create_internal ("session_mq_test_api", q);
+
+ clib_memset (options, 0, sizeof (options));
+ options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
+ options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE;
+ options[APP_OPTIONS_EVT_QUEUE_SIZE] = 2048;
+
+ reg = vl_api_client_index_to_registration (api_index);
+ /* Shut up coverity */
+ if (reg == 0)
+ abort ();
+
+ vnet_app_attach_args_t attach_args = {
+ .api_client_index = api_index,
+ .options = options,
+ .namespace_id = 0,
+ .session_cb_vft = &placeholder_session_cbs,
+ .name = format (0, "session_mq_test"),
+ };
+ error = vnet_application_attach (&attach_args);
+ SESSION_TEST ((error == 0), "server attachment should work");
+
+ app_index = attach_args.app_index;
+
+ app = application_get (app_index);
+ app_wrk = application_get_worker (app, 0);
+ mq = app_wrk->event_queue;
+ if (use_eventfd)
+ {
+ svm_msg_q_alloc_producer_eventfd (mq);
+ svm_msg_q_alloc_consumer_eventfd (mq);
+ prod_fd = svm_msg_q_get_producer_eventfd (mq);
+ SESSION_TEST (prod_fd != -1, "mq producer eventd valid %u", prod_fd);
+ }
+
+ sm = app_worker_get_or_alloc_connect_segment_manager (app_wrk);
+ segment_manager_alloc_session_fifos (sm, 0, &rx_fifo, &tx_fifo);
+ s.rx_fifo = rx_fifo;
+ s.tx_fifo = tx_fifo;
+ s.session_state = SESSION_STATE_READY;
+ counter = (u64 *) f_head_cptr (rx_fifo)->data;
+ start = vlib_time_now (vm);
+
+ pid = fork ();
+ if (pid < 0)
+ SESSION_TEST (0, "fork failed");
+
+ if (pid == 0)
+ {
+ if (use_eventfd)
+ {
+ epfd = epoll_create1 (0);
+ SESSION_TEST (epfd != -1, "epfd created");
+ ep_evt.events = EPOLLIN;
+ ep_evt.data.u64 = prod_fd;
+ rv = epoll_ctl (epfd, EPOLL_CTL_ADD, prod_fd, &ep_evt);
+ SESSION_TEST (rv == 0, "epoll returned %d", rv);
+ }
+
+ for (i = 0; i < n_test_msgs; i++)
+ {
+ wait_for_event (mq, prod_fd, epfd, use_eventfd);
+ svm_msg_q_sub_w_lock (mq, &msg);
+ svm_msg_q_free_msg (mq, &msg);
+ svm_msg_q_unlock (mq);
+ *counter = *counter + 1;
+ svm_fifo_unset_event (rx_fifo);
+ }
+ exit (0);
+ }
+ else
+ {
+ ST_DBG ("client pid %u", pid);
+ for (i = 0; i < n_test_msgs; i++)
+ {
+ while (svm_fifo_has_event (rx_fifo))
+ ;
+ app_worker_lock_and_send_event (app_wrk, &s, SESSION_IO_EVT_RX);
+ }
+ }
+
+ diff = vlib_time_now (vm) - start;
+ ST_DBG ("done %u events in %.2f sec: %f evts/s", *counter,
+ diff, *counter / diff);
+
+ vnet_app_detach_args_t detach_args = {
+ .app_index = app_index,
+ .api_client_index = ~0,
+ };
+ vnet_application_detach (&detach_args);
+ return 0;
+}
+
+static int
+session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input)
+{
+ svm_msg_q_cfg_t _cfg, *cfg = &_cfg;
+ svm_msg_q_msg_t msg1, msg2, msg[12];
+ int __clib_unused verbose, i, rv;
+ svm_msg_q_shared_t *smq;
+ svm_msg_q_ring_t *ring;
+ svm_msg_q_t _mq = { 0 }, *mq = &_mq;
+ u8 *rings_ptr;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "verbose"))
+ verbose = 1;
+ else
+ {
+ vlib_cli_output (vm, "parse error: '%U'", format_unformat_error,
+ input);
+ return -1;
+ }
+ }
+
+ svm_msg_q_ring_cfg_t rc[2] = { {8, 8, 0}
+ , {8, 16, 0}
+ };
+ cfg->consumer_pid = ~0;
+ cfg->n_rings = 2;
+ cfg->q_nitems = 16;
+ cfg->ring_cfgs = rc;
+
+ smq = svm_msg_q_alloc (cfg);
+ svm_msg_q_attach (mq, smq);
+ SESSION_TEST (mq != 0, "svm_msg_q_alloc");
+ SESSION_TEST (vec_len (mq->rings) == 2, "ring allocation");
+ rings_ptr = (u8 *) mq->rings[0].shr->data;
+ vec_foreach (ring, mq->rings)
+ {
+ SESSION_TEST (ring->shr->data == rings_ptr, "ring data");
+ rings_ptr += (uword) ring->nitems * ring->elsize;
+ rings_ptr += sizeof (svm_msg_q_ring_shared_t);
+ }
+
+ msg1 = svm_msg_q_alloc_msg (mq, 8);
+ rv = (mq->rings[0].shr->cursize != 1 || msg1.ring_index != 0 ||
+ msg1.elt_index != 0);
+ SESSION_TEST (rv == 0, "msg alloc1");
+
+ msg2 = svm_msg_q_alloc_msg (mq, 15);
+ rv = (mq->rings[1].shr->cursize != 1 || msg2.ring_index != 1 ||
+ msg2.elt_index != 0);
+ SESSION_TEST (rv == 0, "msg alloc2");
+
+ svm_msg_q_free_msg (mq, &msg1);
+ SESSION_TEST (mq->rings[0].shr->cursize == 0, "free msg");
+
+ for (i = 0; i < 12; i++)
+ {
+ msg[i] = svm_msg_q_alloc_msg (mq, 7);
+ *(u32 *) svm_msg_q_msg_data (mq, &msg[i]) = i;
+ }
+
+ rv = (mq->rings[0].shr->cursize != 8 || mq->rings[1].shr->cursize != 5);
+ SESSION_TEST (rv == 0, "msg alloc3");
+
+ *(u32 *) svm_msg_q_msg_data (mq, &msg2) = 123;
+ svm_msg_q_add (mq, &msg2, SVM_Q_NOWAIT);
+ for (i = 0; i < 12; i++)
+ svm_msg_q_add (mq, &msg[i], SVM_Q_NOWAIT);
+
+ rv = svm_msg_q_sub (mq, &msg2, SVM_Q_NOWAIT, 0);
+ SESSION_TEST (rv == 0, "dequeue1");
+
+ SESSION_TEST (msg2.ring_index == 1 && msg2.elt_index == 0,
+ "dequeue1 result");
+ rv = (*(u32 *) svm_msg_q_msg_data (mq, &msg2) == 123);
+ SESSION_TEST (rv, "dequeue 1 data");
+
+ svm_msg_q_free_msg (mq, &msg2);
+
+ for (i = 0; i < 12; i++)
+ {
+ if (svm_msg_q_sub (mq, &msg[i], SVM_Q_NOWAIT, 0))
+ SESSION_TEST (0, "dequeue2");
+ if (i < 8)
+ {
+ if (msg[i].ring_index != 0 || msg[i].elt_index != (i + 1) % 8)
+ SESSION_TEST (0, "dequeue2 result2");
+ }
+ else
+ {
+ if (msg[i].ring_index != 1 || msg[i].elt_index != (i - 8) + 1)
+ SESSION_TEST (0, "dequeue2 result3");
+ }
+ if (*(u32 *) svm_msg_q_msg_data (mq, &msg[i]) != i)
+ SESSION_TEST (0, "dequeue2 wrong data");
+ svm_msg_q_free_msg (mq, &msg[i]);
+ }
+ rv = (mq->rings[0].shr->cursize == 0 && mq->rings[1].shr->cursize == 0);
+ SESSION_TEST (rv, "post dequeue");
+
return 0;
}
res = session_test_proxy (vm, input);
else if (unformat (input, "endpt-cfg"))
res = session_test_endpoint_cfg (vm, input);
+ else if (unformat (input, "mq-speed"))
+ res = session_test_mq_speed (vm, input);
+ else if (unformat (input, "mq-basic"))
+ res = session_test_mq_basic (vm, input);
else if (unformat (input, "all"))
{
if ((res = session_test_basic (vm, input)))
goto done;
if ((res = session_test_endpoint_cfg (vm, input)))
goto done;
+ if ((res = session_test_mq_speed (vm, input)))
+ goto done;
+ if ((res = session_test_mq_basic (vm, input)))
+ goto done;
}
else
break;
Code Review / vpp.git / blobdiff