Skip to content

Commit

Permalink
#410: epoch: change unused InsertEpoch to DependentEpoch
Browse files Browse the repository at this point in the history
  • Loading branch information
@lifflander
lifflander committed Jun 17, 2019
1 parent e08542a commit 8efd965
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/vt/epoch/epoch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static constexpr BitCountType const epoch_user_num_bits = 1;

enum struct eEpochCategory : int8_t {
NoCategoryEpoch = 0x0,
InsertEpoch = 0x1,
DependentEpoch = 0x1,
DijkstraScholtenEpoch = 0x2

This comment has been minimized.

Sign in to view

Copy link
@PhilMiller

PhilMiller Jun 17, 2019

Member

Are these a sequence of values, or flag bits that would get bit-OR'd together? The usage and testing seems to suggest a numerical sequence, but the use of hex suggests flags.

This comment has been minimized.

Sign in to view

Copy link
@lifflander

lifflander Oct 10, 2019

Author Collaborator

These are flag bits that can be OR'd together.
};

Expand Down
8 changes: 4 additions & 4 deletions tests/unit/epoch/test_epoch.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ TEST_P(TestEpochParam, basic_test_epoch_category_1) {
EpochType const start_seq = GetParam();
auto const epoch = epoch::EpochManip::makeEpoch(
start_seq, false, uninitialized_destination, false,
epoch::eEpochCategory::InsertEpoch
epoch::eEpochCategory::DependentEpoch
);
auto const is_rooted = epoch::EpochManip::isRooted(epoch);
auto const is_user = epoch::EpochManip::isUser(epoch);
Expand All @@ -157,14 +157,14 @@ TEST_P(TestEpochParam, basic_test_epoch_category_1) {
EXPECT_EQ(get_seq, start_seq);
EXPECT_EQ(ep_node, 0);
EXPECT_EQ(next_seq, start_seq + 1);
EXPECT_EQ(cat, epoch::eEpochCategory::InsertEpoch);
EXPECT_EQ(cat, epoch::eEpochCategory::DependentEpoch);
}

TEST_P(TestEpochParam, basic_test_epoch_all_1) {
auto const& n = 48;
EpochType const start_seq = GetParam();
auto const epoch = epoch::EpochManip::makeEpoch(
start_seq, true, n, true, epoch::eEpochCategory::InsertEpoch
start_seq, true, n, true, epoch::eEpochCategory::DependentEpoch
);
auto const is_rooted = epoch::EpochManip::isRooted(epoch);
auto const is_user = epoch::EpochManip::isUser(epoch);
Expand All @@ -181,7 +181,7 @@ TEST_P(TestEpochParam, basic_test_epoch_all_1) {
EXPECT_EQ(get_seq, start_seq);
EXPECT_EQ(ep_node, n);
EXPECT_EQ(next_seq, start_seq + 1);
EXPECT_EQ(cat, epoch::eEpochCategory::InsertEpoch);
EXPECT_EQ(cat, epoch::eEpochCategory::DependentEpoch);
}

INSTANTIATE_TEST_CASE_P(
Expand Down

0 comments on commit 8efd965

Please sign in to comment.