Strip directory from #include when it's not needed.

[nmh] / sbr / vector.c

diff --git a/sbr/vector.c b/sbr/vector.c
index 1167fa246e15d4d8024d094913814685361152f5..d0ebc33667c43c5fd18e8de2a1197d46a0b2c2c7 100644 (file)
--- a/sbr/vector.c
+++ b/sbr/vector.c
@@ -16,11 +16,17 @@
  * can be as large as needed, as long as it fits in (virtual) memory.
  */
 
  * can be as large as needed, as long as it fits in (virtual) memory.
  */
 

-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "h/utils.h"

 
 

+/* The default size of a struct bvector's bits, measured in bits.
+ * The struct's tiny member is used for storage. */

 #define BVEC_INIT_SIZE (sizeof *(((bvector_t)NULL)->tiny) * CHAR_BIT)
 #define BVEC_INIT_SIZE (sizeof *(((bvector_t)NULL)->tiny) * CHAR_BIT)

+
+/* The default number of char pointers in a struct svector. */

 #define SVEC_INIT_SIZE 256
 #define SVEC_INIT_SIZE 256

+
+/* The default number of ints in a struct ivector. */

 #define IVEC_INIT_SIZE 256
 
 /*
 #define IVEC_INIT_SIZE 256
 
 /*


@@ -29,82 +35,93 @@
  * constants in the code below must also be changed to a 1 that's at
  * least as wide as the new type.
  */
  * constants in the code below must also be changed to a 1 that's at
  * least as wide as the new type.
  */

-#define BVEC_SIZEOF_BITS (sizeof *(((bvector_t)NULL)->bits))
-#define BVEC_WORD(max) ((max) / (BVEC_SIZEOF_BITS * CHAR_BIT))
-#define BVEC_OFFSET(max) ((max) % (BVEC_SIZEOF_BITS * CHAR_BIT))
-#define BVEC_BYTES(n) \
-    ((BVEC_WORD(n) + (BVEC_OFFSET(n) == 0 ? 0 : 1)) * BVEC_SIZEOF_BITS)

 
 

-struct bvector {
-    unsigned long *bits;
-    size_t maxsize;
-    unsigned long tiny[2];
-};
-
-static void bvector_resize (bvector_t, size_t);
+/* The *sizeof* struct bvector's bits member.  Not its size in bits. */
+#define BVEC_SIZEOF_BITS (sizeof *(((bvector_t)NULL)->bits))
+/* The number of bits held in one element of the bits member. */
+#define BVEC_BITS_BITS (BVEC_SIZEOF_BITS * CHAR_BIT)
+/* The index of bit n in struct bvector's bits member. */
+#define BVEC_WORD(n) ((n) / BVEC_BITS_BITS)
+/* The index of bit n within a single struct bvector's bits member. */
+#define BVEC_OFFSET(n) ((n) % BVEC_BITS_BITS)
+/* The number of elements bits needs to cover bit n, measured in bytes. */
+#define BVEC_BYTES(n) (((n) / BVEC_BITS_BITS + 1) * BVEC_SIZEOF_BITS)
+
+/* bvector_resize ensures the storage used for bits can cover bit
+ * newsize.  It always increases the size of the storage used for bits,
+ * even if newsize would have been covered by the existing storage.
+ * Thus it's normally only called when it's known the storage must grow. */
+static void bvector_resize (bvector_t vec, size_t newsize);

 
 bvector_t
 
 bvector_t

-bvector_create (size_t init_size) {
+bvector_create (void)
+{

     bvector_t vec;
     bvector_t vec;

-    size_t bytes;

 
     /* See "wider than unsigned long" comment above. */
     assert (sizeof *vec->bits <= sizeof 1ul);
 
     NEW(vec);
 
     /* See "wider than unsigned long" comment above. */
     assert (sizeof *vec->bits <= sizeof 1ul);
 
     NEW(vec);

-
-    if (init_size <= BVEC_INIT_SIZE) {
-        vec->bits = vec->tiny;
-        vec->maxsize = BVEC_INIT_SIZE;
-        memset(vec->tiny, 0, sizeof vec->tiny);
-        return vec;
-    }
-
-    bytes = BVEC_BYTES(init_size);
-    vec->bits = mh_xcalloc (1, bytes);
-    vec->maxsize = bytes * CHAR_BIT;
+    bvector_init(vec);

 
     return vec;
 }
 
 void
 
     return vec;
 }
 
 void

-bvector_copy (bvector_t dest, bvector_t src) {
+bvector_init(struct bvector *bv)
+{
+    bv->bits = bv->tiny;
+    bv->maxsize = BVEC_INIT_SIZE;
+    memset(bv->tiny, 0, sizeof bv->tiny);
+}
+
+void
+bvector_copy (bvector_t dest, bvector_t src)
+{

     size_t bytes = BVEC_BYTES(src->maxsize);
 
     if (dest->bits != dest->tiny)
         free(dest->bits);
     size_t bytes = BVEC_BYTES(src->maxsize);
 
     if (dest->bits != dest->tiny)
         free(dest->bits);

-    dest->bits = mh_xmalloc (bytes);
+    if (bytes <= sizeof dest->tiny)
+        dest->bits = dest->tiny;
+    else
+        dest->bits = mh_xmalloc (bytes);

     memcpy (dest->bits, src->bits, bytes);
     dest->maxsize = src->maxsize;
 }
 
 void
     memcpy (dest->bits, src->bits, bytes);
     dest->maxsize = src->maxsize;
 }
 
 void

