git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 18/19] index-helper: autorun

From
Duy Nguyen <pclouds@gmail.com>
Date
Mar 15, 2016, 12:12 UTC
Message-ID
<CACsJy8CaWFhCzrH3imz+BRMTESSmyUB4jeAaYUDNk+Tmpj-VrQ@mail.gmail.com>
In-Reply-To
<1457548582-28302-19-git-send-email-dturner@twopensource.com>
On Thu, Mar 10, 2016 at 1:36 AM, David Turner <dturner@twopensource.com> wrote:
> Introduce a new config option, indexhelper.autorun, to automatically
> run git index-helper before starting up a builtin git command.  This
> enables users to keep index-helper running without manual
> intervention.

This could be a problem on Windows because "index-helper --detach" does not work there. I have no idea how "daemons" are managed on Windows and not sure if our design is still good when such a "daemon" is added on Windows. So I'm pulling Johannes in for his opinions.

Background for Johannes. We're adding "git index-helper" daemon (one per repo) to cache the index in memory to speed up index load time (and in future probably name-hash too, I think it's also more often used on Windows because of case-insensitive fs). It also enables watchman (on Windows) for faster refresh. This patch allows to start the daemon automatically if it's not running. But I don't know it will work ok on Windows.

Assuming that "index-helper" service has to be installed and started from system, there can only be one service running right? This clashes with the per-repo daemon design... I think it can stilf work, if the main service just spawns new process, one for each repo. But again I'm not sure.

