admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config: pass repo to git_config_get_index_threads()

Browse Source 
Refactor `git_config_get_index_threads()` to accept a `struct
repository` such that we can get rid of the implicit dependency on
`the_repository`. Rename the function accordingly.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-08-13 11:13:49 +02:00
committed by Junio C Hamano
parent 2ea8536468
commit 1870cc30d4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.c
View File

@@ -2826,7 +2826,7 @@ int git_config_get_max_percent_split_change(void)
return -1; /* default value */ return -1; /* default value */
} }
int git_config_get_index_threads(int *dest) int repo_config_get_index_threads(struct repository *r, int *dest)
{ {
int is_bool, val; int is_bool, val;
@@ -2836,7 +2836,7 @@ int git_config_get_index_threads(int *dest)
return 0; return 0;
} }
if (!git_config_get_bool_or_int("index.threads", &is_bool, &val)) { if (!repo_config_get_bool_or_int(r, "index.threads", &is_bool, &val)) {
if (is_bool) if (is_bool)
*dest = val ? 0 : 1; *dest = val ? 0 : 1;
else else

2
config.h
View File

@@ -710,7 +710,7 @@ int git_config_get_maybe_bool(const char *key, int *dest);
*/ */
int git_config_get_pathname(const char *key, char **dest); int git_config_get_pathname(const char *key, char **dest);
int git_config_get_index_threads(int *dest); int repo_config_get_index_threads(struct repository *r, int *dest);
int git_config_get_split_index(void); int git_config_get_split_index(void);
int git_config_get_max_percent_split_change(void); int git_config_get_max_percent_split_change(void);

8
read-cache.c
View File

@@ -2267,7 +2267,7 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
src_offset = sizeof(*hdr); src_offset = sizeof(*hdr);
if (git_config_get_index_threads(&nr_threads)) if (repo_config_get_index_threads(the_repository, &nr_threads))
nr_threads = 1; nr_threads = 1;
/* TODO: does creating more threads than cores help? */ /* TODO: does creating more threads than cores help? */
@@ -2787,7 +2787,7 @@ static int record_eoie(void)
* used for threading is written by default if the user * used for threading is written by default if the user
* explicitly requested threaded index reads. * explicitly requested threaded index reads.
*/ */
return !git_config_get_index_threads(&val) && val != 1; return !repo_config_get_index_threads(the_repository, &val) && val != 1;
} }
static int record_ieot(void) static int record_ieot(void)
@@ -2802,7 +2802,7 @@ static int record_ieot(void)
* written by default if the user explicitly requested * written by default if the user explicitly requested
* threaded index reads. * threaded index reads.
*/ */
return !git_config_get_index_threads(&val) && val != 1; return !repo_config_get_index_threads(the_repository, &val) && val != 1;
} }
enum write_extensions { enum write_extensions {
@@ -2875,7 +2875,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
hashwrite(f, &hdr, sizeof(hdr)); hashwrite(f, &hdr, sizeof(hdr));
if (!HAVE_THREADS || git_config_get_index_threads(&nr_threads)) if (!HAVE_THREADS || repo_config_get_index_threads(the_repository, &nr_threads))
nr_threads = 1; nr_threads = 1;
if (nr_threads != 1 && record_ieot()) { if (nr_threads != 1 && record_ieot()) {