From 8bc4bee8a3e83af38ccebf400e03ad9829125277 Mon Sep 17 00:00:00 2001 From: Zygo Blaxell Date: Mon, 18 Jun 2018 18:20:25 -0400 Subject: [PATCH] crucible: progress: drop the set() method set() was broken and redundant. Calling hold() and discarding the returned object has the correct effect. Signed-off-by: Zygo Blaxell --- include/crucible/progress.h | 13 +------------ src/bees-roots.cc | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/include/crucible/progress.h b/include/crucible/progress.h index d5738af..fa71da3 100644 --- a/include/crucible/progress.h +++ b/include/crucible/progress.h @@ -22,7 +22,6 @@ namespace crucible { ProgressTracker(const value_type &v); value_type begin(); value_type end(); - void set(const value_type &v); ProgressHolder hold(const value_type &v); @@ -66,16 +65,6 @@ namespace crucible { return m_state->m_end; } - template - void - ProgressTracker::set(const value_type &v) - { - unique_lock lock(m_state->m_mutex); - if (m_state->m_end < v) { - m_state->m_end = v; - } - } - template typename ProgressTracker::value_type ProgressTracker::ProgressHolderState::get() const @@ -109,7 +98,7 @@ namespace crucible { unique_lock lock(m_state->m_mutex); m_state->m_in_progress[make_pair(m_value, this)] = false; auto p = m_state->m_in_progress.begin(); - while (p!= m_state->m_in_progress.end()) { + while (p != m_state->m_in_progress.end()) { if (p->second) { break; } diff --git a/src/bees-roots.cc b/src/bees-roots.cc index d411a7f..2c04cf6 100644 --- a/src/bees-roots.cc +++ b/src/bees-roots.cc @@ -1100,7 +1100,7 @@ BeesCrawl::hold_state(const BeesFileRange &bfr) void BeesCrawl::set_state(const BeesCrawlState &bcs) { - m_state.set(bcs); + m_state.hold(bcs); m_ctx->roots()->crawl_state_set_dirty(); }