grep: remove #ifdef NO_PTHREADS

This is a faithful conversion without attempting to improve
anything. That comes later.

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/builtin/grep.c b/builtin/grep.c
index d8508ddf792dd22dc0c8c283df29e5e6d9dacbf7..6dd15dbaa264ce98540c8e43ecebec0763c2876d 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -34,7 +34,6 @@ static int recurse_submodules;
 #define GREP_NUM_THREADS_DEFAULT 8
 static int num_threads;
 
 #define GREP_NUM_THREADS_DEFAULT 8
 static int num_threads;
 

-#ifndef NO_PTHREADS

 static pthread_t *threads;
 
 /* We use one producer thread and THREADS consumer
 static pthread_t *threads;
 
 /* We use one producer thread and THREADS consumer


@@ -234,6 +233,9 @@ static int wait_all(void)
        int hit = 0;
        int i;
 
        int hit = 0;
        int i;
 

+       if (!HAVE_THREADS)
+               return 0;
+

        grep_lock();
        all_work_added = 1;
 
        grep_lock();
        all_work_added = 1;
 


@@ -265,13 +267,6 @@ static int wait_all(void)
 
        return hit;
 }
 
        return hit;
 }

-#else /* !NO_PTHREADS */
-
-static int wait_all(void)
-{
-       return 0;
-}
-#endif

 
 static int grep_cmd_config(const char *var, const char *value, void *cb)
 {
 
 static int grep_cmd_config(const char *var, const char *value, void *cb)
 {


@@ -284,8 +279,7 @@ static int grep_cmd_config(const char *var, const char *value, void *cb)
                if (num_threads < 0)
                        die(_("invalid number of threads specified (%d) for %s"),
                            num_threads, var);
                if (num_threads < 0)
                        die(_("invalid number of threads specified (%d) for %s"),
                            num_threads, var);

-#ifdef NO_PTHREADS
-               else if (num_threads && num_threads != 1) {
+               else if (!HAVE_THREADS && num_threads && num_threads != 1) {

                        /*
                         * TRANSLATORS: %s is the configuration
                         * variable for tweaking threads, currently
                        /*
                         * TRANSLATORS: %s is the configuration
                         * variable for tweaking threads, currently


@@ -294,7 +288,6 @@ static int grep_cmd_config(const char *var, const char *value, void *cb)
                        warning(_("no threads support, ignoring %s"), var);
                        num_threads = 0;
                }
                        warning(_("no threads support, ignoring %s"), var);
                        num_threads = 0;
                }

-#endif

        }
 
        if (!strcmp(var, "submodule.recurse"))
        }
 
        if (!strcmp(var, "submodule.recurse"))


@@ -330,17 +323,14 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
        grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid);
        strbuf_release(&pathbuf);
 
        grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid);
        strbuf_release(&pathbuf);
 

-#ifndef NO_PTHREADS
-       if (num_threads) {
+       if (HAVE_THREADS && num_threads) {

                /*
                 * add_work() copies gs and thus assumes ownership of
                 * its fields, so do not call grep_source_clear()
                 */
                add_work(opt, &gs);
                return 0;
                /*
                 * add_work() copies gs and thus assumes ownership of
                 * its fields, so do not call grep_source_clear()
                 */
                add_work(opt, &gs);
                return 0;

-       } else
-#endif
-       {
+       } else {

                int hit;
 
                hit = grep_source(opt, &gs);
                int hit;
 
                hit = grep_source(opt, &gs);


@@ -363,17 +353,14 @@ static int grep_file(struct grep_opt *opt, const char *filename)
        grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename);
        strbuf_release(&buf);
 
        grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename);
        strbuf_release(&buf);
 

-#ifndef NO_PTHREADS
-       if (num_threads) {
+       if (HAVE_THREADS && num_threads) {

                /*
                 * add_work() copies gs and thus assumes ownership of
                 * its fields, so do not call grep_source_clear()
                 */
                add_work(opt, &gs);
                return 0;
                /*
                 * add_work() copies gs and thus assumes ownership of
                 * its fields, so do not call grep_source_clear()
                 */
                add_work(opt, &gs);
                return 0;

-       } else
-#endif
-       {
+       } else {

                int hit;
 
                hit = grep_source(opt, &gs);
                int hit;
 
                hit = grep_source(opt, &gs);


@@ -1038,20 +1025,20 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        pathspec.recursive = 1;
        pathspec.recurse_submodules = !!recurse_submodules;
 
        pathspec.recursive = 1;
        pathspec.recurse_submodules = !!recurse_submodules;
 

-#ifndef NO_PTHREADS
-       if (list.nr || cached || show_in_pager)
-               num_threads = 0;
-       else if (num_threads == 0)
-               num_threads = GREP_NUM_THREADS_DEFAULT;
-       else if (num_threads < 0)
-               die(_("invalid number of threads specified (%d)"), num_threads);
-       if (num_threads == 1)
+       if (HAVE_THREADS) {
+               if (list.nr || cached || show_in_pager)
+                       num_threads = 0;
+               else if (num_threads == 0)
+                       num_threads = GREP_NUM_THREADS_DEFAULT;
+               else if (num_threads < 0)
+                       die(_("invalid number of threads specified (%d)"), num_threads);
+               if (num_threads == 1)
+                       num_threads = 0;
+       } else {
+               if (num_threads)
+                       warning(_("no threads support, ignoring --threads"));

                num_threads = 0;
                num_threads = 0;

-#else
-       if (num_threads)
-               warning(_("no threads support, ignoring --threads"));
-       num_threads = 0;
-#endif
+       }

 
        if (!num_threads)
                /*
 
        if (!num_threads)
                /*


@@ -1062,15 +1049,13 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                 */
                compile_grep_patterns(&opt);
 
                 */
                compile_grep_patterns(&opt);
 

-#ifndef NO_PTHREADS
-       if (num_threads) {
+       if (HAVE_THREADS && num_threads) {

                if (!(opt.name_only || opt.unmatch_name_only || opt.count)
                    && (opt.pre_context || opt.post_context ||
                        opt.file_break || opt.funcbody))
                        skip_first_line = 1;
                start_threads(&opt);
        }
                if (!(opt.name_only || opt.unmatch_name_only || opt.count)
                    && (opt.pre_context || opt.post_context ||
                        opt.file_break || opt.funcbody))
                        skip_first_line = 1;
                start_threads(&opt);
        }

-#endif

 
        if (show_in_pager && (cached || list.nr))
                die(_("--open-files-in-pager only works on the worktree"));
 
        if (show_in_pager && (cached || list.nr))
                die(_("--open-files-in-pager only works on the worktree"));

diff --git a/grep.c b/grep.c
index f6bd89e40b7f7a8442a6e0a302a1e6080df5afbd..4db1510d167c9fc3cc7b129c90aa874a4c7c2b0f 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -1513,7 +1513,6 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol,
        }
 }
 
        }
 }
 

