[PATCH v2 13/17] index-helper: kill mode

From

David Turner <dturner@twopensource.com>

Date

Mar 19, 2016, 01:04 UTC

Message-ID

<1458349490-1704-14-git-send-email-dturner@twopensource.com>

In-Reply-To

<1458349490-1704-1-git-send-email-dturner@twopensource.com>

This is mainly useful for tests.

Signed-off-by: David Turner <dturner@twopensource.com>
---
 index-helper.c          | 39 +++++++++++++++++++++++++++++++++++++--
 t/t7900-index-helper.sh |  9 +++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/index-helper.c b/index-helper.c
index 445a0ac..ffa3c2a 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -286,6 +286,8 @@ static void loop(int fd, int idle_in_seconds)
 						 * alive, nothing to do.
 						 */
 						;
+				} else if (!strcmp(command.buf, "die")) {
+					break;
 				} else {
 					warning("BUG: Bogus command %s", command.buf);
 				}
@@ -338,10 +340,35 @@ static const char * const usage_text[] = {
 	NULL
 };
 
+static void request_kill(const char *pipe_path)
+{
+	int fd;
+
+	fd = open(pipe_path, O_WRONLY | O_NONBLOCK);
+	if (fd < 0) {
+		warning("No existing pipe; can't send kill message to old process");
+		goto done;
+	}
+
+	write_in_full(fd, "die", 4);
+	close(fd);
+
+done:
+	/*
+	 * The child will try to do this anyway, but we want to be
+	 * ready to launch a new daemon immediately after this command
+	 * returns.
+	 */
+
+	unlink(pipe_path);
+	return;
+}
+
+
 int main(int argc, char **argv)
 {
 	const char *prefix;
-	int idle_in_seconds = 600, detach = 0;
+	int idle_in_seconds = 600, detach = 0, kill = 0;
 	int fd;
 	struct strbuf pipe_path = STRBUF_INIT;
 	struct option options[] = {
@@ -350,6 +377,7 @@ int main(int argc, char **argv)
 		OPT_BOOL(0, "strict", &to_verify,
 			 "verify shared memory after creating"),
 		OPT_BOOL(0, "detach", &detach, "detach the process"),
+		OPT_BOOL(0, "kill", &kill, "request that existing index helper processes exit"),
 		OPT_END()
 	};
 
@@ -364,10 +392,17 @@ int main(int argc, char **argv)
 			  options, usage_text, 0))
 		die(_("too many arguments"));
 
+	strbuf_git_path(&pipe_path, "index-helper.pipe");
+	if (kill) {
+		if (detach)
+			die(_("--kill doesn't want any other options"));
+		request_kill(pipe_path.buf);
+		return 0;
+	}
+
 	atexit(cleanup);
 	sigchain_push_common(cleanup_on_signal);
 
-	strbuf_git_path(&pipe_path, "index-helper.pipe");
 	fd = setup_pipe(pipe_path.buf);
 	if (fd < 0)
 		die_errno("Could not set up index-helper.pipe");
diff --git a/t/t7900-index-helper.sh b/t/t7900-index-helper.sh
index 7126037..14b5a6c 100755
--- a/t/t7900-index-helper.sh
+++ b/t/t7900-index-helper.sh
@@ -15,4 +15,13 @@ test_expect_success 'index-helper smoke test' '
 	test_path_is_missing .git/index-helper.pipe
 '
 
+test_expect_success 'index-helper creates usable pipe file and can be killed' '
+	test_when_finished "git index-helper --kill" &&
+	test_path_is_missing .git/index-helper.pipe &&
+	git index-helper --detach &&
+	test -p .git/index-helper.pipe &&
+	git index-helper --kill &&
+	test_path_is_missing .git/index-helper.pipe
+'
+
 test_done

-- 
2.4.2.767.g62658d5-twtrsrc