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

Instance to ALIVE also for rejected samples

Browse source 
In particular, this means instances published by a transient-local
writer will go back to ALIVE following a disconnect and reconnect.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-05-07 14:43:20 +02:00 • committed by eboasson
parent d5d44cc8be
commit bb95de69c3
2 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/core/ddsc/src/dds_rhc_default.c
View file

@ -1034,7 +1034,7 @@ static void drop_instance_noupdate_no_writers (struct dds_rhc_default *__restric
*instptr = NULL; *instptr = NULL;
} }
static void dds_rhc_register (struct dds_rhc_default *rhc, struct rhc_instance *inst, uint64_t wr_iid, bool autodispose, bool iid_update, bool * __restrict nda) static void dds_rhc_register (struct dds_rhc_default *rhc, struct rhc_instance *inst, uint64_t wr_iid, bool autodispose, bool sample_accepted, bool * __restrict nda)
{ {
const uint64_t inst_wr_iid = inst->wr_iid_islive ? inst->wr_iid : 0; const uint64_t inst_wr_iid = inst->wr_iid_islive ? inst->wr_iid : 0;
@ -1061,12 +1061,16 @@ static void dds_rhc_register (struct dds_rhc_default *rhc, struct rhc_instance *
/* Currently no writers at all */ /* Currently no writers at all */
assert (!inst->wr_iid_islive); assert (!inst->wr_iid_islive);
/* to avoid wr_iid update when register is called for sample rejected */ /* When registering a writer based on a rejected sample and causing
if (iid_update) the instance to transition from not-alive to alive, we do want
{ to generate an invalid sample with the id of the newly registered
inst->wr_iid = wr_iid; (or re-registered) writer, but we don't want inst_accepts_sample
to be affected (it was "too old" in the ordering). wr_iid_islive
determines whether wr_iid is meaningful, so setting wr_iid while
leaving wr_iid_islive false gets us the desired behaviour. */
inst->wr_iid = wr_iid;
if (sample_accepted)
inst->wr_iid_islive = 1; inst->wr_iid_islive = 1;
}
inst->wrcount++; inst->wrcount++;
inst->no_writers_gen++; inst->no_writers_gen++;
inst->autodispose = autodispose; inst->autodispose = autodispose;
@ -1108,7 +1112,7 @@ static void dds_rhc_register (struct dds_rhc_default *rhc, struct rhc_instance *
TRACE ("restore"); TRACE ("restore");
} }
/* to avoid wr_iid update when register is called for sample rejected */ /* to avoid wr_iid update when register is called for sample rejected */
if (iid_update) if (sample_accepted)
{ {
inst->wr_iid = wr_iid; inst->wr_iid = wr_iid;
inst->wr_iid_islive = 1; inst->wr_iid_islive = 1;
@ -1136,7 +1140,6 @@ static void dds_rhc_register (struct dds_rhc_default *rhc, struct rhc_instance *
inst->wrcount++; inst->wrcount++;
if (autodispose) if (autodispose)
inst->autodispose = 1; inst->autodispose = 1;
*nda = true;
} }
else else
{ {
@ -1145,7 +1148,7 @@ static void dds_rhc_register (struct dds_rhc_default *rhc, struct rhc_instance *
assert (inst->wrcount >= 2); assert (inst->wrcount >= 2);
/* the most recent writer gets the fast path */ /* the most recent writer gets the fast path */
/* to avoid wr_iid update when register is called for sample rejected */ /* to avoid wr_iid update when register is called for sample rejected */
if (iid_update) if (sample_accepted)
{ {
inst->wr_iid = wr_iid; inst->wr_iid = wr_iid;
inst->wr_iid_islive = 1; inst->wr_iid_islive = 1;
@ -1568,7 +1571,19 @@ static bool dds_rhc_default_store (struct ddsi_rhc * __restrict rhc_common, cons
get_trigger_info_pre (&pre, inst); get_trigger_info_pre (&pre, inst);
if (has_data || is_dispose) if (has_data || is_dispose)
{
dds_rhc_register (rhc, inst, wr_iid, wrinfo->auto_dispose, false, &notify_data_available); dds_rhc_register (rhc, inst, wr_iid, wrinfo->auto_dispose, false, &notify_data_available);
if (notify_data_available)
{
if (inst->latest == NULL || inst->latest->isread)
{
const bool was_empty = inst_is_empty (inst);
inst_set_invsample (rhc, inst, &trig_qc, &notify_data_available);
if (was_empty)
account_for_empty_to_nonempty_transition (rhc, inst);
}
}
}
/* notify sample lost */ /* notify sample lost */
cb_data.raw_status_id = (int) DDS_SAMPLE_LOST_STATUS_ID; cb_data.raw_status_id = (int) DDS_SAMPLE_LOST_STATUS_ID;

12
src/core/ddsc/tests/listener.c
View file

@ -380,12 +380,18 @@ CU_Test (ddsc_listener, incompatible_qos)
CU_Test (ddsc_listener, data_available) CU_Test (ddsc_listener, data_available)
{ {
// data available on reader // data available on reader (+ absence of data-on-readers)
dotest ("da sm r pm w ?pm w ?sm r wr w 0 ?da r ?!dor"); dotest ("da sm r pm w ?pm w ?sm r wr w 0 ?da r ?!dor");
// data available set on subscriber // data available set on subscriber (+ absence of data-on-readers)
dotest ("da R sm r pm w ?pm w ?sm r wr w 0 ?da r ?!dor"); dotest ("da R sm r pm w ?pm w ?sm r wr w 0 ?da r ?!dor");
// data available set on participant // data available set on participant (+ absence of data-on-readers)
dotest ("da P sm r pm w ?pm w ?sm r wr w 0 ?da r ?!dor"); dotest ("da P sm r pm w ?pm w ?sm r wr w 0 ?da r ?!dor");
// non-auto-dispose, transient-local: disconnect => no_writers, reconnect => alive (using invalid samples)
// the invalid sample has the source time stamp of the latest update -- one wonders whether that is wise?
dotest ("da r(d=tl) ?pm w'(d=tl,ad=n) ; wr w' (1,2,3)@1.1 ?da r read{fan(1,2,3)w'} r ;"
" deaf P ; ?da r read{suo(1,2,3)w'@1.1,fuo1w'@1.1} r ;"
" hearing P ; ?da r read{sao(1,2,3)w'@1.1,fao1w'@1.1} r");
} }
CU_Test (ddsc_listener, data_available_delete_writer) CU_Test (ddsc_listener, data_available_delete_writer)