-bvector_free (bvector_t vec) {
-    if (vec->bits != vec->tiny)
-        free(vec->bits);
+bvector_free (bvector_t vec)
+{
+    bvector_fini(vec);

     free (vec);
 }
 
 void
     free (vec);
 }
 
 void

-bvector_clear (bvector_t vec, size_t n) {
-    size_t word = BVEC_WORD(n);
-    size_t offset = BVEC_OFFSET(n);
-
-    if (n >= vec->maxsize)
-        bvector_resize (vec, n);
+bvector_fini(struct bvector *bv)
+{
+    if (bv->bits != bv->tiny)
+        free(bv->bits);
+}

 
 

-    vec->bits[word] &= ~(1ul << offset);
+void
+bvector_clear (bvector_t vec, size_t n)
+{
+    if (n < vec->maxsize)
+        vec->bits[BVEC_WORD(n)] &= ~(1ul << BVEC_OFFSET(n));

 }
 
 
 void
 }
 
 
 void

-bvector_clear_all (bvector_t vec) {
+bvector_clear_all (bvector_t vec)
+{

     memset (vec->bits, 0, BVEC_BYTES(vec->maxsize));
 }
 
 
 void
     memset (vec->bits, 0, BVEC_BYTES(vec->maxsize));
 }
 
 
 void

