Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

lib: allow static/pre-initialized vectors

Browse source 
Use alloced=0 to indicate that the array used in a vector is not in fact
dynamically allocated memory (yet).

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2024-07-20 18:28:53 -07:00 committed by Donald Sharp
parent 05e915984c
commit 0bf664527d
2 changed files with 44 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/vector.c
View file

@ -24,29 +24,44 @@ vector vector_init(unsigned int size)
v->alloced = size; v->alloced = size;
v->active = 0; v->active = 0;
v->count = 0; v->count = 0;
v->dynamic = true;
v->index = XCALLOC(MTYPE_VECTOR_INDEX, sizeof(void *) * size); v->index = XCALLOC(MTYPE_VECTOR_INDEX, sizeof(void *) * size);
return v; return v;
} }
void vector_free(vector v) void vector_free(vector v)
{ {
XFREE(MTYPE_VECTOR_INDEX, v->index); if (v->alloced)
XFREE(MTYPE_VECTOR, v); XFREE(MTYPE_VECTOR_INDEX, v->index);
if (v->dynamic)
XFREE(MTYPE_VECTOR, v);
} }
/* Check assigned index, and if it runs short double index pointer */ /* resize vector to a minimum of num
* may resize larger to avoid excessive realloc overhead
*/
void vector_ensure(vector v, unsigned int num) void vector_ensure(vector v, unsigned int num)
{ {
unsigned int newsz;
if (v->alloced > num) if (v->alloced > num)
return; return;
v->index = XREALLOC(MTYPE_VECTOR_INDEX, v->index, newsz = MAX(v->active * 2, num + 1);
sizeof(void *) * (v->alloced * 2));
memset(&v->index[v->alloced], 0, sizeof(void *) * v->alloced);
v->alloced *= 2;
if (v->alloced <= num) if (!v->alloced && v->index) {
vector_ensure(v, num); /* currently using global variable, not malloc'd memory */
void **orig_index = v->index;
v->index = XMALLOC(MTYPE_VECTOR_INDEX, sizeof(void *) * newsz);
memcpy(v->index, orig_index, v->active * sizeof(void *));
v->alloced = v->active;
} else
v->index = XREALLOC(MTYPE_VECTOR_INDEX, v->index,
sizeof(void *) * newsz);
memset(&v->index[v->alloced], 0, sizeof(void *) * (newsz - v->alloced));
v->alloced = newsz;
} }
/* This function only returns next empty slot index. It dose not mean /* This function only returns next empty slot index. It dose not mean
@ -124,7 +139,7 @@ void *vector_lookup_ensure(vector v, unsigned int i)
/* Unset value at specified index slot. */ /* Unset value at specified index slot. */
void vector_unset(vector v, unsigned int i) void vector_unset(vector v, unsigned int i)
{ {
if (i >= v->alloced) if (i >= v->active)
return; return;
if (v->index[i]) if (v->index[i])

21
lib/vector.h
View file

@ -15,9 +15,26 @@ extern "C" {
/* struct for vector */ /* struct for vector */
struct _vector { struct _vector {
unsigned int active; /* number of active slots */ /* active: index of last non-NULL item (+1)
unsigned int alloced; /* number of allocated slot */ * count: number of non-NULL items (+1)
*
* the two will be different if a slot is set to NULL (without pulling
* up later items in the array). Whether this happens depends on
* which vector functions are used. If no empty slots are used, the
* two fields will be identical.
*
* alloced: size of array pointed to by index. If this is 0, index
* points at a global variable rather than a malloc'd bit of memory.
* The vector code will convert to malloc'd memory if necessary to
* perform updates.
*/
unsigned int active;
unsigned int alloced;
unsigned int count; unsigned int count;
/* whether struct _vector itself is dynamically allocated */
bool dynamic;
void **index; /* index to data */ void **index; /* index to data */
}; };
typedef struct _vector *vector; typedef struct _vector *vector;