undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

name-hash.c: remove #ifdef NO_PTHREADS

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2018-11-03 09:48:41 +01:00 committed by Junio C Hamano
parent 2094c5e582
commit 07642942aa
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
name-hash.c
View File

@ -7,6 +7,7 @@
*/ */
#define NO_THE_INDEX_COMPATIBILITY_MACROS #define NO_THE_INDEX_COMPATIBILITY_MACROS
#include "cache.h" #include "cache.h"
#include "thread-utils.h"
struct dir_entry { struct dir_entry {
struct hashmap_entry ent; 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_try_threaded = 1;
static int lazy_nr_dir_threads; 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 * Set a minimum number of cache_entries that we will handle per
* thread and use that to decide how many threads to run (upto * 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_dir_thread_data *td_dir;
struct lazy_name_thread_data *td_name; struct lazy_name_thread_data *td_name;
if (!HAVE_THREADS)
return;
k_start = 0; k_start = 0;
nr_each = DIV_ROUND_UP(istate->cache_nr, lazy_nr_dir_threads); 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)
{ {