/* $Id$ */
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
#endif
/* bcopy is not ISO C *
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include "misc.h"
#include "xmalloc.h"
#ifdef PSET
# include "pset.h"
typedef struct element {
- struct element *chain; /* for chaining Elements */
+ struct element *chain; /**< for chaining Elements */
MANGLEP (entry) entry;
} Element, *Segment;
struct SET {
- short p; /* Next bucket to be split */
- short maxp; /* upper bound on p during expansion */
- int nkey; /* current # keys */
- short nseg; /* current # segments */
+ unsigned p; /**< Next bucket to be split */
+ unsigned maxp; /**< upper bound on p during expansion */
+ unsigned nkey; /**< current # keys */
+ unsigned nseg; /**< current # segments */
Segment *dir[DIRECTORY_SIZE];
- MANGLEP(cmp_fun) cmp; /* function comparing entries */
- int iter_i, iter_j;
- Element *iter_tail; /* non-NULL while iterating over elts */
+ MANGLEP(cmp_fun) cmp; /**< function comparing entries */
+ unsigned iter_i, iter_j;
+ Element *iter_tail; /**< non-NULL while iterating over elts */
#ifdef PSET
- Element *free_list; /* list of free Elements */
+ Element *free_list; /**< list of free Elements */
#endif
- struct obstack obst; /* obstack for allocation all data */
+ struct obstack obst; /**< obstack for allocation all data */
#ifdef STATS
int naccess, ncollision, ndups;
int max_chain_len;
#endif
#ifdef DEBUG
- const char *tag;
+ const char *tag; /**< an optionally tag for distinguishing sets */
#endif
};
const char *MANGLEP(tag);
-static void
+void
MANGLEP(describe) (SET *table)
{
- int i, j, collide;
+ unsigned i, j, collide;
Element *ptr;
Segment *seg;
- printf ("p=%d maxp=%d nkey=%d nseg=%d\n",
+ printf ("p=%u maxp=%u nkey=%u nseg=%u\n",
table->p, table->maxp, table->nkey, table->nseg);
for (i = 0; i < table->nseg; i++) {
seg = table->dir[i];
while (ptr) {
if (collide) printf ("<%3d>", collide);
else printf ("table");
- printf ("[%d][%3d]: %u %p\n", i, j, ptr->entry.hash, ptr->entry.dptr);
+ printf ("[%d][%3d]: %u %p\n", i, j, ptr->entry.hash, (void *)ptr->entry.dptr);
ptr = ptr->chain;
collide++;
}
}
}
+#ifdef STATS
+ MANGLEP(stats)(table);
+#endif
}
#endif /* !DEBUG */
(PMANGLE(new)) (MANGLEP(cmp_fun) cmp, int nslots)
{
int i;
- SET *table = xmalloc (sizeof (SET));
-
- /* Adjust nslots up to next power of 2, minimum SEGMENT_SIZE */
- assert (nslots >= 0);
- for (i = SEGMENT_SIZE; i < nslots; i <<= 1) assert (i < (i << 1));
- nslots = i >> SEGMENT_SIZE_SHIFT;
+ SET *table = xmalloc(sizeof(*table));
+
+ if (nslots > SEGMENT_SIZE * DIRECTORY_SIZE)
+ nslots = DIRECTORY_SIZE;
+ else {
+ assert (nslots >= 0);
+ /* Adjust nslots up to next power of 2, minimum SEGMENT_SIZE */
+ for (i = SEGMENT_SIZE; i < nslots; i <<= 1);
+ nslots = i >> SEGMENT_SIZE_SHIFT;
+ }
table->nseg = table->p = table->nkey = 0;
table->maxp = nslots << SEGMENT_SIZE_SHIFT;
Hash (SET *table, unsigned h)
{
unsigned address;
-
address = h & (table->maxp - 1); /* h % table->maxp */
if (address < (unsigned)table->p)
address = h & ((table->maxp << 1) - 1); /* h % (2*table->maxp) */
(Segment *)obstack_alloc (&table->obst,
sizeof(Segment) * SEGMENT_SIZE);
memset(table->dir[NewSegmentDir], 0, sizeof(Segment) * SEGMENT_SIZE);
+ table->nseg++;
}
NewSegment = table->dir[NewSegmentDir];
table->maxp <<= 1; /* table->maxp *= 2 */
table->p = 0;
}
- table->nseg++;
/* Relocate records to the new bucket */
Previous = &OldSegment[OldSegmentIndex];
int chain_len = 0;
assert (table);
- assert (!table->iter_tail);
assert (key);
#ifdef DEBUG
MANGLEP(tag) = table->tag;
stat_chain_len (table, chain_len);
if (!q && (action != MANGLE(_,_find))) { /* not found, insert */
+ assert (!table->iter_tail && "insert an element into a set that is iterated");
+
if (CurrentSegment[SegmentIndex]) stat_dup (table);
#ifdef PSET
#ifdef PSET
+int pset_default_ptr_cmp(const void *x, const void *y)
+{
+ return x != y;
+}
+
void *
pset_remove (SET *table, const void *key, unsigned hash)
{
return pset_hinsert (se, key, hash);
}
+void pset_insert_pset_ptr(pset *target, pset *src) {
+ void *elt;
+ for (elt = pset_first(src); elt; elt = pset_next(src)) {
+ pset_insert_ptr(target, elt);
+ }
+}
+
#else /* !PSET */
void *