From patchwork Mon Apr 19 11:28:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: ZheNing Hu X-Patchwork-Id: 12211571 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=-12.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,URIBL_BLOCKED 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 8A194C433B4 for ; Mon, 19 Apr 2021 11:28:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6381D6108B for ; Mon, 19 Apr 2021 11:28:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237871AbhDSL3V (ORCPT ); Mon, 19 Apr 2021 07:29:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232548AbhDSL3T (ORCPT ); Mon, 19 Apr 2021 07:29:19 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08A96C061760 for ; Mon, 19 Apr 2021 04:28:49 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id s7so33534477wru.6 for ; Mon, 19 Apr 2021 04:28:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=unhnUxWwf6QK6cp4rrR6TrbktMm/8rXyUTIBHzAEXfg=; b=BXOUlxpLd56aIkzUp+iaABGXqjdNmYdtYHtkfeGiejkmg9qs8FHNQqQTNmd+UQ3M4h kzb6m9AJGdZicS7Cwk3Q7dPN76UxIbREvlmrwlj/2THgU267xxjTUh8SuQEfOX2I36Ur P/K4rZgYE/cIjJ6NoQWqYF81mV7YHGo7sh0VQBzifKwCiW5Mvag28s4kKltHD6z/mh0x elym4+AflX3qAxJIwqVmvOVzz7DJ7RnieDx74sIOA9lwt4xsUzcN0Kwy8YGHTg4nUSj5 4mUrtUASZHOQp2DJmetiTZS4wy/0sPjndJ+VnIeRhwQdxGbkPT2FwCNrhcPfFPb4j7vA /HaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=unhnUxWwf6QK6cp4rrR6TrbktMm/8rXyUTIBHzAEXfg=; b=rlNt17OlEZWMBnbwQmVMnmfKPW3YyUi7LTcmEOHB82/8fDtR2w3r0ox/rhSm9FvQtG wuzS0XWrb33JQvY/4YB4znq2Cy18zdk39FG8frNoKmNqmn0pywH5owWIV52iofgz+MJU U72pp5/q7CL6rx0lRMAiOuZ36Olq4N5+gU6oWtl4G0AVAO4GByLz3IwkQuMkOW/ZauIG fcaQhAjzIFOtoLdY6H9XuLJ8tmMH4ClT2orvdSzP29w11wqbPjFFG+NPifbGbsT0PAEP rADX4emqcyrlBWqe+PbYbqUp34doDpm9815Zf5Ry8qJEk6JThb6T2t1C5aX7j2KkmYaG ZnWg== X-Gm-Message-State: AOAM532ujSSLHCBPRocQEtzbJTP9RF61kc9wvCXrcnUFOo8lTgrFUTSQ q2rt47Q9eXf8Vmfo5Uj1LeVTsjtEFr0= X-Google-Smtp-Source: ABdhPJyy1FzYrn8BoB5fTnpa6gV25rUKPI5ELCFyYqsMlH1/L/R9d7MdLXqwZJ31lZUdJzv50+jEHg== X-Received: by 2002:a5d:58f3:: with SMTP id f19mr13906928wrd.133.1618831727807; Mon, 19 Apr 2021 04:28:47 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v4sm24450106wrf.36.2021.04.19.04.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 04:28:47 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 19 Apr 2021 11:28:44 +0000 Subject: [PATCH 1/2] [GSOC] ref-filter: get rid of show_ref_array_item MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Christian Couder , Hariom Verma , Eric Sunshine , Derrick Stolee , =?utf-8?b?UmVuw6k=?= Scharfe , ZheNing Hu , ZheNing Hu Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: ZheNing Hu From: ZheNing Hu Inlining the exported function `show_ref_array_item()` which is not providing the right level of abstraction, simplifies the API and can unlock improvements at the former call sites. Helped-by: René Scharfe Signed-off-by: ZheNing Hu --- builtin/for-each-ref.c | 14 ++++++++++++-- builtin/tag.c | 14 ++++++++++++-- ref-filter.c | 25 ++++++++++--------------- ref-filter.h | 2 -- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index cb9c81a04606..8520008604e3 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -80,8 +80,18 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) if (!maxcount || array.nr < maxcount) maxcount = array.nr; - for (i = 0; i < maxcount; i++) - show_ref_array_item(array.items[i], &format); + for (i = 0; i < maxcount; i++) { + struct strbuf output = STRBUF_INIT; + struct strbuf err = STRBUF_INIT; + + if (format_ref_array_item(array.items[i], &format, &output, &err)) + die("%s", err.buf); + fwrite(output.buf, 1, output.len, stdout); + putchar('\n'); + + strbuf_release(&err); + strbuf_release(&output); + } ref_array_clear(&array); return 0; } diff --git a/builtin/tag.c b/builtin/tag.c index d403417b5625..d92d8e110b4d 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -63,8 +63,18 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, filter_refs(&array, filter, FILTER_REFS_TAGS); ref_array_sort(sorting, &array); - for (i = 0; i < array.nr; i++) - show_ref_array_item(array.items[i], format); + for (i = 0; i < array.nr; i++) { + struct strbuf output = STRBUF_INIT; + struct strbuf err = STRBUF_INIT; + + if (format_ref_array_item(array.items[i], format, &output, &err)) + die("%s", err.buf); + fwrite(output.buf, 1, output.len, stdout); + putchar('\n'); + + strbuf_release(&err); + strbuf_release(&output); + } ref_array_clear(&array); free(to_free); diff --git a/ref-filter.c b/ref-filter.c index f0bd32f71416..df67047fd615 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -2435,27 +2435,22 @@ int format_ref_array_item(struct ref_array_item *info, return 0; } -void show_ref_array_item(struct ref_array_item *info, - const struct ref_format *format) -{ - struct strbuf final_buf = STRBUF_INIT; - struct strbuf error_buf = STRBUF_INIT; - - if (format_ref_array_item(info, format, &final_buf, &error_buf)) - die("%s", error_buf.buf); - fwrite(final_buf.buf, 1, final_buf.len, stdout); - strbuf_release(&error_buf); - strbuf_release(&final_buf); - putchar('\n'); -} - void pretty_print_ref(const char *name, const struct object_id *oid, const struct ref_format *format) { struct ref_array_item *ref_item; + struct strbuf output = STRBUF_INIT; + struct strbuf err = STRBUF_INIT; + ref_item = new_ref_array_item(name, oid); ref_item->kind = ref_kind_from_refname(name); - show_ref_array_item(ref_item, format); + if (format_ref_array_item(ref_item, format, &output, &err)) + die("%s", err.buf); + fwrite(output.buf, 1, output.len, stdout); + putchar('\n'); + + strbuf_release(&err); + strbuf_release(&output); free_array_item(ref_item); } diff --git a/ref-filter.h b/ref-filter.h index 19ea4c413409..baf72a718965 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -119,8 +119,6 @@ int format_ref_array_item(struct ref_array_item *info, const struct ref_format *format, struct strbuf *final_buf, struct strbuf *error_buf); -/* Print the ref using the given format and quote_style */ -void show_ref_array_item(struct ref_array_item *info, const struct ref_format *format); /* Parse a single sort specifier and add it to the list */ void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *atom); /* Callback function for parsing the sort option */ From patchwork Mon Apr 19 11:28:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: ZheNing Hu X-Patchwork-Id: 12211573 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=-12.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,URIBL_BLOCKED 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 CC6E7C43460 for ; Mon, 19 Apr 2021 11:28:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB5C261221 for ; Mon, 19 Apr 2021 11:28:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238392AbhDSL3X (ORCPT ); Mon, 19 Apr 2021 07:29:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238419AbhDSL3V (ORCPT ); Mon, 19 Apr 2021 07:29:21 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8382C061761 for ; Mon, 19 Apr 2021 04:28:49 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id n4-20020a05600c4f84b029013151278decso6644493wmq.4 for ; Mon, 19 Apr 2021 04:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=/hjM/1l4z9XOg3Z+s2ZRLQqy32lglklRKTb17KmrRLg=; b=MExSkPZ9s20m0CbX2M1Q3q+z7/kGG9GzYXgRSRtqdiUBseapUZpLXkN+f3bOiN3eA5 l2syhabKizlR2/ymsPz1me/5E5B08QKrGVJ94xkkcM0qNrdHH9lHQ91SRlLYwum6ythh 1ltZ7XucrGjg5XDDkMvj0ZCql7v1uFSZJP4tK3vyUbICizvJQ9YFl3hUFH9FzPslzcI5 6+wSedswxMH+07Adh4D2EX/8zYl5Rffh/EWr3qkDuN2lvO7IN0qq3oX0DLAmSLz9f6Xm 4PCggBNwPLZ7sOlJScwa6hLawKGlNOLMnJiDjzKACw10J+ljz7bUnupwJiFLjsvs6qE6 +r7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=/hjM/1l4z9XOg3Z+s2ZRLQqy32lglklRKTb17KmrRLg=; b=HH4V9yQelqqxj+xTCZjisluDBmjPKN6vs+NSlNhbzOpFJG869C3XblcxdfxWYL3lTv IfIb517uqq+jjKY6MYU8Ga9PAaN/jOpoR7/2H22VxabLyNOuBGdzIoFWhKqaJ9CNCXrR PlWaTv7Wv0bp9QRfXEmdkoEZFV3uUElJFE3o4A3dzHavB64kaSh2+L1nKKuiM1zgd/Ej sd9N7fC1NteqOJS55+kpY5p3wVkREV49cV3Jpu1msmOzgwiRt+u7jskHJzfC1HwtlwJL 8QPNAL5zu0YAq42LFKSjUhHLmLwVeI6iQuw+Xpnsp5l6ZNPdpf7SlxxXW3fhel45Kmcp 9YRg== X-Gm-Message-State: AOAM53226WWputMH/JcfG6BuMbZw3ali6O8Z6+NVlsIvC6Z7EBXSEewq qMVmfXvC08/7YveD3rGazqx389Bd+FY= X-Google-Smtp-Source: ABdhPJzL2yj3JRXs3L7yoCYOJ/QEpi+uPSHLvOndZTQeDE+3O5fTsweBykewoYlvXzJyiwvYxDH0FA== X-Received: by 2002:a1c:f302:: with SMTP id q2mr21433379wmq.85.1618831728562; Mon, 19 Apr 2021 04:28:48 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v8sm22580831wrt.71.2021.04.19.04.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 04:28:48 -0700 (PDT) Message-Id: <1c7a69ba072ac740273ef06972122f74cf3fa684.1618831726.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 11:28:45 +0000 Subject: [PATCH 2/2] [GSOC] ref-filter: reuse output buffer MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Christian Couder , Hariom Verma , Eric Sunshine , Derrick Stolee , =?utf-8?b?UmVuw6k=?= Scharfe , ZheNing Hu , ZheNing Hu Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: ZheNing Hu From: ZheNing Hu When we use `git for-each-ref`, every ref will allocate its own output strbuf. But we can reuse the final strbuf for each step ref's output. The performance for `git for-each-ref` on the Git repository itself with performance testing tool `hyperfine` changes from 23.7 ms ± 0.9 ms to 22.2 ms ± 1.0 ms. Optimization is relatively minor. At the same time, we apply this optimization to `git tag -l` and `git branch -l`. This approach is similar to the one used by 79ed0a5 (cat-file: use a single strbuf for all output, 2018-08-14) to speed up the cat-file builtin. Helped-by: Jeff King Helped-by: René Scharfe Signed-off-by: ZheNing Hu --- builtin/branch.c | 9 +++++---- builtin/for-each-ref.c | 12 ++++++------ builtin/tag.c | 12 ++++++------ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index bcc00bcf182d..00081de1aed8 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -411,6 +411,8 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin { int i; struct ref_array array; + struct strbuf out = STRBUF_INIT; + struct strbuf err = STRBUF_INIT; int maxwidth = 0; const char *remote_prefix = ""; char *to_free = NULL; @@ -440,8 +442,7 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin ref_array_sort(sorting, &array); for (i = 0; i < array.nr; i++) { - struct strbuf out = STRBUF_INIT; - struct strbuf err = STRBUF_INIT; + strbuf_reset(&out); if (format_ref_array_item(array.items[i], format, &out, &err)) die("%s", err.buf); if (column_active(colopts)) { @@ -452,10 +453,10 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin fwrite(out.buf, 1, out.len, stdout); putchar('\n'); } - strbuf_release(&err); - strbuf_release(&out); } + strbuf_release(&err); + strbuf_release(&out); ref_array_clear(&array); free(to_free); } diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 8520008604e3..bf24c595c526 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -22,6 +22,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) struct ref_array array; struct ref_filter filter; struct ref_format format = REF_FORMAT_INIT; + struct strbuf output = STRBUF_INIT; + struct strbuf err = STRBUF_INIT; struct option opts[] = { OPT_BIT('s', "shell", &format.quote_style, @@ -81,17 +83,15 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) if (!maxcount || array.nr < maxcount) maxcount = array.nr; for (i = 0; i < maxcount; i++) { - struct strbuf output = STRBUF_INIT; - struct strbuf err = STRBUF_INIT; - + strbuf_reset(&output); if (format_ref_array_item(array.items[i], &format, &output, &err)) die("%s", err.buf); fwrite(output.buf, 1, output.len, stdout); putchar('\n'); - - strbuf_release(&err); - strbuf_release(&output); } + + strbuf_release(&err); + strbuf_release(&output); ref_array_clear(&array); return 0; } diff --git a/builtin/tag.c b/builtin/tag.c index d92d8e110b4d..592af1d154ea 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -39,6 +39,8 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, struct ref_format *format) { struct ref_array array; + struct strbuf output = STRBUF_INIT; + struct strbuf err = STRBUF_INIT; char *to_free = NULL; int i; @@ -64,17 +66,15 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, ref_array_sort(sorting, &array); for (i = 0; i < array.nr; i++) { - struct strbuf output = STRBUF_INIT; - struct strbuf err = STRBUF_INIT; - + strbuf_reset(&output); if (format_ref_array_item(array.items[i], format, &output, &err)) die("%s", err.buf); fwrite(output.buf, 1, output.len, stdout); putchar('\n'); - - strbuf_release(&err); - strbuf_release(&output); } + + strbuf_release(&err); + strbuf_release(&output); ref_array_clear(&array); free(to_free);