Git development
 help / color / mirror / Atom feed
From: Lukas Fleischer <lfleischer@lfos.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Nicolas Pitre" <nico@fluxnic.net>,
	"Johannes Sixt" <j6t@kdbg.org>
Subject: Re: [PATCH v2] Refactor recv_sideband()
Date: Sun, 19 Jun 2016 12:48:19 +0200	[thread overview]
Message-ID: <146633329934.562.6352514848469017860@typhoon> (raw)
In-Reply-To: <146597489449.32143.1327156804178869158@s-8d3a2dc3.on.site.uni-stuttgart.de>

On Wed, 15 Jun 2016 at 09:14:54, Lukas Fleischer wrote:
> What we could do is reintroduce the local prefix variable I had in v1
> and use that to store whether a prefix needs to be prepended or not. If
> we do that and if we are fine with strbuf memory being (potentially)
> allocated and re-allocated multiple times during a single
> recv_sideband() invocation, the strbuf could be made local to the part
> that actually needs it and could be used as in asprintf().

When I revamped the patch and looked at similar code I had another idea
that I did not want to keep to myself:

In contexts similar to this patch, we often seem to use statically
allocated string buffers as follows:

-- 8< --
diff --git a/sideband.c b/sideband.c
index 8340a1b..08b75e2 100644
--- a/sideband.c
+++ b/sideband.c
@@ -22,9 +22,10 @@ int recv_sideband(const char *me, int in_stream, int out)
 {
 	const char *term, *suffix;
 	char buf[LARGE_PACKET_MAX + 1];
-	struct strbuf outbuf = STRBUF_INIT;
+	static struct strbuf outbuf = STRBUF_INIT;
 	const char *b, *brk;
 
+	strbuf_reset(&outbuf);
 	strbuf_addf(&outbuf, "%s", PREFIX);
 	term = getenv("TERM");
 	if (isatty(2) && term && strcmp(term, "dumb"))
-- 8< --

The benefits are obvious: No memory (re-)allocation overhead and no need
to take care of freeing on every return path. The downside is that the
function becomes non-thread-safe. After looking at the call sites, it
seems like we do not seem to call recv_sideband() from different threads
yet -- but do we want to rely on that?

The other two options are:

1. As I suggested earlier, introduce a wrapper that could be named
   xwritef() or fprintf_atomic() and allocate a new buffer (i.e., use a
   fresh strbuf) each time something is printed.

2. Keep using a fixed-size buffer size we already know the maximum size
   each of the strings can have.

Which one do you prefer?

Regards,
Lukas

  parent reply	other threads:[~2016-06-19 10:48 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-13 19:52 [PATCH] Refactor recv_sideband() Lukas Fleischer
2016-06-13 21:07 ` Nicolas Pitre
2016-06-14 13:44   ` Johannes Schindelin
2016-06-14 15:04     ` Nicolas Pitre
2016-06-14 15:30       ` Johannes Schindelin
     [not found]       ` <Cq7rbYgOpb0CVCq7sbGmpL@videotron.ca>
2016-06-14 16:43         ` Nicolas Pitre
2016-06-14 17:09   ` Nicolas Pitre
     [not found]     ` <CsLdb3qLMBok7CsLebwX38@videotron.ca>
2016-06-14 17:55       ` Nicolas Pitre
2016-06-14 18:11         ` Junio C Hamano
2016-06-14 19:11           ` Lukas Fleischer
2016-06-14 19:16             ` Junio C Hamano
     [not found]         ` <Ct7VbfLfTHEALCt7Wbh8Xs@videotron.ca>
2016-06-14 20:10           ` Nicolas Pitre
2016-06-14 21:00 ` [PATCH v2] " Lukas Fleischer
2016-06-14 21:11   ` Lukas Fleischer
2016-06-14 21:25   ` Junio C Hamano
2016-06-15  3:44     ` Jeff King
     [not found]     ` <146597489449.32143.1327156804178869158@s-8d3a2dc3.on.site.uni-stuttgart.de>
2016-06-19 10:48       ` Lukas Fleischer [this message]
2016-06-24 15:31   ` Jeff King
2016-06-24 17:45     ` Johannes Schindelin
2016-06-24 18:14       ` Jeff King
2016-06-24 18:32         ` Junio C Hamano
2016-06-27 10:58           ` Lukas Fleischer
2016-06-27 15:54             ` Junio C Hamano
2016-06-27 16:16               ` Jeff King
2016-06-27 17:50                 ` Junio C Hamano
2016-06-27 20:34                   ` Lukas Fleischer
2016-06-27 20:47                     ` Nicolas Pitre
2016-06-28  4:01                       ` Lukas Fleischer
2016-06-28  5:20                     ` Junio C Hamano
2016-06-28 10:04                 ` Johannes Schindelin
2016-06-28 10:05                   ` Johannes Schindelin
2016-06-28 15:13                     ` Junio C Hamano
2016-06-28 16:21                       ` Johannes Schindelin
2016-06-24 20:07         ` Dennis Kaarsemaker
2016-06-22  5:29 ` [PATCH v3] " Lukas Fleischer
2016-06-22 15:02   ` Nicolas Pitre
2016-06-22 22:47     ` Nicolas Pitre
2016-06-23 17:35       ` Lukas Fleischer
2016-06-23 18:59         ` Nicolas Pitre
2016-06-28  4:35 ` [PATCH v4] " Lukas Fleischer
2016-06-28 16:57   ` Junio C Hamano
2016-06-28 17:24     ` Junio C Hamano
2016-06-28 17:46       ` Nicolas Pitre
2016-06-28 18:13         ` Junio C Hamano
2016-06-28 18:28           ` Nicolas Pitre
2016-06-28 19:51             ` Junio C Hamano
2016-06-28 20:36               ` Nicolas Pitre
2016-06-28 21:09                 ` Junio C Hamano
2016-06-28 21:44                   ` Nicolas Pitre
2016-06-28 22:33                     ` Junio C Hamano
2016-06-28 22:47                       ` Junio C Hamano
2016-06-29  3:00                         ` Junio C Hamano
2016-06-29  3:41                           ` Nicolas Pitre
2016-06-29  2:02                       ` Nicolas Pitre
2016-06-29 16:40                         ` Junio C Hamano
2016-06-30  6:16                           ` Lukas Fleischer
2016-07-01 20:01                             ` Junio C Hamano
2016-07-05 20:35                           ` Nicolas Pitre
2016-07-06 21:11                             ` Junio C Hamano
2016-07-07  0:56                               ` Nicolas Pitre

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=146633329934.562.6352514848469017860@typhoon \
    --to=lfleischer@lfos.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=nico@fluxnic.net \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox