luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nghash cleanup, struct forward declarations

This commit is contained in:
rlar 2011-07-17 09:51:48 +00:00
parent 5942a11a50
commit 2aa778552f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/include/hash.h
View File

@ -31,14 +31,19 @@ typedef struct ngtable_rec {
struct ngtable_rec *thread_prev ; /* thread thru entire table */ struct ngtable_rec *thread_prev ; /* thread thru entire table */
} NGTABLEBOX, *NGTABLEPTR ; } NGTABLEBOX, *NGTABLEPTR ;
typedef struct nghashbox { struct nghashbox;
typedef unsigned int (*nghash_func)(struct nghashbox *, void *) ;
typedef int (*COMPARE_FUNC)(void *,void *) ;
struct nghashbox {
NGTABLEPTR *hash_table ; NGTABLEPTR *hash_table ;
NGTABLEPTR thread ; /* thread of hash table */ NGTABLEPTR thread ; /* thread of hash table */
NGTABLEPTR last_entry ; /* last entry into hash table */ NGTABLEPTR last_entry ; /* last entry into hash table */
NGTABLEPTR enumeratePtr ; /* used to enumerate hash table */ NGTABLEPTR enumeratePtr ; /* used to enumerate hash table */
NGTABLEPTR searchPtr ; /* used for find again mechanism */ NGTABLEPTR searchPtr ; /* used for find again mechanism */
void *compare_func ; /* the comparison function */ void *compare_func ; /* the comparison function */
void *hash_func ; /* the hash function */ nghash_func hash_func ; /* the hash function */
double growth_factor ; /* how much to grow table by */ double growth_factor ; /* how much to grow table by */
int size ; /* the size of the table */ int size ; /* the size of the table */
int max_density ; /* maximum number of entries before growth */ int max_density ; /* maximum number of entries before growth */
@ -49,7 +54,9 @@ typedef struct nghashbox {
unsigned int power_of_two : 8 ; /* build table as a power of two */ unsigned int power_of_two : 8 ; /* build table as a power of two */
unsigned int call_from_free : 8 ;/* true if in a free calling sequence */ unsigned int call_from_free : 8 ;/* true if in a free calling sequence */
unsigned int unique : 16 ; /* true if only one unique item in col. list */ unsigned int unique : 16 ; /* true if only one unique item in col. list */
} NGHASHBOX, *NGHASHPTR ; };
typedef struct nghashbox NGHASHBOX, *NGHASHPTR;
/* ----------------------------------------------------------------- /* -----------------------------------------------------------------
* This enumerated type is used to control the base hash function types * This enumerated type is used to control the base hash function types
@ -69,8 +76,6 @@ typedef enum {
NGHASH_UNIQUE_TWO = NGHASH_UNIQUE | NGHASH_POWER_OF_TWO NGHASH_UNIQUE_TWO = NGHASH_UNIQUE | NGHASH_POWER_OF_TWO
} NGHASHFLAGS_T ; } NGHASHFLAGS_T ;
typedef unsigned int (*nghash_func)(NGHASHPTR,void *) ;
typedef struct nghash_iter_rec { typedef struct nghash_iter_rec {
struct ngtable_rec *position ; struct ngtable_rec *position ;

1
src/misc/hash.c
View File

@ -32,7 +32,6 @@ REVISIONS:
/* ********************** TYPE DEFINITIONS ************************* */ /* ********************** TYPE DEFINITIONS ************************* */
#define PRIMECOUNT 200 #define PRIMECOUNT 200
#define MINPRIMESIZE 7 #define MINPRIMESIZE 7
typedef int (*COMPARE_FUNC)(void *,void *) ;
/* ********************** STATIC DEFINITIONS ************************* */ /* ********************** STATIC DEFINITIONS ************************* */
static NGTABLEPTR _nghash_find_item(NGHASHPTR hhtable,void *user_key,void *data) ; static NGTABLEPTR _nghash_find_item(NGHASHPTR hhtable,void *user_key,void *data) ;