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

Re: [PATCH v10 03/20] pkt-line: add gentle version of packet_write

From
Junio C Hamano <gitster@pobox.com>
Date
May 12, 2016, 21:14 UTC
Message-ID
<xmqqlh3fc72l.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1463084415-19826-4-git-send-email-dturner@twopensource.com>
David Turner <dturner@twopensource.com> writes:
Show 10 quoted lines
> packet_write calls write_or_die, which dies with a sigpipe even if
> calling code has explicitly blocked that signal.
>
> Add packet_write_gently and packet_flush_gently, which don't.  Soon,
> we will use this for communication with git index-helper, which, being
> merely an optimization, should be permitted to die without disrupting
> clients.
>
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
Looks quite sensible.  Thanks.
Show 53 quoted lines
>  pkt-line.c | 18 ++++++++++++++++++
>  pkt-line.h |  2 ++
>  2 files changed, 20 insertions(+)
>
> diff --git a/pkt-line.c b/pkt-line.c
> index 62fdb37..f964446 100644
> --- a/pkt-line.c
> +++ b/pkt-line.c
> @@ -91,6 +91,12 @@ void packet_flush(int fd)
>  	write_or_die(fd, "0000", 4);
>  }
>  
> +int packet_flush_gently(int fd)
> +{
> +	packet_trace("0000", 4, 1);
> +	return write_in_full(fd, "0000", 4) != 4;
> +}
> +
>  void packet_buf_flush(struct strbuf *buf)
>  {
>  	packet_trace("0000", 4, 1);
> @@ -130,6 +136,18 @@ void packet_write(int fd, const char *fmt, ...)
>  	write_or_die(fd, buf.buf, buf.len);
>  }
>  
> +int packet_write_gently(int fd, const char *fmt, ...)
> +{
> +	static struct strbuf buf = STRBUF_INIT;
> +	va_list args;
> +
> +	strbuf_reset(&buf);
> +	va_start(args, fmt);
> +	format_packet(&buf, fmt, args);
> +	va_end(args);
> +	return write_in_full(fd, buf.buf, buf.len) != buf.len;
> +}
> +
>  void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
>  {
>  	va_list args;
> diff --git a/pkt-line.h b/pkt-line.h
> index 3cb9d91..deffcb5 100644
> --- a/pkt-line.h
> +++ b/pkt-line.h
> @@ -20,7 +20,9 @@
>   * side can't, we stay with pure read/write interfaces.
>   */
>  void packet_flush(int fd);
> +int packet_flush_gently(int fd);
>  void packet_write(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
> +int packet_write_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
>  void packet_buf_flush(struct strbuf *buf);
>  void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
Previous: David TurnerNext: David Turner
Message 5 of 33 in “index-helper/watchman”
  1. 00/20 index-helper/watchmanDavid Turner, May 12, 2016
  2. 01/20 read-cache.c: fix constness of verify_hdr()David Turner, May 12, 2016
  3. 02/20 read-cache: allow to keep mmap'd memory after readingDavid Turner, May 12, 2016
  4. 03/20 pkt-line: add gentle version of packet_writeDavid Turner, May 12, 2016
  5. Junio C HamanoMay 12, 2016
  6. 04/20 index-helper: new daemon for caching index and related stuffDavid Turner, May 12, 2016
  7. 05/20 index-helper: add --strictDavid Turner, May 12, 2016
  8. 06/20 daemonize(): set a flag before exiting the main processDavid Turner, May 12, 2016
  9. 07/20 index-helper: add --detachDavid Turner, May 12, 2016
  10. 08/20 index-helper: log warningsDavid Turner, May 12, 2016
  11. 09/20 read-cache: add watchman 'WAMA' extensionDavid Turner, May 12, 2016
  12. 10/20 watchman: support watchman to reduce index refresh costDavid Turner, May 12, 2016
  13. 11/20 index-helper: use watchman to avoid refreshing index with lstat()David Turner, May 12, 2016
  14. Ramsay JonesMay 12, 2016
  15. David TurnerMay 13, 2016
  16. index-helper: use watchman to avoid refreshing index with lstat()David Turner, May 13, 2016
  17. Ramsay JonesMay 13, 2016
  18. index-helper: use watchman to avoid refreshing index with lstat()David Turner, May 13, 2016
  19. 12/20 update-index: enable/disable watchman supportDavid Turner, May 12, 2016
  20. 13/20 unpack-trees: preserve index extensionsDavid Turner, May 12, 2016
  21. 14/20 watchman: add a config option to enable the extensionDavid Turner, May 12, 2016
  22. 15/20 index-helper: kill modeDavid Turner, May 12, 2016
  23. 16/20 index-helper: don't run if already runningDavid Turner, May 12, 2016
  24. 17/20 index-helper: autorun modeDavid Turner, May 12, 2016
  25. 18/20 index-helper: optionally automatically runDavid Turner, May 12, 2016
  26. 19/20 trace: measure where the time is spent in the index-heavy operationsDavid Turner, May 12, 2016
  27. 20/20 untracked-cache: config optionDavid Turner, May 12, 2016
  28. Duy NguyenMay 15, 2016
  29. David TurnerMay 16, 2016
  30. Dennis KaarsemakerMay 14, 2016
  31. David TurnerMay 19, 2016
  32. Junio C HamanoMay 19, 2016
  33. David TurnerMay 19, 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.