niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix de-initialisation of tcp support code

Browse source 
Stopping and restarting the DDSI stack in a single process would not re-initialise the TCP support code properly

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-01-15 11:14:57 +01:00
parent cd02110af0
commit b864c83879
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/core/ddsi/src/ddsi_tcp.c
View file

@ -27,6 +27,7 @@
#define INVALID_PORT (~0u) #define INVALID_PORT (~0u)
typedef struct ddsi_tran_factory * ddsi_tcp_factory_g_t; typedef struct ddsi_tran_factory * ddsi_tcp_factory_g_t;
static os_atomic_uint32_t ddsi_tcp_init_g = OS_ATOMIC_UINT32_INIT(0);
#ifdef DDSI_INCLUDE_SSL #ifdef DDSI_INCLUDE_SSL
struct ddsi_ssl_plugins ddsi_tcp_ssl_plugin = struct ddsi_ssl_plugins ddsi_tcp_ssl_plugin =
@ -1027,14 +1028,17 @@ static void ddsi_tcp_release_listener (ddsi_tran_listener_t listener)
static void ddsi_tcp_release_factory (void) static void ddsi_tcp_release_factory (void)
{ {
ut_avlFree (&ddsi_tcp_treedef, &ddsi_tcp_cache_g, ddsi_tcp_node_free); if (os_atomic_dec32_nv (&ddsi_tcp_init_g) == 0) {
os_mutexDestroy (&ddsi_tcp_cache_lock_g); ut_avlFree (&ddsi_tcp_treedef, &ddsi_tcp_cache_g, ddsi_tcp_node_free);
os_mutexDestroy (&ddsi_tcp_cache_lock_g);
#ifdef DDSI_INCLUDE_SSL #ifdef DDSI_INCLUDE_SSL
if (ddsi_tcp_ssl_plugin.fini) if (ddsi_tcp_ssl_plugin.fini)
{ {
(ddsi_tcp_ssl_plugin.fini) (); (ddsi_tcp_ssl_plugin.fini) ();
} }
#endif #endif
DDS_LOG(DDS_LC_INFO | DDS_LC_CONFIG, "tcp de-initialized\n");
}
} }
static enum ddsi_locator_from_string_result ddsi_tcp_address_from_string (ddsi_tran_factory_t tran, nn_locator_t *loc, const char *str) static enum ddsi_locator_from_string_result ddsi_tcp_address_from_string (ddsi_tran_factory_t tran, nn_locator_t *loc, const char *str)
@ -1063,10 +1067,9 @@ static enum ddsi_nearby_address_result ddsi_tcp_is_nearby_address (ddsi_tran_fac
int ddsi_tcp_init (void) int ddsi_tcp_init (void)
{ {
static bool init = false; if (os_atomic_inc32_nv (&ddsi_tcp_init_g) == 1)
if (!init)
{ {
init = true; memset (&ddsi_tcp_factory_g, 0, sizeof (ddsi_tcp_factory_g));
ddsi_tcp_factory_g.m_kind = NN_LOCATOR_KIND_TCPv4; ddsi_tcp_factory_g.m_kind = NN_LOCATOR_KIND_TCPv4;
ddsi_tcp_factory_g.m_typename = "tcp"; ddsi_tcp_factory_g.m_typename = "tcp";
ddsi_tcp_factory_g.m_stream = true; ddsi_tcp_factory_g.m_stream = true;

2
src/core/ddsi/src/ddsi_tran.c
View file

@ -62,8 +62,8 @@ void ddsi_tran_factories_fini (void)
ddsi_tran_factory_t factory; ddsi_tran_factory_t factory;
while ((factory = ddsi_tran_factories) != NULL) { while ((factory = ddsi_tran_factories) != NULL) {
ddsi_tran_factories = factory->m_factory;
ddsi_factory_free(factory); ddsi_factory_free(factory);
ddsi_tran_factories = ddsi_tran_factories->m_factory;
} }
} }