projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use gsl_finite from GSL, which is portable, instead of isfinite, which
[pspp-builds.git]
/
src
/
libpspp
/
hash.c
diff --git
a/src/libpspp/hash.c
b/src/libpspp/hash.c
index 0d1bab97b0fa730b1f8b983de00fd920e896f10f..71bcd0f14f331f8eb1c07d5478bc46c029ee71de 100644
(file)
--- a/
src/libpspp/hash.c
+++ b/
src/libpspp/hash.c
@@
-31,6
+31,8
@@
#include "compiler.h"
#include "misc.h"
#include "str.h"
#include "compiler.h"
#include "misc.h"
#include "str.h"
+#include "pool.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-149,7
+151,7
@@
struct hsh_table
size_t size; /* Number of entries (a power of 2). */
void **entries; /* Hash table proper. */
size_t size; /* Number of entries (a power of 2). */
void **entries; /* Hash table proper. */
-
void *aux;
/* Auxiliary data for comparison functions. */
+
const void *aux;
/* Auxiliary data for comparison functions. */
hsh_compare_func *compare;
hsh_hash_func *hash;
hsh_free_func *free;
hsh_compare_func *compare;
hsh_hash_func *hash;
hsh_free_func *free;
@@
-159,15
+161,27
@@
struct hsh_table
so that most hsh_*() functions may no longer be called. */
bool hash_ordered;
#endif
so that most hsh_*() functions may no longer be called. */
bool hash_ordered;
#endif
+
+ struct pool *pool; /* The pool used for this hash table */
};
};
+struct hsh_table *
+hsh_create (int size, hsh_compare_func *compare, hsh_hash_func *hash,
+ hsh_free_func *free, const void *aux)
+{
+ return hsh_create_pool (NULL, size, compare, hash, free, aux);
+}
+
+
+
/* Creates a hash table with at least M entries. COMPARE is a
function that compares two entries and returns 0 if they are
identical, nonzero otherwise; HASH returns a nonnegative hash value
for an entry; FREE destroys an entry. */
struct hsh_table *
/* Creates a hash table with at least M entries. COMPARE is a
function that compares two entries and returns 0 if they are
identical, nonzero otherwise; HASH returns a nonnegative hash value
for an entry; FREE destroys an entry. */
struct hsh_table *
-hsh_create (int size, hsh_compare_func *compare, hsh_hash_func *hash,
- hsh_free_func *free, void *aux)
+hsh_create_pool (struct pool *pool, int size,
+ hsh_compare_func *compare, hsh_hash_func *hash,
+ hsh_free_func *free, const void *aux)
{
struct hsh_table *h;
int i;
{
struct hsh_table *h;
int i;
@@
-175,12
+189,13
@@
hsh_create (int size, hsh_compare_func *compare, hsh_hash_func *hash,
assert (compare != NULL);
assert (hash != NULL);
assert (compare != NULL);
assert (hash != NULL);
- h = xmalloc (sizeof *h);
+ h = pool_malloc (pool, sizeof *h);
+ h->pool = pool;
h->used = 0;
if (size < 4)
size = 4;
h->size = next_power_of_2 (size);
h->used = 0;
if (size < 4)
size = 4;
h->size = next_power_of_2 (size);
- h->entries =
xnmalloc (
h->size, sizeof *h->entries);
+ h->entries =
pool_nmalloc (pool,
h->size, sizeof *h->entries);
for (i = 0; i < h->size; i++)
h->entries[i] = NULL;
h->aux = aux;
for (i = 0; i < h->size; i++)
h->entries[i] = NULL;
h->aux = aux;
@@
-227,8
+242,8
@@
hsh_destroy (struct hsh_table *h)
for (i = 0; i < h->size; i++)
if (h->entries[i] != NULL)
h->free (h->entries[i], h->aux);
for (i = 0; i < h->size; i++)
if (h->entries[i] != NULL)
h->free (h->entries[i], h->aux);
-
free (
h->entries);
-
free (
h);
+
pool_free (h->pool,
h->entries);
+
pool_free (h->pool,
h);
}
}
}
}
@@
-289,7
+304,7
@@
rehash (struct hsh_table *h, size_t new_size)
end = begin + h->size;
h->size = new_size;
end = begin + h->size;
h->size = new_size;
- h->entries =
xnmalloc (
h->size, sizeof *h->entries);
+ h->entries =
pool_nmalloc (h->pool,
h->size, sizeof *h->entries);
for (i = 0; i < h->size; i++)
h->entries[i] = NULL;
for (table_p = begin; table_p < end; table_p++)
for (i = 0; i < h->size; i++)
h->entries[i] = NULL;
for (table_p = begin; table_p < end; table_p++)
@@
-298,7
+313,7
@@
rehash (struct hsh_table *h, size_t new_size)
if (entry != NULL)
h->entries[locate_empty_entry (h, entry)] = entry;
}
if (entry != NULL)
h->entries[locate_empty_entry (h, entry)] = entry;
}
-
free (
begin);
+
pool_free (h->pool,
begin);
#ifndef NDEBUG
h->hash_ordered = true;
#ifndef NDEBUG
h->hash_ordered = true;
@@
-308,7
+323,7
@@
rehash (struct hsh_table *h, size_t new_size)
/* A "algo_predicate_func" that returns true if DATA points
to a non-null void. */
static bool
/* A "algo_predicate_func" that returns true if DATA points
to a non-null void. */
static bool
-not_null (const void *data_, void *aux UNUSED)
+not_null (const void *data_,
const
void *aux UNUSED)
{
void *const *data = data_;
{
void *const *data = data_;
@@
-350,11
+365,11
@@
hsh_data (struct hsh_table *h)
/* Dereferences void ** pointers and passes them to the hash
comparison function. */
static int
/* Dereferences void ** pointers and passes them to the hash
comparison function. */
static int
-comparison_helper (const void *a_, const void *b_, void *h_)
+comparison_helper (const void *a_, const void *b_,
const
void *h_)
{
void *const *a = a_;
void *const *b = b_;
{
void *const *a = a_;
void *const *b = b_;
- struct hsh_table *h = h_;
+
const
struct hsh_table *h = h_;
assert(a);
assert(b);
assert(a);
assert(b);
@@
-406,7
+421,7
@@
hsh_data_copy (struct hsh_table *h)
void **copy;
assert (h != NULL);
void **copy;
assert (h != NULL);
- copy =
xnmalloc (
(h->used + 1), sizeof *copy);
+ copy =
pool_nmalloc (h->pool,
(h->used + 1), sizeof *copy);
copy_if (h->entries, h->size, sizeof *h->entries, copy, not_null, NULL);
copy[h->used] = NULL;
return copy;
copy_if (h->entries, h->size, sizeof *h->entries, copy, not_null, NULL);
copy[h->used] = NULL;
return copy;