Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update missing nano::mutex changes #3123

Merged
merged 2 commits into from
Mar 8, 2021
Merged

Update missing nano::mutex changes #3123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0334d0f
Update missing nano::mutex changes
wezrule Mar 8, 2021
dabec14
Update assert to debug_assert
wezrule Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions nano/lib/stats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ nano::stat_histogram::stat_histogram (std::initializer_list<uint64_t> intervals_
{
if (bin_count_a == 0)
{
assert (intervals_a.size () > 1);
debug_assert (intervals_a.size () > 1);
uint64_t start_inclusive_l = *intervals_a.begin ();
for (auto it = std::next (intervals_a.begin ()); it != intervals_a.end (); ++it)
{
Expand All @@ -223,7 +223,7 @@ nano::stat_histogram::stat_histogram (std::initializer_list<uint64_t> intervals_
}
else
{
assert (intervals_a.size () == 2);
debug_assert (intervals_a.size () == 2);
uint64_t min_inclusive_l = *intervals_a.begin ();
uint64_t max_exclusive_l = *std::next (intervals_a.begin ());

Expand All @@ -245,8 +245,8 @@ nano::stat_histogram::stat_histogram (std::initializer_list<uint64_t> intervals_

void nano::stat_histogram::add (uint64_t index_a, uint64_t addend_a)
{
nano::lock_guard<std::mutex> lk (histogram_mutex);
assert (!bins.empty ());
nano::lock_guard<nano::mutex> lk (histogram_mutex);
debug_assert (!bins.empty ());

// The search for a bin is linear, but we're searching just a few
// contiguous items which are likely to be in cache.
Expand Down Expand Up @@ -278,7 +278,7 @@ void nano::stat_histogram::add (uint64_t index_a, uint64_t addend_a)

std::vector<nano::stat_histogram::bin> nano::stat_histogram::get_bins () const
{
nano::lock_guard<std::mutex> lk (histogram_mutex);
nano::lock_guard<nano::mutex> lk (histogram_mutex);
return bins;
}

Expand Down Expand Up @@ -401,14 +401,14 @@ void nano::stat::define_histogram (stat::type type, stat::detail detail, stat::d
void nano::stat::update_histogram (stat::type type, stat::detail detail, stat::dir dir, uint64_t index_a, uint64_t addend_a)
{
auto entry (get_entry (key_of (type, detail, dir)));
assert (entry->histogram != nullptr);
debug_assert (entry->histogram != nullptr);
entry->histogram->add (index_a, addend_a);
}

nano::stat_histogram * nano::stat::get_histogram (stat::type type, stat::detail detail, stat::dir dir)
{
auto entry (get_entry (key_of (type, detail, dir)));
assert (entry->histogram != nullptr);
debug_assert (entry->histogram != nullptr);
return entry->histogram.get ();
}

Expand Down
2 changes: 1 addition & 1 deletion nano/lib/stats.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class stat_histogram final
std::vector<bin> get_bins () const;

private:
mutable std::mutex histogram_mutex;
mutable nano::mutex histogram_mutex;
std::vector<bin> bins;
};

Expand Down