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

Unified key-to-iid map means a backref to the map is no longer needed

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2018-12-30 09:50:23 +01:00 • committed by Erik Boasson
parent 96da0c5555
commit e0d5587639
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/ddsi/include/ddsi/ddsi_tkmap.h
View file

@ -26,7 +26,6 @@ struct dds_topic;
struct ddsi_tkmap_instance struct ddsi_tkmap_instance
{ {
struct ddsi_serdata * m_sample; struct ddsi_serdata * m_sample;
struct ddsi_tkmap * m_map;
uint64_t m_iid; uint64_t m_iid;
os_atomic_uint32_t m_refc; os_atomic_uint32_t m_refc;
}; };

3
src/core/ddsi/src/ddsi_tkmap.c
View file

@ -189,7 +189,6 @@ retry:
return NULL; return NULL;
tk->m_sample = ddsi_serdata_to_topicless (sd); tk->m_sample = ddsi_serdata_to_topicless (sd);
tk->m_map = map;
os_atomic_st32 (&tk->m_refc, 1); os_atomic_st32 (&tk->m_refc, 1);
tk->m_iid = ddsi_iid_gen (); tk->m_iid = ddsi_iid_gen ();
if (!ut_chhAdd (map->m_hh, tk)) if (!ut_chhAdd (map->m_hh, tk))
@ -235,7 +234,7 @@ void ddsi_tkmap_instance_unref (_In_ struct ddsi_tkmap_instance * tk)
} while (!os_atomic_cas32(&tk->m_refc, old, new)); } while (!os_atomic_cas32(&tk->m_refc, old, new));
if (new == REFC_DELETE) if (new == REFC_DELETE)
{ {
struct ddsi_tkmap *map = tk->m_map; struct ddsi_tkmap *map = gv.m_tkmap;
/* Remove from hash table */ /* Remove from hash table */
int removed = ut_chhRemove(map->m_hh, tk); int removed = ut_chhRemove(map->m_hh, tk);