mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-23 02:01:55 +00:00
Code Releases Activity

Allocation of ea_list in one contiguous memory block

Browse Source 
This saves some bytes of memory for complex ea's.
This commit is contained in:
Maria Matejka 2021-03-30 21:44:35 +02:00
parent ff397df7ed
commit 7c8b7649f9
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nest/rt-attr.c
View File

@ -748,14 +748,22 @@ static inline ea_list *
ea_list_copy(ea_list *o) ea_list_copy(ea_list *o)
{ {
ea_list *n; ea_list *n;
unsigned i, len; unsigned i, adpos, elen;
if (!o) if (!o)
return NULL; return NULL;
ASSERT(!o->next); ASSERT(!o->next);
len = sizeof(ea_list) + sizeof(eattr) * o->count; elen = adpos = sizeof(ea_list) + sizeof(eattr) * o->count;
n = mb_alloc(rta_pool, len);
memcpy(n, o, len); for(i=0; i<o->count; i++)
{
eattr *a = &o->attrs[i];
if (!(a->type & EAF_EMBEDDED))
elen += sizeof(struct adata) + a->u.ptr->length;
}
n = mb_alloc(rta_pool, elen);
memcpy(n, o, adpos);
n->flags |= EALF_CACHED; n->flags |= EALF_CACHED;
for(i=0; i<o->count; i++) for(i=0; i<o->count; i++)
{ {
@ -763,28 +771,25 @@ ea_list_copy(ea_list *o)
if (!(a->type & EAF_EMBEDDED)) if (!(a->type & EAF_EMBEDDED))
{ {
unsigned size = sizeof(struct adata) + a->u.ptr->length; unsigned size = sizeof(struct adata) + a->u.ptr->length;
struct adata *d = mb_alloc(rta_pool, size); ASSERT_DIE(adpos + size <= elen);
struct adata *d = ((void *) n) + adpos;
memcpy(d, a->u.ptr, size); memcpy(d, a->u.ptr, size);
a->u.ptr = d; a->u.ptr = d;
adpos += size;
} }
} }
ASSERT_DIE(adpos == elen);
return n; return n;
} }
static inline void static inline void
ea_free(ea_list *o) ea_free(ea_list *o)
{ {
int i;
if (o) if (o)
{ {
ASSERT(!o->next); ASSERT(!o->next);
for(i=0; i<o->count; i++)
{
eattr *a = &o->attrs[i];
if (!(a->type & EAF_EMBEDDED))
mb_free((void *) a->u.ptr);
}
mb_free(o); mb_free(o);
} }
} }