Skip to content

Commit

Permalink
modpost: replace tdb_hash() with hash_str()
Browse files Browse the repository at this point in the history
Use a helper available in scripts/include/hash.h.

Signed-off-by: Masahiro Yamada <[email protected]>
  • Loading branch information
masahir0y committed Nov 27, 2024
1 parent 6b1fabc commit 5eaea85
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions scripts/mod/modpost.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <stdbool.h>
#include <errno.h>

#include <hash.h>
#include <hashtable.h>
#include <list.h>
#include <xalloc.h>
Expand Down Expand Up @@ -210,19 +211,6 @@ struct symbol {

static HASHTABLE_DEFINE(symbol_hashtable, 1U << 10);

/* This is based on the hash algorithm from gdbm, via tdb */
static inline unsigned int tdb_hash(const char *name)
{
unsigned value; /* Used to compute the hash value. */
unsigned i; /* Used to cycle through random values. */

/* Set the initial value from the key size. */
for (value = 0x238F13AF * strlen(name), i = 0; name[i]; i++)
value = (value + (((unsigned char *)name)[i] << (i*5 % 24)));

return (1103515243 * value + 12345);
}

/**
* Allocate a new symbols for use in the hash of exported symbols or
* the list of unresolved symbols per module
Expand All @@ -240,7 +228,7 @@ static struct symbol *alloc_symbol(const char *name)
/* For the hash of exported symbols */
static void hash_add_symbol(struct symbol *sym)
{
hash_add(symbol_hashtable, &sym->hnode, tdb_hash(sym->name));
hash_add(symbol_hashtable, &sym->hnode, hash_str(sym->name));
}

static void sym_add_unresolved(const char *name, struct module *mod, bool weak)
Expand All @@ -261,7 +249,7 @@ static struct symbol *sym_find_with_module(const char *name, struct module *mod)
if (name[0] == '.')
name++;

hash_for_each_possible(symbol_hashtable, s, hnode, tdb_hash(name)) {
hash_for_each_possible(symbol_hashtable, s, hnode, hash_str(name)) {
if (strcmp(s->name, name) == 0 && (!mod || s->module == mod))
return s;
}
Expand Down

0 comments on commit 5eaea85

Please sign in to comment.