[PATCH 4/4] sha1dc: make `sha1dc_init()` thread-safe
HOTtoday
From: Johannes Schindelin via GitGitGadget <hidden>
Date: 2026-09-28 15:51:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Johannes Schindelin <redacted> The `sha1dc_init` function pointer initially points to a function that determines which sha1dc backend to use. Naturally, this initialization should only run once. To allow for that function to be called concurrently in multiple threads, we need to use a pthread primitive to ensure that the `sha1dc_*()` function pointers are initialized exactly once. Unfortunately, this requires quite a bit of non-DRY code to prevent data races when different threads run `initial_init()` concurrently (see https://en.cppreference.com/c/language/memory_model#Threads_and_data_races). Signed-off-by: Johannes Schindelin <redacted> --- sha1dc_git.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 7 deletions(-)
diff --git a/sha1dc_git.c b/sha1dc_git.c
index dcc5c1ca8e..eba62b12ab 100644
--- a/sha1dc_git.c
+++ b/sha1dc_git.c@@ -7,6 +7,7 @@ #ifdef DC_SHA1_RS #include "config.h" #include "repository.h" +#include "thread-utils.h" #endif #ifdef DC_SHA1_EXTERNAL
@@ -58,16 +59,21 @@ static void sha1dc_c_discard(SHA1_CTX *ctx UNUSED) } /* The first SHA-1 initialization must precede concurrent hashing. */ -static void sha1dc_choose(SHA1_CTX *ctx); +static void initial_init(SHA1_CTX *); +static void initial_clone(SHA1_CTX *, const SHA1_CTX *); +static void initial_update(SHA1_CTX *, const void *, size_t); +static void initial_final(unsigned char [20], SHA1_CTX *, + void (*die_fn)(const char *, ...)); +static void initial_discard(SHA1_CTX *ctx); -void (*sha1dc_init)(SHA1_CTX *) = sha1dc_choose; -void (*sha1dc_clone)(SHA1_CTX *, const SHA1_CTX *); -void (*sha1dc_update)(SHA1_CTX *, const void *, size_t); +void (*sha1dc_init)(SHA1_CTX *) = initial_init; +void (*sha1dc_clone)(SHA1_CTX *, const SHA1_CTX *) = initial_clone; +void (*sha1dc_update)(SHA1_CTX *, const void *, size_t) = initial_update; void (*sha1dc_final)(unsigned char [20], SHA1_CTX *, - void (*die_fn)(const char *, ...)); -void (*sha1dc_discard)(SHA1_CTX *); + void (*die_fn)(const char *, ...)) = initial_final; +void (*sha1dc_discard)(SHA1_CTX *) = initial_discard; -static void sha1dc_choose(SHA1_CTX *ctx) +static void sha1dc_choose(void) { const char *backend; int use_c = 0;
@@ -86,6 +92,49 @@ static void sha1dc_choose(SHA1_CTX *ctx) sha1dc_final = use_c ? git_SHA1DCFinal : sha1dc_rs_final; sha1dc_discard = use_c ? sha1dc_c_discard : sha1dc_rs_discard; sha1dc_init = use_c ? git_SHA1DCInit : sha1dc_rs_init; +} + +static pthread_once_t once = PTHREAD_ONCE_INIT; + +static void initial_init(SHA1_CTX *ctx) +{ + int ret = pthread_once(&once, sha1dc_choose); + if (ret) + die("cannot initialize SHA-1 backend: %s", strerror(ret)); sha1dc_init(ctx); } + +static void initial_clone(SHA1_CTX *dst, const SHA1_CTX *src) +{ + int ret = pthread_once(&once, sha1dc_choose); + if (ret) + die("cannot initialize SHA-1 backend: %s", strerror(ret)); + sha1dc_clone(dst, src); +} + +static void initial_update(SHA1_CTX *ctx, const void *buf, size_t len) +{ + int ret = pthread_once(&once, sha1dc_choose); + if (ret) + die("cannot initialize SHA-1 backend: %s", strerror(ret)); + sha1dc_update(ctx, buf, len); +} + +static void initial_final(unsigned char hash[20], SHA1_CTX *ctx, + void (*die_fn)(const char *, ...)) +{ + int ret = pthread_once(&once, sha1dc_choose); + if (ret) + die("cannot initialize SHA-1 backend: %s", strerror(ret)); + sha1dc_final(hash, ctx, die_fn); +} + +static void initial_discard(SHA1_CTX *ctx) +{ + int ret = pthread_once(&once, sha1dc_choose); + if (ret) + die("cannot initialize SHA-1 backend: %s", strerror(ret)); + sha1dc_discard(ctx); +} + #endif
--
gitgitgadget