From: Junio C Hamano <gitster@pobox.com>
To: git@jeffhostetler.com
Cc: git@vger.kernel.org, peff@peff.net,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: Re: [PATCH 0/6] thread lazy_init_name_hash
Date: Wed, 22 Mar 2017 13:54:36 -0700 [thread overview]
Message-ID: <xmqq60j1jalv.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqshm5je4d.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 22 Mar 2017 12:38:42 -0700")
Junio C Hamano <gitster@pobox.com> writes:
>> This patch series replaces my earlier
>> * jh/memihash-opt (2017-02-17) 5 commits
>> patch series.
>
> Ahh. I was scratching my head trying to remember why some of these
> look so familiar. [PATCH v2 ...] would have helped.
>
> Thank you for an update.
One notable difference I noticed since the previous round is that
this no longer adds precomputed hash to "struct cache_entry". As
you are aiming to manage an index with a large number of entries,
this is a welcome change that makes sense.
$ make NO_PTHREADS=NoThanks name-hash.o
CC name-hash.o
name-hash.c: In function 'lazy_init_name_hash':
name-hash.c:573:3: error: implicit declaration of function 'threaded_lazy_init_name_hash' [-Werror=implicit-function-declaration]
threaded_lazy_init_name_hash(istate);
^
name-hash.c: In function 'test_lazy_init_name_hash':
name-hash.c:595:2: error: 'lazy_nr_dir_threads' undeclared (first use in this function)
lazy_nr_dir_threads = 0;
^
name-hash.c:595:2: note: each undeclared identifier is reported only once for each function it appears in
name-hash.c:596:2: error: 'lazy_try_threaded' undeclared (first use in this function)
lazy_try_threaded = try_threaded;
^
name-hash.c:601:1: error: control reaches end of non-void function [-Werror=return-type]
}
^
cc1: all warnings being treated as errors
make: *** [name-hash.o] Error 1
still has to be addressed. Perhaps squash pieces of these into
appropriate patches in the series?
name-hash.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/name-hash.c b/name-hash.c
index a5826505e0..725ac22886 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -118,9 +118,16 @@ static int cache_entry_cmp(const struct cache_entry *ce1,
return remove ? !(ce1 == ce2) : 0;
}
+static int lazy_try_threaded = 1;
+static int lazy_nr_dir_threads = 0;
#ifdef NO_PTHREADS
+static void threaded_lazy_init_name_hash(struct index_state *istate)
+{
+ ; /* nothing */
+}
+
static int lookup_lazy_params(struct index_state *istate)
{
return 0;
@@ -153,8 +160,6 @@ static int lookup_lazy_params(struct index_state *istate)
*/
#define LAZY_MAX_MUTEX (32)
-static int lazy_try_threaded = 1;
-static int lazy_nr_dir_threads = 0;
static pthread_mutex_t *lazy_dir_mutex_array;
/*
next prev parent reply other threads:[~2017-03-22 20:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-22 17:14 [PATCH 0/6] thread lazy_init_name_hash git
2017-03-22 17:14 ` [PATCH 1/6] name-hash: specify initial size for istate.dir_hash table git
2017-03-22 17:14 ` [PATCH 2/6] hashmap: allow memihash computation to be continued git
2017-03-22 17:14 ` [PATCH 3/6] hashmap: Add disallow_rehash setting git
2017-03-22 17:14 ` [PATCH 4/6] name-hash: perf improvement for lazy_init_name_hash git
2017-03-22 17:14 ` [PATCH 5/6] name-hash: add test-lazy-init-name-hash git
2017-03-22 17:14 ` [PATCH 6/6] name-hash: add perf test for lazy_init_name_hash git
2017-03-22 18:02 ` [PATCH 0/6] thread lazy_init_name_hash Stefan Beller
2017-03-22 19:22 ` Jeff Hostetler
2017-03-22 19:38 ` Junio C Hamano
2017-03-22 20:54 ` Junio C Hamano [this message]
2017-03-22 21:04 ` Jeff Hostetler
2017-03-22 21:29 ` Junio C Hamano
2017-03-22 20:39 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq60j1jalv.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=jeffhost@microsoft.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).