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>

diff --git a/name-hash.c b/name-hash.c
index 1fcda73cb396e305a75aa8dc5869aaf85011761e..b3c9ac791d9f4700cb8fc8ccb5832c9b7affa1f4 100644 (file)
--- a/name-hash.c
+++ b/name-hash.c
@@ -7,6 +7,7 @@
  */
 #define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
  */
 #define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"

+#include "thread-utils.h"

 
 struct dir_entry {
        struct hashmap_entry ent;
 
 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;
 
 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
 /*
  * 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;
 
        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);
 
        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);
 }
 
        free(lazy_entries);
 }
 

-#endif
-

 static void lazy_init_name_hash(struct index_state *istate)
 {
 
 static void lazy_init_name_hash(struct index_state *istate)
 {