From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH 1/4] hashmap: introduce memhash_feed to access the internals of FNV-1 hash
Date: Tue, 24 Oct 2017 11:59:14 -0700 [thread overview]
Message-ID: <20171024185917.20515-2-sbeller@google.com> (raw)
In-Reply-To: <20171024185917.20515-1-sbeller@google.com>
This will be useful shortly.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
hashmap.c | 7 ++++++-
hashmap.h | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/hashmap.c b/hashmap.c
index d42f01ff5a..d103eb1fd2 100644
--- a/hashmap.c
+++ b/hashmap.c
@@ -26,13 +26,18 @@ unsigned int strihash(const char *str)
return hash;
}
+unsigned int memhash_feed(unsigned int hash_seed, const unsigned char next)
+{
+ return (hash_seed * FNV32_PRIME) ^ next;
+}
+
unsigned int memhash(const void *buf, size_t len)
{
unsigned int hash = FNV32_BASE;
unsigned char *ucbuf = (unsigned char *) buf;
while (len--) {
unsigned int c = *ucbuf++;
- hash = (hash * FNV32_PRIME) ^ c;
+ hash = memhash_feed(hash, c);
}
return hash;
}
diff --git a/hashmap.h b/hashmap.h
index 7cb29a6aed..c2464385ed 100644
--- a/hashmap.h
+++ b/hashmap.h
@@ -105,10 +105,13 @@
* `strihash` and `memihash` are case insensitive versions.
* `memihash_cont` is a variant of `memihash` that allows a computation to be
* continued with another chunk of data.
+ * `memhash_feed` takes just one character and returns the hash based off
+ * a previous hash.
*/
extern unsigned int strhash(const char *buf);
extern unsigned int strihash(const char *buf);
extern unsigned int memhash(const void *buf, size_t len);
+extern unsigned int memhash_feed(unsigned int hash_seed, const unsigned char next);
extern unsigned int memihash(const void *buf, size_t len);
extern unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len);
--
2.15.0.rc2.6.g953226eb5f
next prev parent reply other threads:[~2017-10-24 18:59 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 18:59 [PATCH 0/4] (x)diff cleanup: remove duplicate code Stefan Beller
2017-10-24 18:59 ` Stefan Beller [this message]
2017-10-24 20:23 ` [PATCH 1/4] hashmap: introduce memhash_feed to access the internals of FNV-1 hash René Scharfe
2017-10-24 20:48 ` Stefan Beller
2017-10-24 18:59 ` [PATCH 2/4] xdiff-interface: export comparing and hashing strings Stefan Beller
2017-10-24 20:23 ` René Scharfe
2017-10-24 20:42 ` Stefan Beller
2017-10-26 17:03 ` René Scharfe
2017-10-24 18:59 ` [PATCH 3/4] xdiff: use stronger hash function internally Stefan Beller
2017-10-24 20:23 ` René Scharfe
2017-10-24 20:46 ` Stefan Beller
2017-10-24 23:04 ` Jonathan Nieder
2017-10-24 18:59 ` [PATCH 4/4] diff.c: get rid of duplicate implementation Stefan Beller
2017-10-24 19:02 ` [PATCH 0/4] (x)diff cleanup: remove duplicate code Stefan Beller
2017-10-24 23:42 ` [PATCHv2 0/2] " Stefan Beller
2017-10-24 23:42 ` [PATCH 1/2] xdiff-interface: export comparing and hashing strings Stefan Beller
2017-10-25 4:26 ` Eric Sunshine
2017-10-24 23:42 ` [PATCH 2/2] diff.c: get rid of duplicate implementation Stefan Beller
2017-10-25 5:11 ` [PATCHv2 0/2] (x)diff cleanup: remove duplicate code Junio C Hamano
2017-10-25 18:47 ` Stefan Beller
2017-10-25 18:49 ` [PATCHv3 " Stefan Beller
2017-10-25 18:49 ` [PATCH 1/2] xdiff-interface: export comparing and hashing strings Stefan Beller
2017-10-26 17:12 ` René Scharfe
2017-10-27 7:12 ` Junio C Hamano
2017-10-27 17:15 ` Stefan Beller
2017-10-25 18:49 ` [PATCH 2/2] diff.c: get rid of duplicate implementation Stefan Beller
2017-10-26 2:23 ` Junio C Hamano
2017-10-26 17:43 ` René Scharfe
2017-10-30 17:59 ` Jeff King
2017-10-30 19:07 ` Jeff King
2017-10-24 23:45 ` [PATCH 1/5] fnv: migrate code from hashmap to fnv Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171024185917.20515-2-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).