mwrap (Perl version) user+dev discussion/patches/pulls/bugs/help
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: mwrap-perl@80x24.org
Subject: [PATCH 3/6] wrap jhash calls to hash_loc
Date: Wed, 16 Nov 2022 09:26:43 +0000	[thread overview]
Message-ID: <20221116092646.19919-4-e@80x24.org> (raw)
In-Reply-To: <20221116092646.19919-1-e@80x24.org>

This will make it easier to keep a consistent hash seed
and/or switch to different hashes in the future.
---
 Mwrap.xs     | 4 ++--
 mwrap_core.h | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Mwrap.xs b/Mwrap.xs
index 8aeb425..a5ffeed 100644
--- a/Mwrap.xs
+++ b/Mwrap.xs
@@ -164,12 +164,12 @@ CODE:
 		k = (void *)kbuf;
 		memcpy(k->k, &p, sizeof(p));
 		k->capa = 0;
-		k->hval = jhash(k->k, sizeof(p), 0xdeadbeef);
+		hash_loc(k, sizeof(p));
 	} else {
 		k = (void *)kbuf;
 		memcpy(k->k, str, len + 1);
 		k->capa = len + 1;
-		k->hval = jhash(k->k, k->capa, 0xdeadbeef);
+		hash_loc(k, k->capa);
 	}
 
 	if (!k)
diff --git a/mwrap_core.h b/mwrap_core.h
index 94a6af3..d9396e6 100644
--- a/mwrap_core.h
+++ b/mwrap_core.h
@@ -272,6 +272,11 @@ static const COP *mwp_curcop(void)
 	return NULL;
 }
 
+static void hash_loc(struct src_loc *k, size_t len)
+{
+	k->hval = jhash(k->k, len, 0xdeadbeef);
+}
+
 static struct src_loc *assign_line(size_t size, const char *file, unsigned line)
 {
 	/* avoid vsnprintf or anything which could call malloc here: */
@@ -298,7 +303,7 @@ static struct src_loc *assign_line(size_t size, const char *file, unsigned line)
 	assert(dst && "bad math");
 	*dst = 0;	/* terminate string */
 	k->capa = (uint32_t)(dst - k->k + 1);
-	k->hval = jhash(k->k, k->capa, 0xdeadbeef);
+	hash_loc(k, k->capa);
 	return totals_add_rcu(k);
 }
 
@@ -325,7 +330,7 @@ update_stats_rcu_lock(size_t *generation, size_t size, uintptr_t caller)
 		k->total = size;
 		memcpy(k->k, &caller, xlen);
 		k->capa = 0;
-		k->hval = jhash(k->k, xlen, 0xdeadbeef);
+		hash_loc(k, xlen);
 		ret = totals_add_rcu(k);
 	}
 out:

  parent reply	other threads:[~2022-11-16  9:26 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-16  9:26 [PATCH 0/6] another batch of fixes Eric Wong
2022-11-16  9:26 ` [PATCH 1/6] avoid leaking array returned by backtrace_symbols() Eric Wong
2022-11-16  9:26 ` [PATCH 2/6] mwrap_core: document the reason for padding the mutex Eric Wong
2022-11-16  9:26 ` Eric Wong [this message]
2022-11-16  9:26 ` [PATCH 4/6] fix under-allocated kbuf size Eric Wong
2022-11-16  9:26 ` [PATCH 5/6] mwrap_get: golf out redundant assignment across branches Eric Wong
2022-11-16  9:26 ` [PATCH 6/6] location_name: handle malloc failure on backtrace_symbols(3) Eric Wong

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=20221116092646.19919-4-e@80x24.org \
    --to=e@80x24.org \
    --cc=mwrap-perl@80x24.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mwrap-perl.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).