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

Lazily allocate state for multi-writer instances

Browse source 
Multiple writers for a single instance is pretty rare, so it makes sense
to lazily allocate the tables for keeping track of them.  The more
elegant solution would be to have a single lock-free table.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-06-24 10:07:33 +02:00 • committed by eboasson
parent 0e888eb2ec
commit 260f8cd86b
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core/ddsc/src/dds_rhc.c
View file

@ -192,30 +192,33 @@ static int lwreg_equals (const void *va, const void *vb)
static void lwregs_init (struct lwregs *rt) static void lwregs_init (struct lwregs *rt)
{ {
rt->regs = ddsrt_ehh_new (sizeof (struct lwreg), 1, lwreg_hash, lwreg_equals); rt->regs = NULL;
} }
static void lwregs_fini (struct lwregs *rt) static void lwregs_fini (struct lwregs *rt)
{ {
ddsrt_ehh_free (rt->regs); if (rt->regs)
ddsrt_ehh_free (rt->regs);
} }
static int lwregs_contains (struct lwregs *rt, uint64_t iid, uint64_t wr_iid) static int lwregs_contains (struct lwregs *rt, uint64_t iid, uint64_t wr_iid)
{ {
struct lwreg dummy = { .iid = iid, .wr_iid = wr_iid }; struct lwreg dummy = { .iid = iid, .wr_iid = wr_iid };
return ddsrt_ehh_lookup (rt->regs, &dummy) != NULL; return rt->regs != NULL && ddsrt_ehh_lookup (rt->regs, &dummy) != NULL;
} }
static int lwregs_add (struct lwregs *rt, uint64_t iid, uint64_t wr_iid) static int lwregs_add (struct lwregs *rt, uint64_t iid, uint64_t wr_iid)
{ {
struct lwreg dummy = { .iid = iid, .wr_iid = wr_iid }; struct lwreg dummy = { .iid = iid, .wr_iid = wr_iid };
if (rt->regs == NULL)
rt->regs = ddsrt_ehh_new (sizeof (struct lwreg), 1, lwreg_hash, lwreg_equals);
return ddsrt_ehh_add (rt->regs, &dummy); return ddsrt_ehh_add (rt->regs, &dummy);
} }
static int lwregs_delete (struct lwregs *rt, uint64_t iid, uint64_t wr_iid) static int lwregs_delete (struct lwregs *rt, uint64_t iid, uint64_t wr_iid)
{ {
struct lwreg dummy = { .iid = iid, .wr_iid = wr_iid }; struct lwreg dummy = { .iid = iid, .wr_iid = wr_iid };
return ddsrt_ehh_remove (rt->regs, &dummy); return rt->regs != NULL && ddsrt_ehh_remove (rt->regs, &dummy);
} }
#if 0 #if 0