lib: keep element count in vector code

... to speed up vector_empty_slot() among other things.

Behavior should be 100% identical to previous.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/lib/vector.c b/lib/vector.c
index 4af564a82ff8de47b4cce02a3f12dbf3fba7b9b1..38f9b1b85fd43a379654a10392bf6b5a21cedb13 100644 (file)
--- a/lib/vector.c
+++ b/lib/vector.c
@@ -37,6 +37,7 @@ vector vector_init(unsigned int size)
 
        v->alloced = size;
        v->active = 0;
+       v->count = 0;
        v->index = XCALLOC(MTYPE_VECTOR_INDEX, sizeof(void *) * size);
        return v;
 }
@@ -54,6 +55,7 @@ vector vector_copy(vector v)
 
        new->active = v->active;
        new->alloced = v->alloced;
+       new->count = v->count;
 
        size = sizeof(void *) * (v->alloced);
        new->index = XCALLOC(MTYPE_VECTOR_INDEX, size);
@@ -84,6 +86,9 @@ int vector_empty_slot(vector v)
 {
        unsigned int i;
 
+       if (v->active == v->count)
+               return v->active;
+
        if (v->active == 0)
                return 0;
 
@@ -102,6 +107,10 @@ int vector_set(vector v, void *val)
        i = vector_empty_slot(v);
        vector_ensure(v, i);
 
+       if (v->index[i])
+               v->count--;
+       if (val)
+               v->count++;
        v->index[i] = val;
 
        if (v->active <= i)
@@ -115,6 +124,10 @@ int vector_set_index(vector v, unsigned int i, void *val)
 {
        vector_ensure(v, i);
 
+       if (v->index[i])
+               v->count--;
+       if (val)
+               v->count++;
        v->index[i] = val;
 
        if (v->active <= i)
@@ -155,6 +168,9 @@ void vector_unset(vector v, unsigned int i)
        if (i >= v->alloced)
                return;
 
+       if (v->index[i])
+               v->count--;
+
        v->index[i] = NULL;
 
        if (i + 1 == v->active) {
@@ -169,6 +185,9 @@ void vector_remove(vector v, unsigned int ix)
        if (ix >= v->active)
                return;
 
+       if (v->index[ix])
+               v->count--;
+
        int n = (--v->active) - ix;
 
        memmove(&v->index[ix], &v->index[ix + 1], n * sizeof(void *));
@@ -192,6 +211,7 @@ void vector_unset_value(vector v, void *val)
        for (i = 0; i < v->active; i++)
                if (v->index[i] == val) {
                        v->index[i] = NULL;
+                       v->count--;
                        break;
                }
 
@@ -201,19 +221,6 @@ void vector_unset_value(vector v, void *val)
                while (i && v->index[--i] == NULL);
 }
 
-/* Count the number of not emplty slot. */
-unsigned int vector_count(vector v)
-{
-       unsigned int i;
-       unsigned count = 0;
-
-       for (i = 0; i < v->active; i++)
-               if (v->index[i] != NULL)
-                       count++;
-
-       return count;
-}
-
 void vector_to_array(vector v, void ***dest, int *argc)
 {
        *dest = XCALLOC(MTYPE_TMP, sizeof(void *) * v->active);

diff --git a/lib/vector.h b/lib/vector.h
index 845c8d8b04ef62f9f626385e1dfb7f783d2a26a5..6208be1cc7f1e324044f7f3beb922fb03a97bcc1 100644 (file)
--- a/lib/vector.h
+++ b/lib/vector.h
@@ -32,6 +32,7 @@ extern "C" {
 struct _vector {
        unsigned int active;  /* number of active slots */
        unsigned int alloced; /* number of allocated slot */
+       unsigned int count;
        void **index;    /* index to data */
 };
 typedef struct _vector *vector;
@@ -60,7 +61,11 @@ extern void vector_unset_value(vector v, void *val);
 extern void vector_remove(vector v, unsigned int ix);
 extern void vector_compact(vector v);
 
-extern unsigned int vector_count(vector v);
+static inline unsigned int vector_count(vector v)
+{
+       return v->count;
+}
+
 extern void vector_free(vector v);
 extern vector vector_copy(vector v);