From: David Turner <novalis@novalis.org>
To: git@vger.kernel.org, pclouds@gmail.com, kamggg@gmail.com
Cc: David Turner <dturner@twopensource.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v13 15/20] index-helper: kill mode
Date: Sun, 26 Jun 2016 00:14:19 -0400 [thread overview]
Message-ID: <1466914464-10358-15-git-send-email-novalis@novalis.org> (raw)
In-Reply-To: <1466914464-10358-1-git-send-email-novalis@novalis.org>
From: David Turner <dturner@twopensource.com>
Add a new command (and command-line arg) to allow index-helpers to
exit cleanly.
This is mainly useful for tests.
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-index-helper.txt | 3 +++
index-helper.c | 31 ++++++++++++++++++++++++++++++-
t/t7900-index-helper.sh | 9 +++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-index-helper.txt b/Documentation/git-index-helper.txt
index b2ca511..6f63a9e 100644
--- a/Documentation/git-index-helper.txt
+++ b/Documentation/git-index-helper.txt
@@ -40,6 +40,9 @@ OPTIONS
--detach::
Detach from the shell.
+--kill::
+ Kill any running index-helper and clean up the socket
+
NOTES
-----
diff --git a/index-helper.c b/index-helper.c
index bb39326..f7a002b 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -361,6 +361,8 @@ static void loop(int fd, int idle_in_seconds)
* alive, nothing to do.
*/
}
+ } else if (!strcmp(buf, "die")) {
+ break;
} else {
warning("BUG: Bogus command %s", buf);
}
@@ -391,10 +393,29 @@ static const char * const usage_text[] = {
NULL
};
+static void request_kill(void)
+{
+ int fd = unix_stream_connect(git_path("index-helper.sock"));
+
+ if (fd >= 0) {
+ write_in_full(fd, "die", 4);
+ close(fd);
+ }
+
+ /*
+ * 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(git_path("index-helper.sock"));
+ 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 socket_path = STRBUF_INIT;
struct option options[] = {
@@ -403,6 +424,7 @@ int main(int argc, char **argv)
OPT_BOOL(0, "strict", &to_verify,
N_("verify shared memory after creating")),
OPT_BOOL(0, "detach", &detach, N_("detach the process")),
+ OPT_BOOL(0, "kill", &kill, N_("request that existing index helper processes exit")),
OPT_END()
};
@@ -417,6 +439,13 @@ int main(int argc, char **argv)
options, usage_text, 0))
die(_("too many arguments"));
+ if (kill) {
+ if (detach)
+ die(_("--kill doesn't want any other options"));
+ request_kill();
+ return 0;
+ }
+
atexit(cleanup);
sigchain_push_common(cleanup_on_signal);
diff --git a/t/t7900-index-helper.sh b/t/t7900-index-helper.sh
index 114c112..e71b5af 100755
--- a/t/t7900-index-helper.sh
+++ b/t/t7900-index-helper.sh
@@ -20,4 +20,13 @@ test_expect_success 'index-helper smoke test' '
test_path_is_missing .git/index-helper.sock
'
+test_expect_success 'index-helper creates usable path file and can be killed' '
+ test_when_finished "git index-helper --kill" &&
+ test_path_is_missing .git/index-helper.sock &&
+ git index-helper --detach &&
+ test -S .git/index-helper.sock &&
+ git index-helper --kill &&
+ test_path_is_missing .git/index-helper.sock
+'
+
test_done
--
1.9.1
next prev parent reply other threads:[~2016-06-26 4:15 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-26 4:14 [PATCH v13 01/20] read-cache.c: fix constness of verify_hdr() David Turner
2016-06-26 4:14 ` [PATCH v13 02/20] read-cache: allow to keep mmap'd memory after reading David Turner
2016-06-26 4:14 ` [PATCH v13 03/20] pkt-line: add gentle version of packet_write David Turner
2016-06-26 4:14 ` [PATCH v13 04/20] index-helper: new daemon for caching index and related stuff David Turner
[not found] ` <CAFUO74nENapwVsM3CUst9AHqy5LcKTFBCnJxGXPk8E952t+X5Q@mail.gmail.com>
2016-06-27 16:53 ` David Turner
2016-06-30 13:06 ` Johannes Schindelin
2016-06-30 15:04 ` Duy Nguyen
2016-07-02 11:20 ` Johannes Schindelin
2016-07-02 12:43 ` Duy Nguyen
2016-06-26 4:14 ` [PATCH v13 05/20] index-helper: add --strict David Turner
2016-06-26 4:14 ` [PATCH v13 06/20] daemonize(): set a flag before exiting the main process David Turner
2016-06-26 4:14 ` [PATCH v13 07/20] index-helper: add --detach David Turner
2016-06-26 4:14 ` [PATCH v13 08/20] index-helper: log warnings David Turner
2016-06-26 4:14 ` [PATCH v13 09/20] read-cache: add watchman 'WAMA' extension David Turner
2016-06-26 4:14 ` [PATCH v13 10/20] watchman: support watchman to reduce index refresh cost David Turner
2016-06-26 4:14 ` [PATCH v13 11/20] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-06-30 17:55 ` Ben Peart
2016-06-30 19:14 ` Duy Nguyen
2016-06-30 23:54 ` Ben Peart
2016-07-03 12:28 ` Duy Nguyen
2016-07-06 16:54 ` Ben Peart
2016-07-08 16:32 ` Duy Nguyen
2016-07-08 16:39 ` Duy Nguyen
2016-06-26 4:14 ` [PATCH v13 12/20] update-index: enable/disable watchman support David Turner
2016-06-26 4:14 ` [PATCH v13 13/20] unpack-trees: preserve index extensions David Turner
2016-06-26 4:14 ` [PATCH v13 14/20] watchman: add a config option to enable the extension David Turner
2016-06-26 4:14 ` David Turner [this message]
2016-06-26 4:14 ` [PATCH v13 16/20] index-helper: don't run if already running David Turner
2016-06-26 4:14 ` [PATCH v13 17/20] index-helper: autorun mode David Turner
2016-06-26 4:14 ` [PATCH v13 18/20] index-helper: optionally automatically run David Turner
2016-06-26 4:14 ` [PATCH v13 19/20] trace: measure where the time is spent in the index-heavy operations David Turner
2016-06-26 12:09 ` [PATCH v13 21/20] unix-socket.c: add stub implementation when unix sockets are not supported Nguyễn Thái Ngọc Duy
2016-06-27 12:14 ` Johannes Schindelin
2016-06-27 16:16 ` Duy Nguyen
2016-06-28 10:06 ` Johannes Schindelin
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=1466914464-10358-15-git-send-email-novalis@novalis.org \
--to=novalis@novalis.org \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kamggg@gmail.com \
--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).