-bvector_set (bvector_t vec, size_t n) {
+bvector_set (bvector_t vec, size_t n)
+{

     size_t word = BVEC_WORD(n);
     size_t offset = BVEC_OFFSET(n);
 
     size_t word = BVEC_WORD(n);
     size_t offset = BVEC_OFFSET(n);
 


@@ -114,22 +131,21 @@ bvector_set (bvector_t vec, size_t n) {
 }
 
 unsigned int
 }
 
 unsigned int

-bvector_at (bvector_t vec, size_t i) {
-    size_t word = BVEC_WORD(i);
-    size_t offset = BVEC_OFFSET(i);
+bvector_at (bvector_t vec, size_t i)
+{
+    if (i < vec->maxsize)
+        return !!(vec->bits[BVEC_WORD(i)] & (1ul << BVEC_OFFSET(i)));

 
 

-    return i < vec->maxsize
-        ?  (vec->bits[word] & (1ul << offset) ? 1 : 0)
-        :  0;
+    return 0;

 }
 
 static void
 }
 
 static void

-bvector_resize (bvector_t vec, size_t maxsize) {
-    size_t old_maxsize = vec->maxsize;
+bvector_resize (bvector_t vec, size_t newsize)
+{
+    size_t oldsize = vec->maxsize;

     size_t bytes;
     size_t bytes;

-    size_t i;

 
 

-    while ((vec->maxsize *= 2) < maxsize)
+    while ((vec->maxsize *= 2) < newsize)

         ;
     bytes = BVEC_BYTES(vec->maxsize);
     if (vec->bits == vec->tiny) {
         ;
     bytes = BVEC_BYTES(vec->maxsize);
     if (vec->bits == vec->tiny) {


@@ -137,12 +153,14 @@ bvector_resize (bvector_t vec, size_t maxsize) {
         memcpy(vec->bits, vec->tiny, sizeof vec->tiny);
     } else
         vec->bits = mh_xrealloc(vec->bits, bytes);
         memcpy(vec->bits, vec->tiny, sizeof vec->tiny);
     } else
         vec->bits = mh_xrealloc(vec->bits, bytes);

-    for (i = old_maxsize; i < vec->maxsize; ++i)
-        bvector_clear (vec, i);
+
+    memset(vec->bits + (oldsize / BVEC_BITS_BITS), 0,
+        (vec->maxsize - oldsize) / CHAR_BIT);

 }
 
 unsigned long
 }
 
 unsigned long

-bvector_first_bits (bvector_t vec) {
+bvector_first_bits (bvector_t vec)
+{

     return *vec->bits;
 }
 
     return *vec->bits;
 }
 


@@ -156,7 +174,8 @@ struct svector {
 static void svector_resize (svector_t, size_t);
 
 svector_t
 static void svector_resize (svector_t, size_t);
 
 svector_t

-svector_create (size_t init_size) {
+svector_create (size_t init_size)
+{

     svector_t vec;
     size_t bytes;
 
     svector_t vec;
     size_t bytes;
 


@@ -170,20 +189,23 @@ svector_create (size_t init_size) {
 }
 
 void
 }
 
 void

-svector_free (svector_t vec) {
+svector_free (svector_t vec)
+{

     free (vec->strs);
     free (vec);
 }
 
 char *
     free (vec->strs);
     free (vec);
 }
 
 char *

-svector_push_back (svector_t vec, char *s) {
+svector_push_back (svector_t vec, char *s)
+{

     if (++vec->size >= vec->maxsize)
         svector_resize (vec, vec->size);
     return vec->strs[vec->size-1] = s;
 }
 
 char *
     if (++vec->size >= vec->maxsize)
         svector_resize (vec, vec->size);
     return vec->strs[vec->size-1] = s;
 }
 
 char *

-svector_at (svector_t vec, size_t i) {
+svector_at (svector_t vec, size_t i)
+{

     if (i >= vec->maxsize)
         svector_resize (vec, i);
     return vec->strs[i];
     if (i >= vec->maxsize)
         svector_resize (vec, i);
     return vec->strs[i];


@@ -194,7 +216,8 @@ svector_at (svector_t vec, size_t i) {
  * The caller can replace the contents of the return address.
  */
 char **
  * The caller can replace the contents of the return address.
  */
 char **

-svector_find (svector_t vec, const char *s) {
+svector_find (svector_t vec, const char *s)
+{

     size_t i;
     char **str = vec->strs;
 
     size_t i;
     char **str = vec->strs;
 


@@ -208,25 +231,27 @@ svector_find (svector_t vec, const char *s) {
 }
 
 char **
 }
 
 char **

-svector_strs (svector_t vec) {
+svector_strs (svector_t vec)
+{

     return vec->strs;
 }
 
 size_t
     return vec->strs;
 }
 
 size_t

-svector_size (svector_t vec) {
+svector_size (svector_t vec)
+{

     return vec->size;
 }
 
 static void
     return vec->size;
 }
 
 static void

-svector_resize (svector_t vec, size_t maxsize) {
+svector_resize (svector_t vec, size_t maxsize)
+{

     size_t old_maxsize = vec->maxsize;
     size_t old_maxsize = vec->maxsize;

-    size_t i;

 
     while ((vec->maxsize *= 2) < maxsize)
         ;
     vec->strs = mh_xrealloc (vec->strs, vec->maxsize * sizeof (char *));
 
     while ((vec->maxsize *= 2) < maxsize)
         ;
     vec->strs = mh_xrealloc (vec->strs, vec->maxsize * sizeof (char *));

-    for (i = old_maxsize; i < vec->maxsize; ++i)
-        vec->strs[i] = NULL;
+    memset(vec->strs + old_maxsize, 0,
+        (vec->maxsize - old_maxsize) * sizeof *vec->strs);

 }
 
 
 }
 
 


@@ -239,7 +264,8 @@ struct ivector {
 static void ivector_resize (ivector_t, size_t);
 
 ivector_t
 static void ivector_resize (ivector_t, size_t);
 
 ivector_t

-ivector_create (size_t init_size) {
+ivector_create (size_t init_size)
+{

     ivector_t vec;
     size_t bytes;
 
     ivector_t vec;
     size_t bytes;
 


@@ -253,40 +279,44 @@ ivector_create (size_t init_size) {
 }
 
 void
 }
 
 void

-ivector_free (ivector_t vec) {
+ivector_free (ivector_t vec)
+{

     free (vec->ints);
     free (vec);
 }
 
 int
     free (vec->ints);
     free (vec);
 }
 
 int

-ivector_push_back (ivector_t vec, int n) {
+ivector_push_back (ivector_t vec, int n)
+{

     if (++vec->size >= vec->maxsize)
         ivector_resize (vec, vec->size);
     return vec->ints[vec->size-1] = n;
 }
 
 int
     if (++vec->size >= vec->maxsize)
         ivector_resize (vec, vec->size);
     return vec->ints[vec->size-1] = n;
 }
 
 int

-ivector_at (ivector_t vec, size_t i) {
+ivector_at (ivector_t vec, size_t i)
+{

     if (i >= vec->maxsize)
         ivector_resize (vec, i);
     return vec->ints[i];
 }
 
 int *
     if (i >= vec->maxsize)
         ivector_resize (vec, i);
     return vec->ints[i];
 }
 
 int *

-ivector_atp (ivector_t vec, size_t i) {
+ivector_atp (ivector_t vec, size_t i)
+{

     if (i >= vec->maxsize)
         ivector_resize (vec, i);
     return &vec->ints[i];
 }
 
 static void
     if (i >= vec->maxsize)
         ivector_resize (vec, i);
     return &vec->ints[i];
 }
 
 static void

-ivector_resize (ivector_t vec, size_t maxsize) {
+ivector_resize (ivector_t vec, size_t maxsize)
+{

     size_t old_maxsize = vec->maxsize;
     size_t old_maxsize = vec->maxsize;

-    size_t i;

 
     while ((vec->maxsize *= 2) < maxsize)
         ;
     vec->ints = mh_xrealloc (vec->ints, vec->maxsize * sizeof (int));
 
     while ((vec->maxsize *= 2) < maxsize)
         ;
     vec->ints = mh_xrealloc (vec->ints, vec->maxsize * sizeof (int));

-    for (i = old_maxsize; i < vec->maxsize; ++i)
-        vec->ints[i] = 0;
+    memset(vec->ints + old_maxsize, 0,
+        (vec->maxsize - old_maxsize) * sizeof *vec->ints);

 }
 }