-#ifndef NO_PTHREADS

 int grep_use_locks;
 
 /*
 int grep_use_locks;
 
 /*


@@ -1539,11 +1538,6 @@ static inline void grep_attr_unlock(void)
  */
 pthread_mutex_t grep_read_mutex;
 
  */
 pthread_mutex_t grep_read_mutex;
 

-#else
-#define grep_attr_lock()
-#define grep_attr_unlock()
-#endif
-

 static int match_funcname(struct grep_opt *opt, struct grep_source *gs, char *bol, char *eol)
 {
        xdemitconf_t *xecfg = opt->priv;
 static int match_funcname(struct grep_opt *opt, struct grep_source *gs, char *bol, char *eol)
 {
        xdemitconf_t *xecfg = opt->priv;

diff --git a/grep.h b/grep.h
index 1a57d12b906fb07a9041f52b109dcdb4c7478bfa..fb0489372169d7f1563a09e050c8715542ce5963 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -229,7 +229,6 @@ int grep_source(struct grep_opt *opt, struct grep_source *gs);
 extern struct grep_opt *grep_opt_dup(const struct grep_opt *opt);
 extern int grep_threads_ok(const struct grep_opt *opt);
 
 extern struct grep_opt *grep_opt_dup(const struct grep_opt *opt);
 extern int grep_threads_ok(const struct grep_opt *opt);
 

-#ifndef NO_PTHREADS

 /*
  * Mutex used around access to the attributes machinery if
  * opt->use_threads.  Must be initialized/destroyed by callers!
 /*
  * Mutex used around access to the attributes machinery if
  * opt->use_threads.  Must be initialized/destroyed by callers!


@@ -250,9 +249,4 @@ static inline void grep_read_unlock(void)
                pthread_mutex_unlock(&grep_read_mutex);
 }
 
                pthread_mutex_unlock(&grep_read_mutex);
 }
 

-#else
-#define grep_read_lock()
-#define grep_read_unlock()
-#endif
-

 #endif
 #endif