Module Name: src
Committed By: rillig
Date: Tue Sep 1 21:11:31 UTC 2020
Modified Files:
src/usr.bin/make: dir.c hash.c hash.h
Log Message:
make(1): rename Hash_Table fields
Back in the 1980s it made sense to have the type information encoded in
the variable names. At the time when make was imported into the NetBSD
tree (1993-03-21), the functions did indeed not have prototypes, they
only had return types. The void type was already invented at that time.
Since the compiler could not verify the types of function parameters, it
made perfect sense to have each variable tell whether it was a pointer
or not.
Since ISO C90 this is no longer necessary since the compiler checks
this. The variable names can now focus on the application level and
their high-level meaning, expressing the relationship to other
variables instead of encoding redundant type information.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/usr.bin/make/dir.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/make/hash.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/hash.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.129 src/usr.bin/make/dir.c:1.130
--- src/usr.bin/make/dir.c:1.129 Tue Sep 1 20:17:18 2020
+++ src/usr.bin/make/dir.c Tue Sep 1 21:11:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.129 2020/09/01 20:17:18 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.130 2020/09/01 21:11:31 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: dir.c,v 1.129 2020/09/01 20:17:18 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.130 2020/09/01 21:11:31 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: dir.c,v 1.129 2020/09/01 20:17:18 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.130 2020/09/01 21:11:31 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -298,7 +298,7 @@ cached_stats(Hash_Table *htp, const char
entry = Hash_FindEntry(htp, pathname);
if (entry && !(flags & CST_UPDATE)) {
- cst = entry->clientPtr;
+ cst = entry->value;
memset(st, 0, sizeof(*st));
st->st_mode = cst->mode;
@@ -319,11 +319,11 @@ cached_stats(Hash_Table *htp, const char
if (!entry)
entry = Hash_CreateEntry(htp, pathname, NULL);
- if (!entry->clientPtr) {
- entry->clientPtr = bmake_malloc(sizeof(*cst));
- memset(entry->clientPtr, 0, sizeof(*cst));
+ if (!entry->value) {
+ entry->value = bmake_malloc(sizeof(*cst));
+ memset(entry->value, 0, sizeof(*cst));
}
- cst = entry->clientPtr;
+ cst = entry->value;
if (flags & CST_LSTAT) {
cst->lmtime = st->st_mtime;
} else {
Index: src/usr.bin/make/hash.c
diff -u src/usr.bin/make/hash.c:1.28 src/usr.bin/make/hash.c:1.29
--- src/usr.bin/make/hash.c:1.28 Fri Aug 28 20:16:19 2020
+++ src/usr.bin/make/hash.c Tue Sep 1 21:11:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.c,v 1.28 2020/08/28 20:16:19 rillig Exp $ */
+/* $NetBSD: hash.c,v 1.29 2020/09/01 21:11:31 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: hash.c,v 1.28 2020/08/28 20:16:19 rillig Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.29 2020/09/01 21:11:31 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: hash.c,v 1.28 2020/08/28 20:16:19 rillig Exp $");
+__RCSID("$NetBSD: hash.c,v 1.29 2020/09/01 21:11:31 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -142,9 +142,9 @@ Hash_InitTable(Hash_Table *t, int numBuc
}
t->numEntries = 0;
t->maxchain = 0;
- t->size = i;
- t->mask = i - 1;
- t->bucketPtr = hp = bmake_malloc(sizeof(*hp) * i);
+ t->bucketsSize = i;
+ t->bucketsMask = i - 1;
+ t->buckets = hp = bmake_malloc(sizeof(*hp) * i);
while (--i >= 0)
*hp++ = NULL;
}
@@ -157,19 +157,19 @@ Hash_DeleteTable(Hash_Table *t)
struct Hash_Entry **hp, *h, *nexth = NULL;
int i;
- for (hp = t->bucketPtr, i = t->size; --i >= 0;) {
+ for (hp = t->buckets, i = t->bucketsSize; --i >= 0;) {
for (h = *hp++; h != NULL; h = nexth) {
nexth = h->next;
free(h);
}
}
- free(t->bucketPtr);
+ free(t->buckets);
/*
* Set up the hash table to cause memory faults on any future access
* attempts until re-initialization.
*/
- t->bucketPtr = NULL;
+ t->buckets = NULL;
}
/* Searches the hash table for an entry corresponding to the key.
@@ -190,7 +190,7 @@ Hash_FindEntry(Hash_Table *t, const char
const char *p;
int chainlen;
- if (t == NULL || t->bucketPtr == NULL) {
+ if (t == NULL || t->buckets == NULL) {
return NULL;
}
HASH(h, key, p);
@@ -201,7 +201,7 @@ Hash_FindEntry(Hash_Table *t, const char
fprintf(debug_file, "%s: %p h=%x key=%s\n", __func__,
t, h, key);
#endif
- for (e = t->bucketPtr[h & t->mask]; e != NULL; e = e->next) {
+ for (e = t->buckets[h & t->bucketsMask]; e != NULL; e = e->next) {
chainlen++;
if (e->namehash == h && strcmp(e->name, p) == 0)
break;
@@ -243,7 +243,7 @@ Hash_CreateEntry(Hash_Table *t, const ch
fprintf(debug_file, "%s: %p h=%x key=%s\n", __func__,
t, h, key);
#endif
- for (e = t->bucketPtr[h & t->mask]; e != NULL; e = e->next) {
+ for (e = t->buckets[h & t->bucketsMask]; e != NULL; e = e->next) {
chainlen++;
if (e->namehash == h && strcmp(e->name, p) == 0) {
if (newPtr != NULL)
@@ -261,10 +261,10 @@ Hash_CreateEntry(Hash_Table *t, const ch
* expand the table if necessary (and this changes the resulting
* bucket chain).
*/
- if (t->numEntries >= rebuildLimit * t->size)
+ if (t->numEntries >= rebuildLimit * t->bucketsSize)
RebuildTable(t);
e = bmake_malloc(sizeof(*e) + keylen);
- hp = &t->bucketPtr[h & t->mask];
+ hp = &t->buckets[h & t->bucketsMask];
e->next = *hp;
*hp = e;
Hash_SetValue(e, NULL);
@@ -285,7 +285,7 @@ Hash_DeleteEntry(Hash_Table *t, Hash_Ent
if (e == NULL)
return;
- for (hp = &t->bucketPtr[e->namehash & t->mask];
+ for (hp = &t->buckets[e->namehash & t->bucketsMask];
(p = *hp) != NULL; hp = &p->next) {
if (p == e) {
*hp = p->next;
@@ -311,9 +311,9 @@ Hash_DeleteEntry(Hash_Table *t, Hash_Ent
Hash_Entry *
Hash_EnumFirst(Hash_Table *t, Hash_Search *searchPtr)
{
- searchPtr->tablePtr = t;
- searchPtr->nextIndex = 0;
- searchPtr->hashEntryPtr = NULL;
+ searchPtr->table = t;
+ searchPtr->nextBucket = 0;
+ searchPtr->entry = NULL;
return Hash_EnumNext(searchPtr);
}
@@ -327,14 +327,14 @@ Hash_Entry *
Hash_EnumNext(Hash_Search *searchPtr)
{
Hash_Entry *e;
- Hash_Table *t = searchPtr->tablePtr;
+ Hash_Table *t = searchPtr->table;
/*
- * The hashEntryPtr field points to the most recently returned
- * entry, or is nil if we are starting up. If not nil, we have
+ * The entry field points to the most recently returned
+ * entry, or is NULL if we are starting up. If not NULL, we have
* to start at the next one in the chain.
*/
- e = searchPtr->hashEntryPtr;
+ e = searchPtr->entry;
if (e != NULL)
e = e->next;
/*
@@ -342,11 +342,11 @@ Hash_EnumNext(Hash_Search *searchPtr)
* find the next nonempty chain.
*/
while (e == NULL) {
- if (searchPtr->nextIndex >= t->size)
+ if (searchPtr->nextBucket >= t->bucketsSize)
return NULL;
- e = t->bucketPtr[searchPtr->nextIndex++];
+ e = t->buckets[searchPtr->nextBucket++];
}
- searchPtr->hashEntryPtr = e;
+ searchPtr->entry = e;
return e;
}
@@ -360,18 +360,18 @@ RebuildTable(Hash_Table *t)
Hash_Entry **oldhp;
int oldsize;
- oldhp = t->bucketPtr;
- oldsize = i = t->size;
+ oldhp = t->buckets;
+ oldsize = i = t->bucketsSize;
i <<= 1;
- t->size = i;
- t->mask = mask = i - 1;
- t->bucketPtr = hp = bmake_malloc(sizeof(*hp) * i);
+ t->bucketsSize = i;
+ t->bucketsMask = mask = i - 1;
+ t->buckets = hp = bmake_malloc(sizeof(*hp) * i);
while (--i >= 0)
*hp++ = NULL;
for (hp = oldhp, i = oldsize; --i >= 0;) {
for (e = *hp++; e != NULL; e = next) {
next = e->next;
- xp = &t->bucketPtr[e->namehash & mask];
+ xp = &t->buckets[e->namehash & mask];
e->next = *xp;
*xp = e;
}
@@ -379,7 +379,7 @@ RebuildTable(Hash_Table *t)
free(oldhp);
if (DEBUG(HASH))
fprintf(debug_file, "%s: %p size=%d entries=%d maxchain=%d\n",
- __func__, t, t->size, t->numEntries, t->maxchain);
+ __func__, t, t->bucketsSize, t->numEntries, t->maxchain);
t->maxchain = 0;
}
@@ -400,5 +400,5 @@ Hash_DebugStats(Hash_Table *t, const cha
{
if (DEBUG(HASH))
fprintf(debug_file, "Hash_Table %s: size=%d numEntries=%d maxchain=%d\n",
- name, t->size, t->numEntries, t->maxchain);
+ name, t->bucketsSize, t->numEntries, t->maxchain);
}
Index: src/usr.bin/make/hash.h
diff -u src/usr.bin/make/hash.h:1.20 src/usr.bin/make/hash.h:1.21
--- src/usr.bin/make/hash.h:1.20 Tue Sep 1 21:00:15 2020
+++ src/usr.bin/make/hash.h Tue Sep 1 21:11:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.h,v 1.20 2020/09/01 21:00:15 rillig Exp $ */
+/* $NetBSD: hash.h,v 1.21 2020/09/01 21:11:31 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -72,34 +72,27 @@
* from: @(#)hash.h 8.1 (Berkeley) 6/6/93
*/
-/* hash.h --
- *
- * This file contains definitions used by the hash module,
- * which maintains hash tables.
- */
+/* Hash tables with strings as keys and arbitrary pointers as values. */
#ifndef MAKE_HASH_H
#define MAKE_HASH_H
-/*
- * The following defines one entry in the hash table.
- */
-
+/* A single key-value entry in the hash table. */
typedef struct Hash_Entry {
- struct Hash_Entry *next; /* Used to link together all the
- * entries associated with the same
- * bucket. */
- void *clientPtr; /* Arbitrary pointer */
- unsigned namehash; /* hash value of key */
- char name[1]; /* key string, variable length */
+ struct Hash_Entry *next; /* Used to link together all the entries
+ * associated with the same bucket. */
+ void *value;
+ unsigned namehash; /* hash value of key */
+ char name[1]; /* key string, variable length */
} Hash_Entry;
+/* The hash table containing the entries. */
typedef struct Hash_Table {
- struct Hash_Entry **bucketPtr;/* Pointers to Hash_Entry, one
+ Hash_Entry **buckets; /* Pointers to Hash_Entry, one
* for each bucket in the table. */
- int size; /* Actual size of array. */
+ int bucketsSize;
int numEntries; /* Number of entries in the table. */
- int mask; /* Used to select bits for hashing. */
+ int bucketsMask; /* Used to select the bucket for a hash. */
int maxchain; /* max length of chain detected */
} Hash_Table;
@@ -107,23 +100,22 @@ typedef struct Hash_Table {
* The following structure is used by the searching routines
* to record where we are in the search.
*/
-
typedef struct Hash_Search {
- Hash_Table *tablePtr; /* Table being searched. */
- int nextIndex; /* Next bucket to check (after current). */
- Hash_Entry *hashEntryPtr; /* Next entry to check in current bucket. */
+ Hash_Table *table; /* Table being searched. */
+ int nextBucket; /* Next bucket to check (after current). */
+ Hash_Entry *entry; /* Next entry to check in current bucket. */
} Hash_Search;
static inline void * MAKE_ATTR_UNUSED
Hash_GetValue(Hash_Entry *h)
{
- return h->clientPtr;
+ return h->value;
}
static inline void MAKE_ATTR_UNUSED
Hash_SetValue(Hash_Entry *h, void *datum)
{
- h->clientPtr = datum;
+ h->value = datum;
}
void Hash_InitTable(Hash_Table *, int);
