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

Re: [PATCH v4 09/16] index-helper: use watchman to avoid refreshing index with lstat()

From
David Turner <dturner@twopensource.com>
Date
Apr 19, 2016, 18:54 UTC
Message-ID
<1461092050.5540.106.camel@twopensource.com>
In-Reply-To
<CAGZ79kbzp9N10KoY6hCsFBFiU3SEkdmUN-gCC7he6z4UUHx28A@mail.gmail.com>
On Fri, 2016-04-15 at 17:07 -0700, Stefan Beller wrote:
Show 80 quoted lines
> > +static void refresh_by_watchman(struct index_state *istate)
> > +{
> > +       void *shm = NULL;
> > +       int length;
> > +       int i;
> > +       struct stat st;
> > +       int fd = -1;
> > +       const char *path = index_helper_path("git-watchman-%s
> > -%"PRIuMAX,
> > +                                            sha1_to_hex(istate
> > ->sha1),
> > +                                            (uintmax_t)getpid());
> > +
> > +       fd = open(path, O_RDONLY);
> > +       if (fd < 0)
> > +               return;
> > +
> > +       /*
> > +        * This watchman data is just for us -- no need to keep it
> > +        * around once we've got it open.
> > +        */
> > +       unlink(path);
> > +
> > +       if (fstat(fd, &st) < 0)
> > +               goto done;
> > +
> > +       length = st.st_size;
> > +       shm = mmap(NULL, length, PROT_READ, MAP_SHARED, fd, 0);
> > +
> > +       if (shm == MAP_FAILED)
> > +               goto done;
> > +
> > +       close(fd);
> > +       fd = -1;
> > +
> > +       if (length <= 20 ||
> > +           hashcmp(istate->sha1, (unsigned char *)shm + length -
> > 20) ||
> > +           /*
> > +            * No need to clear CE_WATCHMAN_DIRTY set by 'WAMA' on
> > +            * disk. Watchman can only set more, not clear any, so
> > +            * this is OR mask.
> > +            */
> > +           read_watchman_ext(istate, shm, length - 20))
> > +               goto done;
> > +
> > +       /*
> > +        * Now that we've marked the invalid entries in the
> > +        * untracked-cache itself, we can erase them from the list
> > of
> > +        * entries to be processed and mark the untracked cache for
> > +        * watchman usage.
> > +        */
> > +       if (istate->untracked) {
> > +               string_list_clear(&istate->untracked
> > ->invalid_untracked, 0);
> > +               istate->untracked->use_watchman = 1;
> > +       }
> > +
> > +       for (i = 0; i < istate->cache_nr; i++) {
> > +               struct cache_entry *ce = istate->cache[i];
> > +               if (ce_stage(ce) || (ce->ce_flags &
> > CE_WATCHMAN_DIRTY))
> > +                       continue;
> > +               ce_mark_uptodate(ce);
> > +       }
> > +done:
> > +       if (shm)
> > +               munmap(shm, length);
> > +
> > +       if (fd > 0)
> > +               close(fd);
> 
> coverities opinion:
> > off_by_one: Testing whether handle fd is strictly greater than zero
> > is suspicious.
> > fd leaks when it is zero. Did you intend to include equality with
> > zero?
> 
> We can assert that fd is never 0, because that is where stdin is?
You are right: it should be if (fd >= 0).  Will fix. Thanks.
Previous: Stefan BellerNext: David Turner
Message 28 of 39 in “index-helper, watchman”
  1. 00/16 index-helper, watchmanDavid Turner, Apr 13, 2016
  2. 01/16 read-cache.c: fix constness of verify_hdr()David Turner, Apr 13, 2016
  3. 02/16 read-cache: allow to keep mmap'd memory after readingDavid Turner, Apr 13, 2016
  4. 03/16 index-helper: new daemon for caching index and related stuffDavid Turner, Apr 13, 2016
  5. Duy NguyenApr 13, 2016
  6. David TurnerApr 13, 2016
  7. Duy NguyenApr 14, 2016
  8. David TurnerApr 15, 2016
  9. Duy NguyenApr 15, 2016
  10. David TurnerApr 15, 2016
  11. Duy NguyenApr 16, 2016
  12. Ramsay JonesApr 13, 2016
  13. David TurnerApr 13, 2016
  14. Junio C HamanoApr 14, 2016
  15. David TurnerApr 14, 2016
  16. Duy NguyenApr 15, 2016
  17. Stefan BellerApr 16, 2016
  18. David TurnerApr 19, 2016
  19. David TurnerApr 19, 2016
  20. 04/16 index-helper: add --strictDavid Turner, Apr 13, 2016
  21. 05/16 daemonize(): set a flag before exiting the main processDavid Turner, Apr 13, 2016
  22. 06/16 index-helper: add --detachDavid Turner, Apr 13, 2016
  23. 07/16 read-cache: add watchman 'WAMA' extensionDavid Turner, Apr 13, 2016
  24. 08/16 Add watchman support to reduce index refresh costDavid Turner, Apr 13, 2016
  25. Duy NguyenApr 17, 2016
  26. 09/16 index-helper: use watchman to avoid refreshing index with lstat()David Turner, Apr 13, 2016
  27. Stefan BellerApr 16, 2016
  28. David TurnerApr 19, 2016
  29. 10/16 update-index: enable/disable watchman supportDavid Turner, Apr 13, 2016
  30. 11/16 unpack-trees: preserve index extensionsDavid Turner, Apr 13, 2016
  31. 12/16 index-helper: kill modeDavid Turner, Apr 13, 2016
  32. Ævar Arnfjörð BjarmasonApr 16, 2016
  33. David TurnerApr 19, 2016
  34. 13/16 index-helper: don't run if already runningDavid Turner, Apr 13, 2016
  35. 14/16 index-helper: autorun modeDavid Turner, Apr 13, 2016
  36. 15/16 index-helper: optionally automatically runDavid Turner, Apr 13, 2016
  37. Duy NguyenApr 17, 2016
  38. David TurnerApr 19, 2016
  39. 16/16 read-cache: config for waiting for index-helperDavid Turner, Apr 13, 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.