Skip to content

Commit

Permalink
Fixing static initialization order on Windows using construct-on-firs…
Browse files Browse the repository at this point in the history 
…t-use. (#3206)

Fix discarded out of bounds memory access.
  • Loading branch information
@clemahieu
clemahieu authored Apr 18, 2021
1 parent 467fa68 commit 6b994b2
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 48 deletions.
134 changes: 87 additions & 47 deletions nano/core_test/prioritization.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,56 @@

#include <unordered_set>

static nano::keypair keyzero;
static nano::keypair key0;
static nano::keypair key1;
static nano::keypair key2;
static nano::keypair key3;
static auto blockzero = std::make_shared<nano::state_block> (keyzero.pub, 0, keyzero.pub, 0, 0, keyzero.prv, keyzero.pub, 0);
static auto block0 = std::make_shared<nano::state_block> (key0.pub, 0, key0.pub, nano::Gxrb_ratio, 0, key0.prv, key0.pub, 0);
static auto block1 = std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Mxrb_ratio, 0, key1.prv, key1.pub, 0);
static auto block2 = std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, 0);
static auto block3 = std::make_shared<nano::state_block> (key3.pub, 0, key3.pub, nano::Mxrb_ratio, 0, key3.prv, key3.pub, 0);
nano::keypair & keyzero ()
{
static nano::keypair result;
return result;
}
nano::keypair & key0 ()
{
static nano::keypair result;
return result;
}
nano::keypair & key1 ()
{
static nano::keypair result;
return result;
}
nano::keypair & key2 ()
{
static nano::keypair result;
return result;
}
nano::keypair & key3 ()
{
static nano::keypair result;
return result;
}
std::shared_ptr<nano::state_block> & blockzero ()
{
static std::shared_ptr<nano::state_block> result = std::make_shared<nano::state_block> (keyzero ().pub, 0, keyzero ().pub, 0, 0, keyzero ().prv, keyzero ().pub, 0);
return result;
}
std::shared_ptr<nano::state_block> & block0 ()
{
static std::shared_ptr<nano::state_block> result = std::make_shared<nano::state_block> (key0 ().pub, 0, key0 ().pub, nano::Gxrb_ratio, 0, key0 ().prv, key0 ().pub, 0);
return result;
}
std::shared_ptr<nano::state_block> & block1 ()
{
static std::shared_ptr<nano::state_block> result = std::make_shared<nano::state_block> (key1 ().pub, 0, key1 ().pub, nano::Mxrb_ratio, 0, key1 ().prv, key1 ().pub, 0);
return result;
}
std::shared_ptr<nano::state_block> & block2 ()
{
static std::shared_ptr<nano::state_block> result = std::make_shared<nano::state_block> (key2 ().pub, 0, key2 ().pub, nano::Gxrb_ratio, 0, key2 ().prv, key2 ().pub, 0);
return result;
}
std::shared_ptr<nano::state_block> & block3 ()
{
static std::shared_ptr<nano::state_block> result = std::make_shared<nano::state_block> (key3 ().pub, 0, key3 ().pub, nano::Mxrb_ratio, 0, key3 ().prv, key3 ().pub, 0);
return result;
}

