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

Liveliness monitoring fixes for security FSM

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-02-12 20:15:49 +01:00
parent ad58db0721
commit 0d3ca448ff
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/security/core/src/dds_security_fsm.c
View file

@ -179,7 +179,7 @@ static void fsm_check_auto_state_change (struct dds_security_fsm *fsm)
} }
} }
static void fsm_state_change (struct dds_security_fsm_control *control, struct fsm_event *event) static void fsm_state_change (struct thread_state1 *ts1, struct dds_security_fsm_control *control, struct fsm_event *event)
{ {
struct dds_security_fsm *fsm = event->fsm; struct dds_security_fsm *fsm = event->fsm;
int event_id = event->event_id; int event_id = event->event_id;
@ -199,10 +199,14 @@ static void fsm_state_change (struct dds_security_fsm_control *control, struct f
set_state_timer (fsm); set_state_timer (fsm);
ddsrt_mutex_unlock (&control->lock); ddsrt_mutex_unlock (&control->lock);
thread_state_asleep (ts1);
if (fsm->transitions[i].func) if (fsm->transitions[i].func)
fsm->transitions[i].func (fsm, fsm->arg); fsm->transitions[i].func (fsm, fsm->arg);
if (fsm->current && fsm->current->func) if (fsm->current && fsm->current->func)
fsm->current->func (fsm, fsm->arg); fsm->current->func (fsm, fsm->arg);
thread_state_awake (ts1, control->gv);
ddsrt_mutex_lock (&control->lock); ddsrt_mutex_lock (&control->lock);
fsm_check_auto_state_change (fsm); fsm_check_auto_state_change (fsm);
break; break;
@ -241,9 +245,8 @@ static void fsm_handle_timeout (struct dds_security_fsm_control *control, struct
static uint32_t handle_events (struct dds_security_fsm_control *control) static uint32_t handle_events (struct dds_security_fsm_control *control)
{ {
struct thread_state1 * const ts1 = lookup_thread_state (); struct thread_state1 * const ts1 = lookup_thread_state ();
ddsrt_mutex_lock (&control->lock);
thread_state_awake (ts1, control->gv); thread_state_awake (ts1, control->gv);
ddsrt_mutex_lock (&control->lock);
while (control->running) while (control->running)
{ {
if (control->event_queue) if (control->event_queue)
@ -253,7 +256,7 @@ static uint32_t handle_events (struct dds_security_fsm_control *control)
control->event_queue = event->next; control->event_queue = event->next;
if (control->event_queue) if (control->event_queue)
control->event_queue->prev = NULL; control->event_queue->prev = NULL;
fsm_state_change (control, event); fsm_state_change (ts1, control, event);
ddsrt_free (event); ddsrt_free (event);
} }
else else
@ -263,7 +266,7 @@ static uint32_t handle_events (struct dds_security_fsm_control *control)
if (timeout > dds_time ()) if (timeout > dds_time ())
{ {
thread_state_asleep (ts1); thread_state_asleep (ts1);
(void)ddsrt_cond_waituntil( &control->cond, &control->lock, timeout); (void)ddsrt_cond_waituntil (&control->cond, &control->lock, timeout);
thread_state_awake (ts1, control->gv); thread_state_awake (ts1, control->gv);
} }
else else
@ -273,9 +276,8 @@ static uint32_t handle_events (struct dds_security_fsm_control *control)
} }
} }
} }
thread_state_asleep (ts1);
ddsrt_mutex_unlock (&control->lock); ddsrt_mutex_unlock (&control->lock);
thread_state_asleep (ts1);
return 0; return 0;
} }