Re: [PATCH 3/3] introduce "format" date-mode
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jun 30, 2015, 16:58 UTC
- Message-ID
- <CAPig+cTXc_RXbOAOaF2MFjrg+DSet=g0XQMZY0ErMYAmNVSV+g@mail.gmail.com>
- In-Reply-To
- <20150630102055.GA11928@peff.net>
On Tue, Jun 30, 2015 at 6:20 AM, Jeff King <peff@peff.net> wrote:
Show 22 quoted lines
> On Mon, Jun 29, 2015 at 06:22:47PM -0400, Eric Sunshine wrote:
>> void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm)
>> {
>> size_t len;
>> struct strbuf f = STRBUF_INIT;
>>
>> /*
>> * This is a bit tricky since strftime returns 0 if the result did not
>> * fit in the supplied buffer, as well as when the formatted time has
>> * zero length. In the former case, we need to grow the buffer and try
>> * again. To distinguish between the two cases, we supply strftime with
>> * a format string one character longer than what the client supplied,
>> * which ensures that a successful format will have non-zero length,
>> * and then drop the extra character from the formatted time before
>> * returning.
>> */
>> strbuf_addf(&f, "%s ", fmt);
>
> Basically I was trying to avoid making any assumptions about exactly how
> strftime works. But presumably "stick a space in the format" is a
> universally reasonable thing to do. It's a hack, but it's contained to
> the function.I don't think we're making any assumptions about strftime(). POSIX states:
The format string consists of zero or more conversion
specifications and ordinary characters. [...] All ordinary
characters (including the terminating NUL character) are copied
unchanged into the array.So, we seem to be on solid footing with this approach (even though it's a localized hack).
Show 9 quoted lines
>> do {
>> strbuf_grow(sb, 128);
>> len = strftime(sb->buf + sb->len, sb->alloc - sb->len,
>> f.buf, tm);
>> } while (!len);
>
> I think we need to keep growing this 128 ourselves, or else each loop
> iteration will just say "yup, we have 128 bytes available; no need to
> grow".Yeah, I toyed with the idea of increasing the requested amount each iteration but wanted to keep the example simple, thus left it out. However, for some reason, I was thinking that strbuf_grow() was unconditionally expanding the buffer by the requested amount rather than merely ensuring that that amount was availabile, so the amount clearly needs to be increased on each iteration. Thanks for pointing that out.
Show 6 quoted lines
>> If this is performance critical code, then the augmented format >> string can be constructed with less expensive functions than >> strbuf_addf(). > > This does get called a lot (e.g., once per commit). One extra allocation > would probably not kill us there [...]
Beyond the extra allocation, I was also concerned about the sledgehammer approach of "%s " to append a single character when there are much less expensive ways to do so.
Show 26 quoted lines
> [...] but I think we could fairly trivially put this on the unlikely path:
>
> size_t hint = 128;
> size_t len;
>
> /* optimize out obvious 0-length case */
> if (!*fmt)
> return;
>
> strbuf_grow(sb, hint);
> len = strftime(sb->buf + sb->len, sb->alloc - sb->len, fmt, tm);
>
> /* maybe not enough room, or maybe 0-length output */
> if (!len) {
> struct strbuf f = STRBUF_INIT;
> strbuf_addf(&f, "%s ", fmt);
> while (!len) {
> hint *= 2;
> strbuf_grow(sb, hint);
> len = strftime(sb->buf + sb->len, sb->alloc - sb->len, f.buf, tm);
> }
> }
>
> I'd guess most cases will fit in 128 bytes and never even hit this code
> path. You could also get fancier and start the buffer smaller, but only
> do the fmt hack when we cross a threshold.Yep, I toyed with other looping constructs as well before settling upon do-while in the example for its simplicity. If called often enough, this sort of optimization seems reasonable enough.