Skip to content

Commit 28a748a

Browse files
committed
Check that SharedFeatureMatcher::Create() is called only once
1 parent d502a51 commit 28a748a

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

‎src/colmap/controllers/feature_matching_utils.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ namespace colmap {
1414

1515
std::shared_ptr<FeatureMatcher> SharedFeatureMatcher::Create(
1616
const FeatureMatchingOptions& options) {
17+
{
18+
std::lock_guard<std::mutex> lock(mutex_);
19+
THROW_CHECK(!done_);
20+
}
1721
std::shared_ptr<FeatureMatcher> matcher;
1822
std::exception_ptr error;
1923
try {
@@ -23,6 +27,7 @@ std::shared_ptr<FeatureMatcher> SharedFeatureMatcher::Create(
2327
}
2428
{
2529
std::lock_guard<std::mutex> lock(mutex_);
30+
THROW_CHECK(!done_);
2631
matcher_ = matcher;
2732
done_ = true;
2833
}

‎src/colmap/controllers/feature_matching_utils_test.cc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,13 @@ TEST(FeatureMatcherController, SharedFeatureMatcherWorkersMatchPairs) {
508508
for (auto& worker : workers) {
509509
worker->Wait();
510510
}
511+
512+
const auto created_matcher = shared_matcher->Wait();
513+
EXPECT_NE(created_matcher, nullptr);
514+
EXPECT_THAT(
515+
ThrownMessage([&]() { shared_matcher->Create(matching_options); }),
516+
testing::HasSubstr("!done_"));
517+
EXPECT_EQ(shared_matcher->Wait(), created_matcher);
511518
}
512519

513520
#if defined(COLMAP_CUDA_ENABLED) && defined(COLMAP_ONNX_ENABLED) && \

0 commit comments

Comments
 (0)