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

Register manual-by-topic lease in transition to alive

Browse source 
Lease handling removes expired leases from the heap, and so a proxy
writer that transitions from not-alive to alive needs to re-schedule
expiry again or it will remain alive forever after having regained
liveliness once.  This was missing for a manual-by-topic lease.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-01-15 12:47:44 +01:00 • committed by eboasson
parent 0f527135fc
commit 5632ed46b5
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4478,8 +4478,13 @@ void proxy_writer_set_alive_may_unlock (struct proxy_writer *pwr, bool notify)
ddsrt_mutex_lock (&pwr->c.proxypp->e.lock); ddsrt_mutex_lock (&pwr->c.proxypp->e.lock);
pwr->alive = true; pwr->alive = true;
pwr->alive_vclock++; pwr->alive_vclock++;
if (pwr->c.xqos->liveliness.lease_duration != T_NEVER && pwr->c.xqos->liveliness.kind != DDS_LIVELINESS_MANUAL_BY_TOPIC) if (pwr->c.xqos->liveliness.lease_duration != T_NEVER)
proxy_participant_add_pwr_lease_locked (pwr->c.proxypp, pwr); {
if (pwr->c.xqos->liveliness.kind != DDS_LIVELINESS_MANUAL_BY_TOPIC)
proxy_participant_add_pwr_lease_locked (pwr->c.proxypp, pwr);
else
lease_set_expiry (pwr->lease, add_duration_to_etime (now_et (), pwr->lease->tdur));
}
ddsrt_mutex_unlock (&pwr->c.proxypp->e.lock); ddsrt_mutex_unlock (&pwr->c.proxypp->e.lock);
if (notify) if (notify)