| 28 |
|
}; |
| 29 |
|
register int *hsp; |
| 30 |
|
|
| 31 |
< |
nel += nel>>2; /* 75% occupancy */ |
| 31 |
> |
nel += nel>>1; /* 66% occupancy */ |
| 32 |
|
for (hsp = hsiztab; *hsp; hsp++) |
| 33 |
|
if (*hsp > nel) |
| 34 |
|
break; |
| 37 |
|
tbl->tabl = (LUENT *)calloc(tbl->tsiz, sizeof(LUENT)); |
| 38 |
|
if (tbl->tabl == NULL) |
| 39 |
|
tbl->tsiz = 0; |
| 40 |
+ |
tbl->ndel = 0; |
| 41 |
|
return(tbl->tsiz); |
| 42 |
|
} |
| 43 |
|
|
| 44 |
|
|
| 45 |
< |
int |
| 46 |
< |
lu_hash(s) /* hash a nul-terminated string */ |
| 45 |
> |
long |
| 46 |
> |
lu_shash(s) /* hash a nul-terminated string */ |
| 47 |
|
register char *s; |
| 48 |
|
{ |
| 49 |
< |
register int h = 0; |
| 49 |
> |
register int i = 0; |
| 50 |
> |
register long h = 0; |
| 51 |
|
|
| 52 |
|
while (*s) |
| 53 |
< |
h = (h<<1 & 0x7fff) ^ (*s++ & 0xff); |
| 53 |
> |
h ^= (long)(*s++ & 0xff) << (i++ & 0xf); |
| 54 |
|
return(h); |
| 55 |
|
} |
| 56 |
|
|
| 60 |
|
register LUTAB *tbl; |
| 61 |
|
char *key; |
| 62 |
|
{ |
| 63 |
< |
int hval, i; |
| 64 |
< |
register int ndx; |
| 65 |
< |
register LUENT *le; |
| 66 |
< |
LUENT *oldtabl; |
| 63 |
> |
long hval; |
| 64 |
> |
int i; |
| 65 |
> |
register int ndx; |
| 66 |
> |
register LUENT *oldtabl; |
| 67 |
|
/* look up object */ |
| 68 |
< |
hval = lu_hash(key); |
| 68 |
> |
hval = (*tbl->hashf)(key); |
| 69 |
|
tryagain: |
| 70 |
|
for (i = 0; i < tbl->tsiz; i++) { |
| 71 |
|
ndx = (hval + i*i) % tbl->tsiz; |
| 72 |
< |
if (tbl->tabl[ndx].key == NULL || |
| 73 |
< |
!strcmp(tbl->tabl[ndx].key, key)) |
| 72 |
> |
if (tbl->tabl[ndx].key == NULL) { |
| 73 |
> |
tbl->tabl[ndx].hval = hval; |
| 74 |
|
return(&tbl->tabl[ndx]); |
| 75 |
+ |
} |
| 76 |
+ |
if ( tbl->tabl[ndx].hval == hval && (tbl->keycmp == NULL || |
| 77 |
+ |
!(*tbl->keycmp)(tbl->tabl[ndx].key, key)) ) |
| 78 |
+ |
return(&tbl->tabl[ndx]); |
| 79 |
|
} |
| 80 |
|
/* table is full, reallocate */ |
| 81 |
|
oldtabl = tbl->tabl; |
| 82 |
|
ndx = tbl->tsiz; |
| 83 |
< |
if (!lu_init(tbl, ndx)) { /* no more memory! */ |
| 83 |
> |
i = tbl->ndel; |
| 84 |
> |
if (!lu_init(tbl, ndx-i+1)) { /* no more memory! */ |
| 85 |
|
tbl->tabl = oldtabl; |
| 86 |
|
tbl->tsiz = ndx; |
| 87 |
+ |
tbl->ndel = i; |
| 88 |
|
return(NULL); |
| 89 |
|
} |
| 90 |
|
if (!ndx) |
| 91 |
|
goto tryagain; |
| 92 |
+ |
/* |
| 93 |
+ |
* The following code may fail if the user has reclaimed many |
| 94 |
+ |
* deleted entries and the system runs out of memory in a |
| 95 |
+ |
* recursive call to lu_find(). |
| 96 |
+ |
*/ |
| 97 |
|
while (ndx--) |
| 98 |
< |
if (oldtabl[ndx].key != NULL) { |
| 99 |
< |
le = lu_find(tbl, oldtabl[ndx].key); |
| 100 |
< |
le->key = oldtabl[ndx].key; |
| 101 |
< |
le->data = oldtabl[ndx].data; |
| 102 |
< |
} |
| 98 |
> |
if (oldtabl[ndx].key != NULL) |
| 99 |
> |
if (oldtabl[ndx].data != NULL) |
| 100 |
> |
*lu_find(tbl, oldtabl[ndx].key) = oldtabl[ndx]; |
| 101 |
> |
else if (tbl->freek != NULL) |
| 102 |
> |
(*tbl->freek)(oldtabl[ndx].key); |
| 103 |
|
free((MEM_PTR)oldtabl); |
| 104 |
|
goto tryagain; /* should happen only once! */ |
| 105 |
|
} |
| 106 |
|
|
| 107 |
|
|
| 108 |
|
void |
| 109 |
< |
lu_done(tbl, f) /* free table and contents */ |
| 110 |
< |
LUTAB *tbl; |
| 111 |
< |
int (*f)(); |
| 109 |
> |
lu_delete(tbl, key) /* delete a table entry */ |
| 110 |
> |
register LUTAB *tbl; |
| 111 |
> |
char *key; |
| 112 |
|
{ |
| 113 |
+ |
register LUENT *le; |
| 114 |
+ |
|
| 115 |
+ |
if ((le = lu_find(tbl, key)) == NULL) |
| 116 |
+ |
return; |
| 117 |
+ |
if (le->key == NULL || le->data == NULL) |
| 118 |
+ |
return; |
| 119 |
+ |
if (tbl->freed != NULL) |
| 120 |
+ |
(*tbl->freed)(le->data); |
| 121 |
+ |
le->data = NULL; |
| 122 |
+ |
tbl->ndel++; |
| 123 |
+ |
} |
| 124 |
+ |
|
| 125 |
+ |
|
| 126 |
+ |
void |
| 127 |
+ |
lu_done(tbl) /* free table and contents */ |
| 128 |
+ |
register LUTAB *tbl; |
| 129 |
+ |
{ |
| 130 |
|
register LUENT *tp; |
| 131 |
|
|
| 132 |
|
if (!tbl->tsiz) |
| 133 |
|
return; |
| 134 |
< |
if (f != NULL) |
| 135 |
< |
for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; ) |
| 136 |
< |
if (tp->key != NULL) |
| 137 |
< |
(*f)(tp); |
| 134 |
> |
for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; ) |
| 135 |
> |
if (tp->key != NULL) { |
| 136 |
> |
if (tbl->freek != NULL) |
| 137 |
> |
(*tbl->freek)(tp->key); |
| 138 |
> |
if (tp->data != NULL && tbl->freed != NULL) |
| 139 |
> |
(*tbl->freed)(tp->data); |
| 140 |
> |
} |
| 141 |
|
free((MEM_PTR)tbl->tabl); |
| 142 |
|
tbl->tabl = NULL; |
| 143 |
|
tbl->tsiz = 0; |
| 144 |
+ |
tbl->ndel = 0; |
| 145 |
|
} |
