Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 17:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts: move hash function from scripts/kconfig/ to scripts/include/

Browse Source 
This function was originally added by commit 8af27e1dc4 ("fixdep: use
hash table instead of a single array").

Move it to scripts/include/ so that other host programs can use it.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2024-09-08 21:43:16 +09:00
parent 9a418218da
commit a16219bdd3
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/include/hash.h Normal file
View File

@ -0,0 +1,15 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef HASH_H
#define HASH_H
static inline unsigned int hash_str(const char *s)
{
/* fnv32 hash */
unsigned int hash = 2166136261U;
for (; *s; s++)
hash = (hash ^ *s) * 0x01000193;
return hash;
}
#endif /* HASH_H */

1
scripts/kconfig/lkc.h
View File

@ -51,7 +51,6 @@ static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
} }
/* util.c */ /* util.c */
unsigned int strhash(const char *s);
const char *file_lookup(const char *name); const char *file_lookup(const char *name);
/* lexer.l */ /* lexer.l */

5
scripts/kconfig/symbol.c
View File

@ -9,6 +9,7 @@
#include <string.h> #include <string.h>
#include <regex.h> #include <regex.h>
#include <hash.h>
#include <xalloc.h> #include <xalloc.h>
#include "internal.h" #include "internal.h"
#include "lkc.h" #include "lkc.h"
@ -893,7 +894,7 @@ struct symbol *sym_lookup(const char *name, int flags)
case 'n': return &symbol_no; case 'n': return &symbol_no;
} }
} }
hash = strhash(name); hash = hash_str(name);
hash_for_each_possible(sym_hashtable, symbol, node, hash) { hash_for_each_possible(sym_hashtable, symbol, node, hash) {
if (symbol->name && if (symbol->name &&
@ -936,7 +937,7 @@ struct symbol *sym_find(const char *name)
case 'n': return &symbol_no; case 'n': return &symbol_no;
} }
} }
hash = strhash(name); hash = hash_str(name);
hash_for_each_possible(sym_hashtable, symbol, node, hash) { hash_for_each_possible(sym_hashtable, symbol, node, hash) {
if (symbol->name && if (symbol->name &&

13
scripts/kconfig/util.c
View File

@ -8,20 +8,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <hash.h>
#include <hashtable.h> #include <hashtable.h>
#include <xalloc.h> #include <xalloc.h>
#include "lkc.h" #include "lkc.h"
unsigned int strhash(const char *s)
{
/* fnv32 hash */
unsigned int hash = 2166136261U;
for (; *s; s++)
hash = (hash ^ *s) * 0x01000193;
return hash;
}
/* hash table of all parsed Kconfig files */ /* hash table of all parsed Kconfig files */
static HASHTABLE_DEFINE(file_hashtable, 1U << 11); static HASHTABLE_DEFINE(file_hashtable, 1U << 11);
@ -35,7 +26,7 @@ const char *file_lookup(const char *name)
{ {
struct file *file; struct file *file;
size_t len; size_t len;
int hash = strhash(name); int hash = hash_str(name);
hash_for_each_possible(file_hashtable, file, node, hash) hash_for_each_possible(file_hashtable, file, node, hash)
if (!strcmp(name, file->name)) if (!strcmp(name, file->name))