TEST (prioritization, construction)
{
Expand All @@ -27,53 +67,53 @@ TEST (prioritization, construction)
TEST (prioritization, insert_zero)
{
nano::prioritization prioritization;
prioritization.push (1000, block0);
prioritization.push (1000, block0 ());
ASSERT_EQ (1, prioritization.size ());
ASSERT_EQ (1, prioritization.bucket_size (110));
}

TEST (prioritization, insert_one)
{
nano::prioritization prioritization;
prioritization.push (1000, block1);
prioritization.push (1000, block1 ());
ASSERT_EQ (1, prioritization.size ());
ASSERT_EQ (1, prioritization.bucket_size (100));
}

TEST (prioritization, insert_same_priority)
{
nano::prioritization prioritization;
prioritization.push (1000, block0);
prioritization.push (1000, block2);
prioritization.push (1000, block0 ());
prioritization.push (1000, block2 ());
ASSERT_EQ (2, prioritization.size ());
ASSERT_EQ (2, prioritization.bucket_size (110));
}

TEST (prioritization, insert_duplicate)
{
nano::prioritization prioritization;
prioritization.push (1000, block0);
prioritization.push (1000, block0);
prioritization.push (1000, block0 ());
prioritization.push (1000, block0 ());
ASSERT_EQ (1, prioritization.size ());
ASSERT_EQ (1, prioritization.bucket_size (110));
}

TEST (prioritization, insert_older)
{
nano::prioritization prioritization;
prioritization.push (1000, block0);
prioritization.push (1100, block2);
ASSERT_EQ (block0, prioritization.top ());
prioritization.push (1000, block0 ());
prioritization.push (1100, block2 ());
ASSERT_EQ (block0 (), prioritization.top ());
prioritization.pop ();
ASSERT_EQ (block2, prioritization.top ());
ASSERT_EQ (block2 (), prioritization.top ());
prioritization.pop ();
}

TEST (prioritization, pop)
{
nano::prioritization prioritization;
ASSERT_TRUE (prioritization.empty ());
prioritization.push (1000, block0);
prioritization.push (1000, block0 ());
ASSERT_FALSE (prioritization.empty ());
prioritization.pop ();
ASSERT_TRUE (prioritization.empty ());
Expand All @@ -82,68 +122,68 @@ TEST (prioritization, pop)
TEST (prioritization, top_one)
{
nano::prioritization prioritization;
prioritization.push (1000, block0);
ASSERT_EQ (block0, prioritization.top ());
prioritization.push (1000, block0 ());
ASSERT_EQ (block0 (), prioritization.top ());
}

TEST (prioritization, top_two)
{
nano::prioritization prioritization;
prioritization.push (1000, block0);
prioritization.push (1, block1);
ASSERT_EQ (block0, prioritization.top ());
prioritization.push (1000, block0 ());
prioritization.push (1, block1 ());
ASSERT_EQ (block0 (), prioritization.top ());
prioritization.pop ();
ASSERT_EQ (block1, prioritization.top ());
ASSERT_EQ (block1 (), prioritization.top ());
prioritization.pop ();
ASSERT_TRUE (prioritization.empty ());
}

TEST (prioritization, top_round_robin)
{
nano::prioritization prioritization;
prioritization.push (1000, blockzero);
ASSERT_EQ (blockzero, prioritization.top ());
prioritization.push (1000, block0);
prioritization.push (1000, block1);
prioritization.push (1100, block3);
prioritization.push (1000, blockzero ());
ASSERT_EQ (blockzero (), prioritization.top ());
prioritization.push (1000, block0 ());
prioritization.push (1000, block1 ());
prioritization.push (1100, block3 ());
prioritization.pop (); // blockzero
EXPECT_EQ (block1, prioritization.top ());
EXPECT_EQ (block1 (), prioritization.top ());
prioritization.pop ();
EXPECT_EQ (block0, prioritization.top ());
EXPECT_EQ (block0 (), prioritization.top ());
prioritization.pop ();
EXPECT_EQ (block3, prioritization.top ());
EXPECT_EQ (block3 (), prioritization.top ());
prioritization.pop ();
EXPECT_TRUE (prioritization.empty ());
}

TEST (prioritization, trim_normal)
{
nano::prioritization prioritization{ 1 };
prioritization.push (1000, block0);
prioritization.push (1100, block2);
prioritization.push (1000, block0 ());
prioritization.push (1100, block2 ());
ASSERT_EQ (1, prioritization.size ());
ASSERT_EQ (block0, prioritization.top ());
ASSERT_EQ (block0 (), prioritization.top ());
}

TEST (prioritization, trim_reverse)
{
nano::prioritization prioritization{ 1 };
prioritization.push (1100, block2);
prioritization.push (1000, block0);
prioritization.push (1100, block2 ());
prioritization.push (1000, block0 ());
ASSERT_EQ (1, prioritization.size ());
ASSERT_EQ (block0, prioritization.top ());
ASSERT_EQ (block0 (), prioritization.top ());
}

TEST (prioritization, trim_even)
{
nano::prioritization prioritization{ 2 };
prioritization.push (1000, block0);
prioritization.push (1100, block2);
prioritization.push (1000, block0 ());
prioritization.push (1100, block2 ());
ASSERT_EQ (1, prioritization.size ());
ASSERT_EQ (block0, prioritization.top ());
prioritization.push (1000, block1);
ASSERT_EQ (block0 (), prioritization.top ());
prioritization.push (1000, block1 ());
ASSERT_EQ (2, prioritization.size ());
ASSERT_EQ (block0, prioritization.top ());
ASSERT_EQ (block0 (), prioritization.top ());
prioritization.pop ();
ASSERT_EQ (block1, prioritization.top ());
ASSERT_EQ (block1 (), prioritization.top ());
}
1 change: 0 additions & 1 deletion nano/node/prioritization.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ maximum{ maximum }
{
static size_t constexpr bucket_count = 129;
buckets.resize (bucket_count);
(void)minimums[0];
nano::uint128_t minimum{ 1 };
minimums.push_back (0);
for (auto i = 1; i < bucket_count; ++i)
Expand Down

0 comments on commit 6b994b2

Please sign in to comment.