From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, pclouds@gmail.com,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v2 17/17] read-cache: config for waiting for index-helper
Date: Fri, 18 Mar 2016 21:04:50 -0400 [thread overview]
Message-ID: <1458349490-1704-18-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1458349490-1704-1-git-send-email-dturner@twopensource.com>
When we poke index-helper, and index-helper is using watchman, we want
to wait for a response (showing that the watchman extension shm has
been prepared). If it's not using watchman, we don't.
So add a new config, core.waitforindexhelper, with sensible defaults, to
configure this behavior.
Signed-off-by: David Turner <dturner@twopensource.com>
---
cache.h | 1 +
config.c | 5 +++++
environment.c | 5 +++++
read-cache.c | 5 ++++-
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/cache.h b/cache.h
index 4ae7dd0..f8b8dbf 100644
--- a/cache.h
+++ b/cache.h
@@ -692,6 +692,7 @@ extern char *git_replace_ref_base;
extern int fsync_object_files;
extern int core_preload_index;
extern int core_watchman_sync_timeout;
+extern int wait_for_index_helper;
extern int core_apply_sparse_checkout;
extern int precomposed_unicode;
extern int protect_hfs;
diff --git a/config.c b/config.c
index e6dc141..5f1b8bd 100644
--- a/config.c
+++ b/config.c
@@ -887,6 +887,11 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
+ if (!strcmp(var, "core.waitforindexhelper")) {
+ wait_for_index_helper = git_config_bool(var, value);
+ return 0;
+ }
+
if (!strcmp(var, "core.createobject")) {
if (!strcmp(value, "rename"))
object_creation_mode = OBJECT_CREATION_USES_RENAMES;
diff --git a/environment.c b/environment.c
index 35e03c7..c7fb0a9 100644
--- a/environment.c
+++ b/environment.c
@@ -95,6 +95,11 @@ int core_preload_index = 1;
int ignore_untracked_cache_config;
int core_watchman_sync_timeout = 300;
+#ifdef USE_WATCHMAN
+int wait_for_index_helper = 1;
+#else
+int wait_for_index_helper = 0;
+#endif
/* This is set by setup_git_dir_gently() and/or git_default_config() */
diff --git a/read-cache.c b/read-cache.c
index c141fec..7fd9b2c 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1821,7 +1821,10 @@ static int poke_daemon(struct index_state *istate,
if (refresh_cache) {
ret = write_in_full(fd, "refresh", 8) == 8;
} else {
- ret = poke_and_wait_for_reply(fd);
+ if (wait_for_index_helper)
+ ret = poke_and_wait_for_reply(fd);
+ else
+ ret = write_in_full(fd, "poke", 5) == 5;
}
close(fd);
--
2.4.2.767.g62658d5-twtrsrc
prev parent reply other threads:[~2016-03-19 1:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-19 1:04 [PATCH v2 00/15] index-helper, watchman David Turner
2016-03-19 1:04 ` [PATCH v2 01/17] read-cache.c: fix constness of verify_hdr() David Turner
2016-03-19 1:04 ` [PATCH v2 02/17] read-cache: allow to keep mmap'd memory after reading David Turner
2016-03-19 1:04 ` [PATCH v2 03/17] index-helper: new daemon for caching index and related stuff David Turner
2016-03-29 2:31 ` Duy Nguyen
2016-03-29 21:51 ` David Turner
2016-03-19 1:04 ` [PATCH v2 04/17] index-helper: add --strict David Turner
2016-03-19 1:04 ` [PATCH v2 05/17] daemonize(): set a flag before exiting the main process David Turner
2016-03-19 1:04 ` [PATCH v2 06/17] index-helper: add --detach David Turner
2016-03-29 2:35 ` Duy Nguyen
2016-03-19 1:04 ` [PATCH v2 07/17] read-cache: add watchman 'WAMA' extension David Turner
2016-03-19 1:04 ` [PATCH v2 08/17] read-cache: invalidate untracked cache data when reading WAMA David Turner
2016-03-29 2:50 ` Duy Nguyen
2016-03-29 21:22 ` David Turner
2016-03-19 1:04 ` [PATCH v2 09/17] Add watchman support to reduce index refresh cost David Turner
2016-03-24 13:47 ` Jeff Hostetler
2016-03-24 17:58 ` David Turner
2016-03-19 1:04 ` [PATCH v2 10/17] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-03-19 1:04 ` [PATCH v2 11/17] update-index: enable/disable watchman support David Turner
2016-03-19 1:04 ` [PATCH v2 12/17] unpack-trees: preserve index extensions David Turner
2016-03-19 1:04 ` [PATCH v2 13/17] index-helper: kill mode David Turner
2016-03-19 1:04 ` [PATCH v2 14/17] index-helper: don't run if already running David Turner
2016-03-19 1:04 ` [PATCH v2 15/17] index-helper: autorun mode David Turner
2016-03-19 1:04 ` [PATCH v2 16/17] index-helper: optionally automatically run David Turner
2016-03-19 1:04 ` David Turner [this message]
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=1458349490-1704-18-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/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).