Show 126 quoted lines
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
>  git.c                   | 38 +++++++++++++++++++++++++++++++++++++-
>  index-helper.c          | 11 ++++++++++-
>  t/t7900-index-helper.sh | 10 ++++++++++
>  3 files changed, 57 insertions(+), 2 deletions(-)
>
> diff --git a/git.c b/git.c
> index a4f6f71..ccf04ab 100644
> --- a/git.c
> +++ b/git.c
> @@ -521,6 +521,40 @@ static void strip_extension(const char **argv)
>  #define strip_extension(cmd)
>  #endif
>
> +static int want_auto_index_helper(void)
> +{
> +       int want = -1;
> +       const char *value = NULL;
> +       const char *key = "indexhelper.autorun";
> +
> +       if (git_config_key_is_valid(key) &&
> +           !git_config_get_value(key, &value)) {
> +               int b = git_config_maybe_bool(key, value);
> +               want = b >= 0 ? b : 0;
> +       }
> +       return want;
> +}
> +
> +static void maybe_run_index_helper(struct cmd_struct *cmd)
> +{
> +       const char *argv[] = {"git-index-helper", "--detach", "--auto", NULL};
> +       int status;
> +
> +       if (!(cmd->option & NEED_WORK_TREE))
> +               return;
> +
> +       if (want_auto_index_helper() <= 0)
> +               return;
> +
> +       trace_argv_printf(argv, "trace: auto index-helper:");
> +
> +       status = run_command_v_opt(argv, RUN_SILENT_EXEC_FAILURE | RUN_CLEAN_ON_EXIT);
> +
> +       if (status) {
> +               warning("You specified indexhelper.autorun, but running git-index-helper failed");
> +       }
> +}
> +
>  static void handle_builtin(int argc, const char **argv)
>  {
>         const char *cmd;
> @@ -536,8 +570,10 @@ static void handle_builtin(int argc, const char **argv)
>         }
>
>         builtin = get_builtin(cmd);
> -       if (builtin)
> +       if (builtin) {
> +               maybe_run_index_helper(builtin);
>                 exit(run_builtin(builtin, argc, argv));
> +       }
>  }
>
>  static void execv_dashed_external(const char **argv)
> diff --git a/index-helper.c b/index-helper.c
> index a75da60..bc5c328 100644
> --- a/index-helper.c
> +++ b/index-helper.c
> @@ -379,6 +379,7 @@ int main(int argc, char **argv)
>         int idle_in_minutes = 10, detach = 0;
>         int ignore_existing = 0;
>         int kill_existing = 0;
> +       int nongit = 0, autorun = 0;
>         const char *pid_file;
>         struct option options[] = {
>                 OPT_INTEGER(0, "exit-after", &idle_in_minutes,
> @@ -388,6 +389,7 @@ int main(int argc, char **argv)
>                 OPT_BOOL(0, "detach", &detach, "detach the process"),
>                 OPT_BOOL(0, "ignore-existing", &ignore_existing, "run even if another index-helper seems to be running for this repo"),
>                 OPT_BOOL(0, "kill", &kill_existing, "kill any running index-helper for this repo"),
> +               OPT_BOOL(0, "auto", &autorun, "this is an automatic run of git index-helper, so certain errors can be solved by silently exiting"),
>                 OPT_END()
>         };
>
> @@ -397,11 +399,18 @@ int main(int argc, char **argv)
>         if (argc == 2 && !strcmp(argv[1], "-h"))
>                 usage_with_options(usage_text, options);
>
> -       prefix = setup_git_directory();
> +       prefix = setup_git_directory_gently(&nongit);
>         if (parse_options(argc, (const char **)argv, prefix,
>                           options, usage_text, 0))
>                 die(_("too many arguments"));
>
> +       if (nongit) {
> +               if (autorun)
> +                       exit(0);
> +               else
> +                       die("Not a git repository");
> +       }
> +
>         if (ignore_existing && kill_existing)
>                 die(_("--ignore-existing and --kill don't make sense together"));
>
> diff --git a/t/t7900-index-helper.sh b/t/t7900-index-helper.sh
> index 6708180..e4f9564 100755
> --- a/t/t7900-index-helper.sh
> +++ b/t/t7900-index-helper.sh
> @@ -20,4 +20,14 @@ test_expect_success 'index-helper creates usable pid file and can be killed' '
>         ! kill -0 $pid
>  '
>
> +test_expect_success 'index-helper autorun works' '
> +       rm -f .git/index-helper.pid &&
> +       git status &&
> +       test_path_is_missing .git/index-helper.pid &&
> +       test_config indexhelper.autorun true &&
> +       git status &&
> +       test_path_is_file .git/index-helper.pid &&
> +       git index-helper --kill
> +'
> +
>  test_done
> --
> 2.4.2.767.g62658d5-twtrsrc
>
-- 
Duy
Previous: David TurnerNext: Johannes Schindelin
Message 38 of 60 in “index-helper, watchman”
  1. 00/19 index-helper, watchmanDavid Turner, Mar 9, 2016
  2. 01/19 trace.c: add GIT_TRACE_PACK_STATS for pack usage statisticsDavid Turner, Mar 9, 2016
  3. Junio C HamanoMar 9, 2016
  4. David TurnerMar 10, 2016
  5. Duy NguyenMar 10, 2016
  6. 02/19 read-cache.c: fix constness of verify_hdr()David Turner, Mar 9, 2016
  7. 03/19 read-cache: allow to keep mmap'd memory after readingDavid Turner, Mar 9, 2016
  8. Junio C HamanoMar 9, 2016
  9. David TurnerMar 10, 2016
  10. 04/19 index-helper: new daemon for caching index and related stuffDavid Turner, Mar 9, 2016
  11. Junio C HamanoMar 9, 2016
  12. Junio C HamanoMar 9, 2016
  13. David TurnerMar 10, 2016
  14. Duy NguyenMar 10, 2016
  15. David TurnerMar 10, 2016
  16. Duy NguyenMar 11, 2016
  17. David TurnerMar 10, 2016
  18. Duy NguyenMar 15, 2016
  19. Junio C HamanoMar 15, 2016
  20. Duy NguyenMar 15, 2016
  21. 05/19 trace.c: add GIT_TRACE_INDEX_STATS for index statisticsDavid Turner, Mar 9, 2016
  22. 06/19 index-helper: add --strictDavid Turner, Mar 9, 2016
  23. 07/19 daemonize(): set a flag before exiting the main processDavid Turner, Mar 9, 2016
  24. 08/19 index-helper: add --detachDavid Turner, Mar 9, 2016
  25. 09/19 index-helper: add Windows supportDavid Turner, Mar 9, 2016
  26. Duy NguyenMar 16, 2016
  27. Johannes SchindelinMar 17, 2016
  28. Duy NguyenMar 17, 2016
  29. 10/19 read-cache: add watchman 'WAMA' extensionDavid Turner, Mar 9, 2016
  30. 11/19 Add watchman support to reduce index refresh costDavid Turner, Mar 9, 2016
  31. 12/19 read-cache: allow index-helper to prepare shm before git reads itDavid Turner, Mar 9, 2016
  32. 13/19 index-helper: use watchman to avoid refreshing index with lstat()David Turner, Mar 9, 2016
  33. 14/19 update-index: enable/disable watchman supportDavid Turner, Mar 9, 2016
  34. 15/19 unpack-trees: preserve index extensionsDavid Turner, Mar 9, 2016
  35. 16/19 index-helper: rewrite pidfile after daemonizingDavid Turner, Mar 9, 2016
  36. 17/19 index-helper: process managementDavid Turner, Mar 9, 2016
  37. 18/19 index-helper: autorunDavid Turner, Mar 9, 2016
  38. Duy NguyenMar 15, 2016
  39. Johannes SchindelinMar 15, 2016
  40. Duy NguyenMar 16, 2016
  41. David TurnerMar 16, 2016
  42. Johannes SchindelinMar 16, 2016
  43. Duy NguyenMar 17, 2016
  44. Johannes SchindelinMar 17, 2016
  45. David TurnerMar 17, 2016
  46. Duy NguyenMar 18, 2016
  47. Johannes SchindelinMar 18, 2016
  48. Duy NguyenMar 18, 2016
  49. David TurnerMar 18, 2016
  50. Duy NguyenMar 18, 2016
  51. Johannes SchindelinMar 18, 2016
  52. Duy NguyenMar 18, 2016
  53. Johannes SchindelinMar 18, 2016
  54. 19/19 hack: watchman/untracked cache mashupDavid Turner, Mar 9, 2016
  55. Duy NguyenMar 15, 2016
  56. David TurnerMar 17, 2016
  57. Duy NguyenMar 17, 2016
  58. David TurnerMar 17, 2016
  59. Torsten BögershausenMar 29, 2016
  60. David TurnerMar 29, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.