From patchwork Wed Jul 7 10:38:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12362375 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45D69C07E9B for ; Wed, 7 Jul 2021 10:38:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31C2761C99 for ; Wed, 7 Jul 2021 10:38:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231363AbhGGKlb (ORCPT ); Wed, 7 Jul 2021 06:41:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231355AbhGGKla (ORCPT ); Wed, 7 Jul 2021 06:41:30 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45379C06175F for ; Wed, 7 Jul 2021 03:38:49 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id q18-20020a1ce9120000b02901f259f3a250so1361283wmc.2 for ; Wed, 07 Jul 2021 03:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hJLKXoBIGLVWprYasrssCGZuic8ul8OV3m8stBCij+4=; b=FywS1z5F12KYw+j8F4QUEtY023Cx83+221IRyOIgKL5j7vHSyBV7P0H+N4ESSRRioz eJYCGGSZrTatuyneqztMpcjnVLQ4CJUEr9PZahYDgCYQsro+UIgCImNp/BpZxUpRUgUb Kjaak+VEz9P5QnkMCCWV9oLuMrt31eUXpKEbO1LU3fih9p/0PfjAYIgCNYFhTb7Q3uYm tmYYpD8DnbM2ss1Qj5Ru3UupeyQA6eH8C/Jkcg8aWrhOQZXAPRC/roY0fBZB3pRF9EHJ mqO2OqWeQOxgTATYzeijrEkoocFfyCXzSovMu28UtlifO117uMjEo+JuNfBB03zKRp5N sifQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hJLKXoBIGLVWprYasrssCGZuic8ul8OV3m8stBCij+4=; b=o4XoXDl/aa3PEvsvaC/RPjLp2ZCnHihTYge0jzyBgAbnOlpwamyS27sPOUqF2D4QKn xEXQAkQCM8YfvsgQkORgAJSQRrdJ+xM0YU6pYJqzjI7AMUcVXT7sdMk2SBeWyIZBjy/h vWpDx97pYzsqdzBCcTftglKAGI89lE1La9If/ObxVteeb7C7K1rZXjM2NeKvX/4fUs3F 5UtkyZvTtsdTNRujuJvc3YbRW+eYWwnY1Ef9BGHQBBOKU1hwQ9JuYlDoQfPxBdfj+16L uInVp1owovDYIh0t5JrTEID6srRZhuwHODYz4Ip5ahQ3vWo/CRKGIIboDdJtrEKYIev1 5Hbw== X-Gm-Message-State: AOAM5318frhph95LcArLD+4TWjyOU6xvefSUfIb+BiXtjjQQddSLlx/b rDqpQZ2dp5yqaAWIjlWuq2pNtidIiQjREg== X-Google-Smtp-Source: ABdhPJwN0eokcW3PflPKg7Yrnw8co7+RtaULQlteMCLxlZHccDvQaycGhl5hElEEFcDWCvQM/izKHQ== X-Received: by 2002:a1c:7410:: with SMTP id p16mr26598177wmc.24.1625654327593; Wed, 07 Jul 2021 03:38:47 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p3sm5859104wmq.17.2021.07.07.03.38.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 03:38:47 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 1/3] strbuf.[ch]: add STRBUF_HINT_SIZE macro = 8192 Date: Wed, 7 Jul 2021 12:38:40 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.636.g43e71d69cff In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In b449f4cfc97 (Rework strbuf API and semantics., 2007-09-06) the first hardcoding of 8192 appeared in strbuf.[ch], then in f1696ee398e (Strbuf API extensions and fixes., 2007-09-10) another one was added, and in b4e04fb66e8 (strbuf: add strbuf_read_once to read without blocking, 2015-12-15) a third. Let's factor that out into a STRBUF_HINT_SIZE macro, and add a strbuf_hint() helper macro for "hint ? hint : STRBUF_HINT_SIZE". Signed-off-by: Ævar Arnfjörð Bjarmason --- strbuf.c | 6 +++--- strbuf.h | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/strbuf.c b/strbuf.c index 4df30b45494..7e9f5fdc4de 100644 --- a/strbuf.c +++ b/strbuf.c @@ -517,7 +517,7 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint) size_t oldlen = sb->len; size_t oldalloc = sb->alloc; - strbuf_grow(sb, hint ? hint : 8192); + strbuf_grow(sb, strbuf_hint(hint)); for (;;) { ssize_t want = sb->alloc - sb->len - 1; ssize_t got = read_in_full(fd, sb->buf + sb->len, want); @@ -532,7 +532,7 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint) sb->len += got; if (got < want) break; - strbuf_grow(sb, 8192); + strbuf_grow(sb, STRBUF_HINT_SIZE); } sb->buf[sb->len] = '\0'; @@ -544,7 +544,7 @@ ssize_t strbuf_read_once(struct strbuf *sb, int fd, size_t hint) size_t oldalloc = sb->alloc; ssize_t cnt; - strbuf_grow(sb, hint ? hint : 8192); + strbuf_grow(sb, strbuf_hint(hint)); cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1); if (cnt > 0) strbuf_setlen(sb, sb->len + cnt); diff --git a/strbuf.h b/strbuf.h index 223ee2094af..ca3c47966a0 100644 --- a/strbuf.h +++ b/strbuf.h @@ -72,6 +72,17 @@ struct strbuf { extern char strbuf_slopbuf[]; #define STRBUF_INIT { .alloc = 0, .len = 0, .buf = strbuf_slopbuf } +/** + * Various functions take a `size_t hint` to give a hint about the + * file size, to avoid reallocs. This is the default hint size when + * `0` is given. + * + * The strbuf_hint() convenience macro is used internally in the + * API. DO NOT USE any expression with side-effect for 'size'. + */ +#define STRBUF_HINT_SIZE 8192 +#define strbuf_hint(size) ((size) ? (size) : STRBUF_HINT_SIZE) + /* * Predeclare this here, since cache.h includes this file before it defines the * struct. From patchwork Wed Jul 7 10:38:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12362377 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B25C1C07E9C for ; Wed, 7 Jul 2021 10:38:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9846261C99 for ; Wed, 7 Jul 2021 10:38:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231367AbhGGKlc (ORCPT ); Wed, 7 Jul 2021 06:41:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230354AbhGGKlb (ORCPT ); Wed, 7 Jul 2021 06:41:31 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A348C061574 for ; Wed, 7 Jul 2021 03:38:50 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id v5so2505437wrt.3 for ; Wed, 07 Jul 2021 03:38:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rwErDzTF9YEdjoYYQ42kPopqP1xoVubOeJBTPbzT7oY=; b=p6Zg7WPs0nY2iVFIQRGNrVZc4HUd/kUpuKazcySlL67S/JxZz3JbRXg6xXXc0ewFRp 7LZi/DfvyelbPcHwC3VOXlTsQRnVkH2cLnq5snTSJUxP3UgdHiQas92NdEP3tU9NqKUN Wnv8s58w7NY20dOtOV85DX+qre8NxnLThUygNDygLzyZGM2xTnQEylG87PS/SNjpxwCC iYXH1BLMwowvDjkQYh8CWEItKxNRCGb+cj6yR7FDNhXGX3KywdI0h9S4yIEJZjtS6VYa XuzO25V1AAx6yfCTmIan2PTJN3kzQECmAmpabIXEUqN4sXqUorKvTTA3CgwyJZ48g1ad RZqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rwErDzTF9YEdjoYYQ42kPopqP1xoVubOeJBTPbzT7oY=; b=cnd2VFQM2sTMrxMVE6Wm35n95aCvjpzbCyJ5032kT5rxzST77MBWJxhXdQBm6T1p2g RbP2Dw3dSAAUyRFNgl4wt3JlEksvQZKM5QYup7A+fk/CzD9TG9YyZghkfaBS73Kg6eV1 a2QvZW+uyejml9qsDrLJork/mPDcgao+d0rOFzCXhaY1PkDpSccrfSPOPdhvYTZkMSSe UuGRlhi1ucpUJQD5i3PO+IY5pvldWOy/A6sPaadrzXhwx1BQHI4b+smQ6r3MXa4ElASN 4XazRKwOTWAKFSkpdXZOOabJ8ihM+fHgDdqgBuFH66kM5XyHOkXVdcm3YC55cMNYVKTb vpUQ== X-Gm-Message-State: AOAM533XU5IePlmD3TpCGAsjdMaQ6GVA7zrLRByn0wiHiS3X8yWHeQiG bWap9JOBfq0tiCXd9irR0jvSnrbFQMYC9w== X-Google-Smtp-Source: ABdhPJzmp7XmFeZpJK5Fg5VuJl5xHfwkDDaMPf1KJEELCGyqJ7CQgbYmyE4NfZ/WxpgE+dI2+LDmbA== X-Received: by 2002:a5d:62c2:: with SMTP id o2mr27373176wrv.234.1625654328548; Wed, 07 Jul 2021 03:38:48 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p3sm5859104wmq.17.2021.07.07.03.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 03:38:47 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 2/3] strbuf.h API users: don't hardcode 8192, use STRBUF_HINT_SIZE Date: Wed, 7 Jul 2021 12:38:41 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.636.g43e71d69cff In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change a couple of users of strbuf_init() that pass a hint of 8192 to pass STRBUF_HINT_SIZE instead. Both of these hardcoded occurrences pre-date the use of the strbuf API. See 5242bcbb638 (Use strbuf API in cache-tree.c, 2007-09-06) and af6eb82262e (Use strbuf API in apply, blame, commit-tree and diff, 2007-09-06). In both cases the exact choice of 8192 is rather arbitrary, e.g. for commit buffers I think 1024 or 2048 would probably be a better default (this commit message is getting this commit close to the former, but I daresay it's already way above the average for git commits). In any case, if we ever tweak STRBUF_HINT_SIZE we'll probably do so on the basis of some codease-wide performance tests, so replacing the hardcoded value with STRBUF_HINT_SIZE should be safe, they're the same now, and if we change STRBUF_HINT_SIZE in the future this is one of the main codepaths we'll be testing. Aside: It's unfortunate that we don't take a "hint" of "0" in strbuf_init() to mean "default" and e.g. "-1" to mean the strbuf_slopbuf (a in STRBUF_INIT). I considered adding that, or splitting them up so you'd do strbuf_init(&buf) for the strbuf_init(&buf, 0) case, or strbuf_init_alloc() for the strbuf_init(&buf, N) case, where N > 0. But that would be a big change across the codebase, so let's punt on that for now. Signed-off-by: Ævar Arnfjörð Bjarmason --- cache-tree.c | 2 +- commit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cache-tree.c b/cache-tree.c index 45e58666afc..d69f6d1c66f 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -335,7 +335,7 @@ static int update_one(struct cache_tree *it, /* * Then write out the tree object for this level. */ - strbuf_init(&buffer, 8192); + strbuf_init(&buffer, STRBUF_HINT_SIZE); i = 0; while (i < entries) { diff --git a/commit.c b/commit.c index 8ea55a447fa..b3aab46072a 100644 --- a/commit.c +++ b/commit.c @@ -1521,7 +1521,7 @@ int commit_tree_extended(const char *msg, size_t msg_len, /* Not having i18n.commitencoding is the same as having utf-8 */ encoding_is_utf8 = is_encoding_utf8(git_commit_encoding); - strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */ + strbuf_init(&buffer, STRBUF_HINT_SIZE); /* should avoid reallocs for the headers */ strbuf_addf(&buffer, "tree %s\n", oid_to_hex(tree)); /* From patchwork Wed Jul 7 10:38:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12362379 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7834AC07E95 for ; Wed, 7 Jul 2021 10:38:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6735B61C99 for ; Wed, 7 Jul 2021 10:38:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231388AbhGGKld (ORCPT ); Wed, 7 Jul 2021 06:41:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231364AbhGGKlc (ORCPT ); Wed, 7 Jul 2021 06:41:32 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B24AC061760 for ; Wed, 7 Jul 2021 03:38:51 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so10445851wmq.1 for ; Wed, 07 Jul 2021 03:38:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vbDSmypinBHLdEFNoRlvO9vbddnho2qoZ5PGlnEqxQU=; b=DoPZW2qU6OyEMnhee8QpI6H9yFlFtWc5fDTyr74+jle/0H2ADYAqAcRoXfd9P+PEwG x8GOdOKUnooHwqafbiVy9IH/HeKJiqxKZ4JDrdJCjq6fVgIeXe1kKJyYMdRbyaWNhdvL AfBkQ20YmA/HcgT9E7ehAmV1KNY5uSo2XRF+aW2/Edd6dI/dE4RQdF303iINhA6nhJtd Rx4+DUnuGkJIZA+xXxlRHUvEFdAAym49HsozZwH7/jvMnqYMN7LV268jnpByKMBhTArX mPgHl7wF3/m8RiicO8k7hNcApeI69EDsYuMgb/iQIxVyeVKT/a4AQ/Fz+qXVpvIeqRNC i5Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vbDSmypinBHLdEFNoRlvO9vbddnho2qoZ5PGlnEqxQU=; b=YFbhuWNo831gFDwtspB8LEDypIl0eT4SHouYDzSLky11cbmA7YKznUmmFRvRI7z0i8 GeHNgq6uCanCFHdplMUPOGE8ZQTUk8z8CnyuBCEAotnyEk97IBmKVynklJyR0jtIF5gE EVVKd1IewlZabyLYRXgHzFbbisOU5s3+jSQGW8FsLo5/jZTIcc0wXi6/8/YOI6mhwsWC f8NHFZ5U5Hn+so80lX+IN3YMamYWGkqA6uU11HglLdU7Styaoh0kcZVQCq3Pf9y4FOky ICR90rCl7/lYrZe5yMVgZCYvBchHnfyrQQFaSSXyp1GOB7fLm90nsjAJUxOFkv5l4N34 EAyA== X-Gm-Message-State: AOAM531vAt5/z6m9FVb4wq4HlEQIbl5kxri0QOgC1oQA5nlOACX4h7uS yvrlgmY9B+hlpYs+apET5HiH6ljDvQGnOQ== X-Google-Smtp-Source: ABdhPJx9P/KTsKvoeFxJjW+o+NuevikRwNAeI2X7Mc4bX9qt41ZixG0YNfLPNzWNgJ4cbuqqnxToZg== X-Received: by 2002:a7b:c099:: with SMTP id r25mr5886945wmh.127.1625654329441; Wed, 07 Jul 2021 03:38:49 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p3sm5859104wmq.17.2021.07.07.03.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 03:38:48 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 3/3] strbuf.[ch]: make strbuf_fread() take hint, not size Date: Wed, 7 Jul 2021 12:38:42 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.636.g43e71d69cff In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the strbuf_fread() function to take a "size_t hint" instead of a "size_t size", for consistency with e.g. strbuf_read(). We can then change callers that explicitly passed in our default hint of 8192. The strbuf_fread() has not taken a hint ever since it was added in b449f4cfc97 (Rework strbuf API and semantics., 2007-09-06), it was left out when strbuf_read() learned to do it in f1696ee398e (Strbuf API extensions and fixes., 2007-09-10). Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/am.c | 4 ++-- strbuf.c | 3 ++- strbuf.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index 0b2d886c81b..295b9c4080c 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -781,7 +781,7 @@ static int stgit_patch_to_mail(FILE *out, FILE *in, int keep_cr) } strbuf_reset(&sb); - while (strbuf_fread(&sb, 8192, in) > 0) { + while (strbuf_fread(&sb, 0, in) > 0) { fwrite(sb.buf, 1, sb.len, out); strbuf_reset(&sb); } @@ -898,7 +898,7 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr) } strbuf_reset(&sb); - while (strbuf_fread(&sb, 8192, in) > 0) { + while (strbuf_fread(&sb, 0, in) > 0) { fwrite(sb.buf, 1, sb.len, out); strbuf_reset(&sb); } diff --git a/strbuf.c b/strbuf.c index 7e9f5fdc4de..af3af7622d1 100644 --- a/strbuf.c +++ b/strbuf.c @@ -498,10 +498,11 @@ void strbuf_add_percentencode(struct strbuf *dst, const char *src, int flags) } } -size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f) +size_t strbuf_fread(struct strbuf *sb, size_t hint, FILE *f) { size_t res; size_t oldalloc = sb->alloc; + size_t size = strbuf_hint(hint); strbuf_grow(sb, size); res = fread(sb->buf + sb->len, 1, size, f); diff --git a/strbuf.h b/strbuf.h index ca3c47966a0..7d178e3c8de 100644 --- a/strbuf.h +++ b/strbuf.h @@ -442,13 +442,14 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, /** * Read a given size of data from a FILE* pointer to the buffer. + * if the size is 0 the default hint is used. * * NOTE: The buffer is rewound if the read fails. If -1 is returned, * `errno` must be consulted, like you would do for `read(3)`. * `strbuf_read()`, `strbuf_read_file()` and `strbuf_getline_*()` * family of functions have the same behaviour as well. */ -size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *file); +size_t strbuf_fread(struct strbuf *sb, size_t hint, FILE *file); /** * Read the contents of a given file descriptor. The third argument can be