From: Junio C Hamano <gitster@pobox.com>
To: "William Baker via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, williamtbakeremail@gmail.com,
stolee@gmail.com, Johannes.Schindelin@gmx.de,
jeffhost@microsoft.com
Subject: Re: [PATCH v2 0/1] fsmonitor: don't fill bitmap with entries to be removed
Date: Thu, 10 Oct 2019 10:56:55 +0900 [thread overview]
Message-ID: <xmqq1rvll5w8.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <pull.372.v2.git.gitgitgadget@gmail.com> (William Baker via GitGitGadget's message of "Wed, 09 Oct 2019 14:00:11 -0700 (PDT)")
"William Baker via GitGitGadget" <gitgitgadget@gmail.com> writes:
> This is the second iteration of changes to fix the segfault that I
> encountered while testing fsmonitor. This iteration includes the following
> updates for feedback I received on v1:
>
> * Use %u instead of %"PRIuMAX" for unsigned ints in BUG format strings
> * Updated the new test's comment to be more descriptive
>
> Thanks,
>
> William
>
> William Baker (1):
> fsmonitor: don't fill bitmap with entries to be removed
Thanks. Dscho, is this still Reviewed-by: you?
>
> fsmonitor.c | 29 ++++++++++++++++++++++++-----
> t/t7519-status-fsmonitor.sh | 13 +++++++++++++
> t/t7519/fsmonitor-env | 24 ++++++++++++++++++++++++
> 3 files changed, 61 insertions(+), 5 deletions(-)
> create mode 100755 t/t7519/fsmonitor-env
>
>
> base-commit: 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-372%2Fwilbaker%2Ffix_git_fsmonitor_crash-v2
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-372/wilbaker/fix_git_fsmonitor_crash-v2
> Pull-Request: https://github.com/gitgitgadget/git/pull/372
>
> Range-diff vs v1:
>
> 1: ce9bf4237e ! 1: 08741d986c fsmonitor: don't fill bitmap with entries to be removed
> @@ -44,8 +44,8 @@
> + struct cache_entry *ce;
> +
> + if (pos >= istate->cache_nr)
> -+ BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" >= %"PRIuMAX")",
> -+ (uintmax_t)pos, (uintmax_t)istate->cache_nr);
> ++ BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" >= %u)",
> ++ (uintmax_t)pos, istate->cache_nr);
>
> + ce = istate->cache[pos];
> ce->ce_flags &= ~CE_FSMONITOR_VALID;
> @@ -56,8 +56,8 @@
> istate->fsmonitor_dirty = fsmonitor_dirty;
>
> + if (istate->fsmonitor_dirty->bit_size > istate->cache_nr)
> -+ BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %"PRIuMAX")",
> -+ (uintmax_t)istate->fsmonitor_dirty->bit_size, (uintmax_t)istate->cache_nr);
> ++ BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
> ++ (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
> +
> trace_printf_key(&trace_fsmonitor, "read fsmonitor extension successful");
> return 0;
> @@ -85,8 +85,8 @@
> int fixup = 0;
>
> + if (istate->fsmonitor_dirty->bit_size > istate->cache_nr)
> -+ BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %"PRIuMAX")",
> -+ (uintmax_t)istate->fsmonitor_dirty->bit_size, (uintmax_t)istate->cache_nr);
> ++ BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
> ++ (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
> +
> put_be32(&hdr_version, INDEX_EXTENSION_VERSION);
> strbuf_add(sb, &hdr_version, sizeof(uint32_t));
> @@ -96,8 +96,8 @@
>
> /* Mark all previously saved entries as dirty */
> + if (istate->fsmonitor_dirty->bit_size > istate->cache_nr)
> -+ BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %"PRIuMAX")",
> -+ (uintmax_t)istate->fsmonitor_dirty->bit_size, (uintmax_t)istate->cache_nr);
> ++ BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
> ++ (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
> ewah_each_bit(istate->fsmonitor_dirty, fsmonitor_ewah_callback, istate);
>
> /* Now mark the untracked cache for fsmonitor usage */
> @@ -109,8 +109,9 @@
> test_cmp expect actual
> '
>
> -+# Use test files that start with 'z' so that the entries being added
> -+# and removed appear at the end of the index.
> ++# This test covers staging/unstaging files that appear at the end of the index.
> ++# Test files with names beginning with 'z' are used under the assumption that
> ++# earlier tests do not add/leave index entries that sort below them.
> +test_expect_success 'status succeeds after staging/unstaging ' '
> + test_commit initial &&
> + removed=$(test_seq 1 100 | sed "s/^/z/") &&
next prev parent reply other threads:[~2019-10-10 1:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 19:49 [PATCH 0/1] fsmonitor: don't fill bitmap with entries to be removed William Baker via GitGitGadget
2019-10-03 19:49 ` [PATCH 1/1] " William Baker via GitGitGadget
2019-10-03 23:36 ` Junio C Hamano
2019-10-07 18:10 ` William Baker
2019-10-03 21:08 ` [PATCH 0/1] " Johannes Schindelin
2019-10-03 23:17 ` Junio C Hamano
2019-10-09 21:00 ` [PATCH v2 " William Baker via GitGitGadget
2019-10-09 21:00 ` [PATCH v2 1/1] " William Baker via GitGitGadget
2019-10-10 11:07 ` SZEDER Gábor
2019-10-10 11:22 ` SZEDER Gábor
2019-10-11 16:38 ` William Baker
2019-10-10 1:56 ` Junio C Hamano [this message]
2019-10-10 12:02 ` [PATCH v2 0/1] " Johannes Schindelin
2019-10-11 20:11 ` [PATCH v3 " William Baker via GitGitGadget
2019-10-11 20:11 ` [PATCH v3 1/1] " William Baker via GitGitGadget
2019-10-12 1:26 ` Junio C Hamano
2019-10-15 19:07 ` William Baker
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq1rvll5w8.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jeffhost@microsoft.com \
--cc=stolee@gmail.com \
--cc=williamtbakeremail@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).