Remove unused "kernel sequence numbers" notion

The flag originates in OpenSplice but is meaningless in Cyclone.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-02-13 11:48:10 +01:00
parent 0d3ca448ff
commit 9b43303d82
3 changed files with 5 additions and 22 deletions

View file

@ -358,7 +358,6 @@ struct proxy_participant
struct proxy_endpoint_common *endpoints; /* all proxy endpoints can be reached from here */ struct proxy_endpoint_common *endpoints; /* all proxy endpoints can be reached from here */
ddsrt_avl_tree_t groups; /* table of all groups (publisher, subscriber), see struct proxy_group */ ddsrt_avl_tree_t groups; /* table of all groups (publisher, subscriber), see struct proxy_group */
seqno_t seq; /* sequence number of most recent SPDP message */ seqno_t seq; /* sequence number of most recent SPDP message */
unsigned kernel_sequence_numbers : 1; /* whether this proxy participant generates OSPL kernel sequence numbers */
unsigned implicitly_created : 1; /* participants are implicitly created for Cloud/Fog discovered endpoints */ unsigned implicitly_created : 1; /* participants are implicitly created for Cloud/Fog discovered endpoints */
unsigned is_ddsi2_pp: 1; /* if this is the federation-leader on the remote node */ unsigned is_ddsi2_pp: 1; /* if this is the federation-leader on the remote node */
unsigned minimal_bes_mode: 1; unsigned minimal_bes_mode: 1;
@ -665,19 +664,17 @@ int writer_set_notalive (struct writer *wr, bool notify);
XX -- XX --
*/ */
/* Set this custom flag when using nn_prismtech_writer_info_t iso nn_prismtech_writer_info_old_t */
#define CF_INC_KERNEL_SEQUENCE_NUMBERS (1 << 0)
/* Set when this proxy participant is created implicitly and has to be deleted upon disappearance /* Set when this proxy participant is created implicitly and has to be deleted upon disappearance
of its last endpoint. FIXME: Currently there is a potential race with adding a new endpoint of its last endpoint. FIXME: Currently there is a potential race with adding a new endpoint
in parallel to deleting the last remaining one. The endpoint will then be created, added to the in parallel to deleting the last remaining one. The endpoint will then be created, added to the
proxy participant and then both are deleted. With the current single-threaded discovery proxy participant and then both are deleted. With the current single-threaded discovery
this can only happen when it is all triggered by lease expiry. */ this can only happen when it is all triggered by lease expiry. */
#define CF_IMPLICITLY_CREATED_PROXYPP (1 << 1) #define CF_IMPLICITLY_CREATED_PROXYPP (1 << 0)
/* Set when this proxy participant is a DDSI2 participant, to help Cloud figure out whom to send /* Set when this proxy participant is a DDSI2 participant, to help Cloud figure out whom to send
discovery data when used in conjunction with the networking bridge */ discovery data when used in conjunction with the networking bridge */
#define CF_PARTICIPANT_IS_DDSI2 (1 << 2) #define CF_PARTICIPANT_IS_DDSI2 (1 << 1)
/* Set when this proxy participant is not to be announced on the built-in topics yet */ /* Set when this proxy participant is not to be announced on the built-in topics yet */
#define CF_PROXYPP_NO_SPDP (1 << 3) #define CF_PROXYPP_NO_SPDP (1 << 2)
void new_proxy_participant (struct ddsi_domaingv *gv, const struct ddsi_guid *guid, uint32_t bes, const struct ddsi_guid *privileged_pp_guid, struct addrset *as_default, struct addrset *as_meta, const struct ddsi_plist *plist, dds_duration_t tlease_dur, nn_vendorid_t vendor, unsigned custom_flags, nn_wctime_t timestamp, seqno_t seq); void new_proxy_participant (struct ddsi_domaingv *gv, const struct ddsi_guid *guid, uint32_t bes, const struct ddsi_guid *privileged_pp_guid, struct addrset *as_default, struct addrset *as_meta, const struct ddsi_plist *plist, dds_duration_t tlease_dur, nn_vendorid_t vendor, unsigned custom_flags, nn_wctime_t timestamp, seqno_t seq);
int delete_proxy_participant_by_guid (struct ddsi_domaingv *gv, const struct ddsi_guid *guid, nn_wctime_t timestamp, int isimplicit); int delete_proxy_participant_by_guid (struct ddsi_domaingv *gv, const struct ddsi_guid *guid, nn_wctime_t timestamp, int isimplicit);

View file

@ -657,9 +657,6 @@ static int handle_SPDP_alive (const struct receiver_state *rst, seqno_t seq, nn_
} }
if (datap->present & PP_PRISMTECH_PARTICIPANT_VERSION_INFO) { if (datap->present & PP_PRISMTECH_PARTICIPANT_VERSION_INFO) {
if (datap->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_KERNEL_SEQUENCE_NUMBER)
custom_flags |= CF_INC_KERNEL_SEQUENCE_NUMBERS;
if ((datap->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_DDSI2_PARTICIPANT_FLAG) && if ((datap->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_DDSI2_PARTICIPANT_FLAG) &&
(datap->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_PARTICIPANT_IS_DDSI2)) (datap->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_PARTICIPANT_IS_DDSI2))
custom_flags |= CF_PARTICIPANT_IS_DDSI2; custom_flags |= CF_PARTICIPANT_IS_DDSI2;

View file

@ -4827,6 +4827,8 @@ void new_proxy_participant (struct ddsi_domaingv *gv, const struct ddsi_guid *pp
proxypp->minimal_bes_mode = 1; proxypp->minimal_bes_mode = 1;
else else
proxypp->minimal_bes_mode = 0; proxypp->minimal_bes_mode = 0;
proxypp->implicitly_created = ((custom_flags & CF_IMPLICITLY_CREATED_PROXYPP) != 0);
proxypp->proxypp_have_spdp = ((custom_flags & CF_PROXYPP_NO_SPDP) == 0);
{ {
struct proxy_participant *privpp; struct proxy_participant *privpp;
@ -4889,19 +4891,6 @@ void new_proxy_participant (struct ddsi_domaingv *gv, const struct ddsi_guid *pp
set_proxy_participant_security_info(proxypp, plist); set_proxy_participant_security_info(proxypp, plist);
#endif #endif
if (custom_flags & CF_INC_KERNEL_SEQUENCE_NUMBERS)
proxypp->kernel_sequence_numbers = 1;
else
proxypp->kernel_sequence_numbers = 0;
if (custom_flags & CF_IMPLICITLY_CREATED_PROXYPP)
proxypp->implicitly_created = 1;
else
proxypp->implicitly_created = 0;
if (custom_flags & CF_PROXYPP_NO_SPDP)
proxypp->proxypp_have_spdp = 0;
else
proxypp->proxypp_have_spdp = 1;
#ifdef DDSI_INCLUDE_SECURITY #ifdef DDSI_INCLUDE_SECURITY
if (secure) if (secure)