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

Fix race between DCPSParticipant write and lease expiry

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-01-16 16:30:24 +01:00 • committed by eboasson
parent 4af531a1c3
commit be327f5e56
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3845,13 +3845,15 @@ void new_proxy_participant (struct q_globals *gv, const struct ddsi_guid *ppguid
nn_plist_fini (&plist_rd); nn_plist_fini (&plist_rd);
} }
/* write DCPSParticipant topic before the lease can expire */
builtintopic_write (gv->builtin_topic_interface, &proxypp->e, timestamp, true);
/* Register lease for auto liveliness, but be careful not to accidentally re-register /* Register lease for auto liveliness, but be careful not to accidentally re-register
DDSI2's lease, as we may have become dependent on DDSI2 any time after DDSI2's lease, as we may have become dependent on DDSI2 any time after
entidx_insert_proxy_participant_guid even if privileged_pp_guid was NULL originally */ entidx_insert_proxy_participant_guid even if privileged_pp_guid was NULL originally */
ddsrt_mutex_lock (&proxypp->e.lock); ddsrt_mutex_lock (&proxypp->e.lock);
if (proxypp->owns_lease) if (proxypp->owns_lease)
lease_register (ddsrt_atomic_ldvoidp (&proxypp->minl_auto)); lease_register (ddsrt_atomic_ldvoidp (&proxypp->minl_auto));
builtintopic_write (gv->builtin_topic_interface, &proxypp->e, timestamp, true);
ddsrt_mutex_unlock (&proxypp->e.lock); ddsrt_mutex_unlock (&proxypp->e.lock);
} }