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

FSM combine event and timeout thread

Browse source 
Signed-off-by: Marcel Jordense <marcel.jordense@adlinktech.com>
This commit is contained in:
Marcel Jordense 2020-01-14 11:26:59 +01:00 • committed by eboasson
parent 0b1804e039
commit a9b9a65e1b
10 changed files with 755 additions and 895 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/ddsi/src/q_config.c
View file

@ -531,6 +531,7 @@ static const struct cfgelem thread_properties_cfgattrs[] = {
<li><i>dq.builtins</i>: delivery thread for DDSI-builtin data, primarily for discovery;</li>\n\
<li><i>lease</i>: DDSI liveliness monitoring;</li>\n\
<li><i>tev</i>: general timed-event handling, retransmits and discovery;</li>\n\
<li><i>fsm</i>: finite state machine thread for handling security handshake;</li>\n\
<li><i>xmit.CHAN</i>: transmit thread for channel CHAN;</li>\n\
<li><i>dq.CHAN</i>: delivery thread for channel CHAN;</li>\n\
<li><i>tev.CHAN</i>: timed-even thread for channel CHAN.</li></ul>") },

4
src/core/ddsi/src/q_init.c
View file

@ -397,10 +397,10 @@ static int known_channel_p (const struct q_globals *gv, const char *name)
static int check_thread_properties (const struct q_globals *gv)
{
#ifdef DDSI_INCLUDE_NETWORK_CHANNELS
static const char *fixed[] = { "recv", "tev", "gc", "lease", "dq.builtins", "debmon", NULL };
static const char *fixed[] = { "recv", "tev", "gc", "lease", "dq.builtins", "debmon", "fsm", NULL };
static const char *chanprefix[] = { "xmit.", "tev.","dq.",NULL };
#else
static const char *fixed[] = { "recv", "tev", "gc", "lease", "dq.builtins", "xmit.user", "dq.user", "debmon", NULL };
static const char *fixed[] = { "recv", "tev", "gc", "lease", "dq.builtins", "xmit.user", "dq.user", "debmon", "fsm", NULL };
#endif
const struct config_thread_properties_listelem *e;
int ok = 1, i;