summaryrefslogtreecommitdiff
path: root/name-hash.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-11-03 08:48:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-05 04:42:11 (GMT)
commit07642942aa02f20623191207dd0a2730752c9533 (patch)
tree6d552e783a7f146f5504e4db17256baac2d650ed /name-hash.c
parent2094c5e582507c6bb03d4489ba4a603e3f5fc57e (diff)
downloadgit-07642942aa02f20623191207dd0a2730752c9533.zip
git-07642942aa02f20623191207dd0a2730752c9533.tar.gz
git-07642942aa02f20623191207dd0a2730752c9533.tar.bz2
name-hash.c: remove #ifdef NO_PTHREADS
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'name-hash.c')
-rw-r--r--name-hash.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/name-hash.c b/name-hash.c
index 1fcda73..b3c9ac7 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -7,6 +7,7 @@
*/
#define NO_THE_INDEX_COMPATIBILITY_MACROS
#include "cache.h"
+#include "thread-utils.h"
struct dir_entry {
struct hashmap_entry ent;
@@ -131,22 +132,6 @@ static int cache_entry_cmp(const void *unused_cmp_data,
static int lazy_try_threaded = 1;
static int lazy_nr_dir_threads;
-#ifdef NO_PTHREADS
-
-static inline int lookup_lazy_params(struct index_state *istate)
-{
- return 0;
-}
-
-static inline void threaded_lazy_init_name_hash(
- struct index_state *istate)
-{
-}
-
-#else
-
-#include "thread-utils.h"
-
/*
* Set a minimum number of cache_entries that we will handle per
* thread and use that to decide how many threads to run (upto
@@ -516,6 +501,9 @@ static void threaded_lazy_init_name_hash(
struct lazy_dir_thread_data *td_dir;
struct lazy_name_thread_data *td_name;
+ if (!HAVE_THREADS)
+ return;
+
k_start = 0;
nr_each = DIV_ROUND_UP(istate->cache_nr, lazy_nr_dir_threads);
@@ -574,8 +562,6 @@ static void threaded_lazy_init_name_hash(
free(lazy_entries);
}
-#endif
-
static void lazy_init_name_hash(struct index_state *istate)
{