| Message ID | patch-v2-7.8-a3f133ca7ad-20210920T225701Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | progress: assert "global_progress" + test fixes / cleanup | expand |
On Tue, Sep 21, 2021 at 01:09:28AM +0200, Ævar Arnfjörð Bjarmason wrote: > > Fix a bug that's been here since 7cc8f971085 (pack-objects: implement > bitmap writing, 2013-12-21), we did not call stop_progress() if we > reached the early exit in this function. This will matter in a > subsequent commit where we BUG(...) out if this happens, and matters > now e.g. because we don't have a corresponding "region_end" for the > progress trace2 event. Sounds like this was the only place we were calling start_progress() without a stop_progress(), then? Or at least the only place that is exercised by the test suite. Wow. I'm proud of Git contributor base :) Reviewed-by: Emily Shaffer <emilyshaffer@google.com> > > Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> > --- > pack-bitmap-write.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c > index 88d9e696a54..6e110e41ea4 100644 > --- a/pack-bitmap-write.c > +++ b/pack-bitmap-write.c > @@ -550,6 +550,7 @@ void bitmap_writer_select_commits(struct commit **indexed_commits, > if (indexed_commits_nr < 100) { > for (i = 0; i < indexed_commits_nr; ++i) > push_bitmapped_commit(indexed_commits[i]); > + stop_progress(&writer.progress); > return; > } > > -- > 2.33.0.1098.gf02a64c1a2d >
On Thu, Oct 07 2021, Emily Shaffer wrote: > On Tue, Sep 21, 2021 at 01:09:28AM +0200, Ævar Arnfjörð Bjarmason wrote: >> >> Fix a bug that's been here since 7cc8f971085 (pack-objects: implement >> bitmap writing, 2013-12-21), we did not call stop_progress() if we >> reached the early exit in this function. This will matter in a >> subsequent commit where we BUG(...) out if this happens, and matters >> now e.g. because we don't have a corresponding "region_end" for the >> progress trace2 event. > > Sounds like this was the only place we were calling start_progress() > without a stop_progress(), then? Or at least the only place that is > exercised by the test suite. Wow. I'm proud of Git contributor base :) > > Reviewed-by: Emily Shaffer <emilyshaffer@google.com> Yes! Will clarify that, there were some fixes to other bugs in the area, but this one was the last one. Might squash it actually... >> >> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> >> --- >> pack-bitmap-write.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c >> index 88d9e696a54..6e110e41ea4 100644 >> --- a/pack-bitmap-write.c >> +++ b/pack-bitmap-write.c >> @@ -550,6 +550,7 @@ void bitmap_writer_select_commits(struct commit **indexed_commits, >> if (indexed_commits_nr < 100) { >> for (i = 0; i < indexed_commits_nr; ++i) >> push_bitmapped_commit(indexed_commits[i]); >> + stop_progress(&writer.progress); >> return; >> } >> >> -- >> 2.33.0.1098.gf02a64c1a2d >>
On Tue, Sep 21, 2021 at 01:09:28AM +0200, Ævar Arnfjörð Bjarmason wrote: > Fix a bug that's been here since 7cc8f971085 (pack-objects: implement > bitmap writing, 2013-12-21), we did not call stop_progress() if we > reached the early exit in this function. This will matter in a > subsequent commit where we BUG(...) out if this happens, and matters > now e.g. because we don't have a corresponding "region_end" for the > progress trace2 event. The stop_progress() is not missing, but rather the start_progress() is in the wrong place. https://public-inbox.org/git/20210917051448.GB2118053@szeder.dev/ > Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> > --- > pack-bitmap-write.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c > index 88d9e696a54..6e110e41ea4 100644 > --- a/pack-bitmap-write.c > +++ b/pack-bitmap-write.c > @@ -550,6 +550,7 @@ void bitmap_writer_select_commits(struct commit **indexed_commits, > if (indexed_commits_nr < 100) { > for (i = 0; i < indexed_commits_nr; ++i) > push_bitmapped_commit(indexed_commits[i]); > + stop_progress(&writer.progress); > return; > } > > -- > 2.33.0.1098.gf02a64c1a2d >
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 88d9e696a54..6e110e41ea4 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -550,6 +550,7 @@ void bitmap_writer_select_commits(struct commit **indexed_commits, if (indexed_commits_nr < 100) { for (i = 0; i < indexed_commits_nr; ++i) push_bitmapped_commit(indexed_commits[i]); + stop_progress(&writer.progress); return; }
Fix a bug that's been here since 7cc8f971085 (pack-objects: implement bitmap writing, 2013-12-21), we did not call stop_progress() if we reached the early exit in this function. This will matter in a subsequent commit where we BUG(...) out if this happens, and matters now e.g. because we don't have a corresponding "region_end" for the progress trace2 event. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- pack-bitmap-write.c | 1 + 1 file changed, 1 insertion(+)