From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> To: git@vger.kernel.org Cc: "Derrick Stolee" <dstolee@microsoft.com>, "Jonathan Tan" <jonathantanmy@google.com>, "Taylor Blau" <me@ttaylorr.com>, "René Scharfe" <l.s.r@web.de>, "Elijah Newren" <newren@gmail.com>, "Derrick Stolee" <stolee@gmail.com>, "Jeff King" <peff@peff.net>, "Elijah Newren" <newren@gmail.com>, "Elijah Newren" <newren@gmail.com> Subject: [PATCH v4 2/4] diffcore-rename: avoid unnecessary strdup'ing in break_idx Date: Tue, 08 Jun 2021 16:11:40 +0000 [thread overview] Message-ID: <be858c46cfe76e59b526f6d7af497ef70280765e.1623168703.git.gitgitgadget@gmail.com> (raw) In-Reply-To: <pull.962.v4.git.1623168703.gitgitgadget@gmail.com> From: Elijah Newren <newren@gmail.com> The keys of break_idx are strings from the diff_filepairs of diff_queued_diff. break_idx is only used in location_rename_dst(), and that usage is always before any free'ing of the pairs (and thus the strings in the pairs). As such, there is no need to strdup these keys; we can just reuse the existing strings as-is. The merge logic doesn't make use of break detection, so this does not affect the performance of any of my testcases. It was just a minor unrelated optimization noted in passing while looking at the code. Signed-off-by: Elijah Newren <newren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> --- diffcore-rename.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index 3375e24659ea..e333a6d64791 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -54,7 +54,7 @@ static void register_rename_src(struct diff_filepair *p) if (p->broken_pair) { if (!break_idx) { break_idx = xmalloc(sizeof(*break_idx)); - strintmap_init(break_idx, -1); + strintmap_init_with_options(break_idx, -1, NULL, 0); } strintmap_set(break_idx, p->one->path, rename_dst_nr); } -- gitgitgadget
next prev parent reply other threads:[~2021-06-08 16:12 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-27 8:37 [PATCH 0/5] Optimization batch 12: miscellaneous unthemed stuff Elijah Newren via GitGitGadget 2021-05-27 8:37 ` [PATCH 1/5] merge-ort: replace string_list_df_name_compare with faster alternative Elijah Newren via GitGitGadget 2021-05-27 21:00 ` René Scharfe 2021-05-27 22:47 ` Elijah Newren 2021-05-28 16:12 ` René Scharfe 2021-05-28 18:09 ` Elijah Newren 2021-05-28 1:32 ` Taylor Blau 2021-05-28 4:10 ` Elijah Newren 2021-05-27 8:37 ` [PATCH 2/5] diffcore-rename: avoid unnecessary strdup'ing in break_idx Elijah Newren via GitGitGadget 2021-05-27 8:37 ` [PATCH 3/5] diffcore-rename: enable limiting rename detection to relevant destinations Elijah Newren via GitGitGadget 2021-05-27 8:37 ` [PATCH 4/5] Fix various issues found in comments Elijah Newren via GitGitGadget 2021-05-27 8:37 ` [PATCH 5/5] merge-ort: miscellaneous touch-ups Elijah Newren via GitGitGadget 2021-06-01 14:58 ` [PATCH v2 0/5] Optimization batch 12: miscellaneous unthemed stuff Elijah Newren via GitGitGadget 2021-06-01 14:58 ` [PATCH v2 1/5] merge-ort: replace string_list_df_name_compare with faster alternative Elijah Newren via GitGitGadget 2021-06-02 11:29 ` Derrick Stolee 2021-06-01 14:58 ` [PATCH v2 2/5] diffcore-rename: avoid unnecessary strdup'ing in break_idx Elijah Newren via GitGitGadget 2021-06-01 14:58 ` [PATCH v2 3/5] diffcore-rename: enable limiting rename detection to relevant destinations Elijah Newren via GitGitGadget 2021-06-03 12:54 ` Derrick Stolee 2021-06-03 14:13 ` Elijah Newren 2021-06-01 14:58 ` [PATCH v2 4/5] Fix various issues found in comments Elijah Newren via GitGitGadget 2021-06-01 14:58 ` [PATCH v2 5/5] merge-ort: miscellaneous touch-ups Elijah Newren via GitGitGadget 2021-06-03 12:55 ` [PATCH v2 0/5] Optimization batch 12: miscellaneous unthemed stuff Derrick Stolee 2021-06-04 4:39 ` [PATCH v3 0/4] " Elijah Newren via GitGitGadget 2021-06-04 4:39 ` [PATCH v3 1/4] merge-ort: replace string_list_df_name_compare with faster alternative Elijah Newren via GitGitGadget 2021-06-04 4:39 ` [PATCH v3 2/4] diffcore-rename: avoid unnecessary strdup'ing in break_idx Elijah Newren via GitGitGadget 2021-06-04 4:39 ` [PATCH v3 3/4] Fix various issues found in comments Elijah Newren via GitGitGadget 2021-06-04 4:39 ` [PATCH v3 4/4] merge-ort: miscellaneous touch-ups Elijah Newren via GitGitGadget 2021-06-04 13:11 ` [PATCH v3 0/4] Optimization batch 12: miscellaneous unthemed stuff Derrick Stolee 2021-06-04 15:48 ` Elijah Newren 2021-06-04 16:30 ` Elijah Newren 2021-06-04 16:35 ` Jeff King 2021-06-04 18:42 ` Derrick Stolee 2021-06-04 19:43 ` Elijah Newren 2021-06-04 19:53 ` Jeff King 2021-06-08 16:11 ` [PATCH v4 " Elijah Newren via GitGitGadget 2021-06-08 16:11 ` [PATCH v4 1/4] merge-ort: replace string_list_df_name_compare with faster alternative Elijah Newren via GitGitGadget 2021-06-08 16:11 ` Elijah Newren via GitGitGadget [this message] 2021-06-08 16:11 ` [PATCH v4 3/4] Fix various issues found in comments Elijah Newren via GitGitGadget 2021-06-08 16:11 ` [PATCH v4 4/4] merge-ort: miscellaneous touch-ups Elijah Newren via GitGitGadget
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=be858c46cfe76e59b526f6d7af497ef70280765e.1623168703.git.gitgitgadget@gmail.com \ --to=gitgitgadget@gmail.com \ --cc=dstolee@microsoft.com \ --cc=git@vger.kernel.org \ --cc=jonathantanmy@google.com \ --cc=l.s.r@web.de \ --cc=me@ttaylorr.com \ --cc=newren@gmail.com \ --cc=peff@peff.net \ --cc=stolee@gmail.com \ --subject='Re: [PATCH v4 2/4] diffcore-rename: avoid unnecessary strdup'\''ing in break_idx' \ /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
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.