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

Lazy steady clock sampling within nano::stats #4269

Merged
merged 3 commits into from
Aug 31, 2023
Merged

Lazy steady clock sampling within nano::stats #4269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ecf3a1
This delays obtaining a sample from steady_clock unless it is configu…
clemahieu Aug 30, 2023
38ea6b6
Only update timestamp when sampling is enabled as this has a performa…
clemahieu Aug 30, 2023
37359c5
Changing use of map to unordered_map since we don't need ordering and…
clemahieu Aug 30, 2023
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
74 changes: 42 additions & 32 deletions nano/lib/stats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,52 +391,62 @@ void nano::stats::update (uint32_t key_a, uint64_t value)
static file_writer log_count (config.log_counters_filename);
static file_writer log_sample (config.log_samples_filename);

auto now (std::chrono::steady_clock::now ());

nano::unique_lock<nano::mutex> lock{ stat_mutex };
if (!stopped)
{
auto entry (get_entry_impl (key_a, config.interval, config.capacity));
auto has_interval_counter = [&] () {
return config.log_interval_counters > 0;
};
auto has_sampling = [&] () {
return config.sampling_enabled && entry->sample_interval > 0;
};

// Counters
auto old (entry->counter.get_value ());
entry->counter.add (value);
entry->counter.add (value, has_sampling ()); // Only update timestamp when sampling is enabled as this has a performance impact
entry->count_observers.notify (old, entry->counter.get_value ());

std::chrono::duration<double, std::milli> duration = now - log_last_count_writeout;
if (config.log_interval_counters > 0 && duration.count () > config.log_interval_counters)
{
log_counters_impl (log_count);
log_last_count_writeout = now;
}

// Samples
if (config.sampling_enabled && entry->sample_interval > 0)
if (has_interval_counter () || has_sampling ())
{
entry->sample_current.add (value, false);

std::chrono::duration<double, std::milli> duration = now - entry->sample_start_time;
if (duration.count () > entry->sample_interval)
auto now = std::chrono::steady_clock::now (); // Only sample clock if necessary as this impacts node performance due to frequent usage
if (has_interval_counter ())
{
entry->sample_start_time = now;

// Make a snapshot of samples for thread safety and to get a stable container
entry->sample_current.set_timestamp (std::chrono::system_clock::now ());
entry->samples.push_back (entry->sample_current);
entry->sample_current.set_value (0);

if (!entry->sample_observers.empty ())
std::chrono::duration<double, std::milli> duration = now - log_last_count_writeout;
if (duration.count () > config.log_interval_counters)
{
auto snapshot (entry->samples);
entry->sample_observers.notify (snapshot);
log_counters_impl (log_count);
log_last_count_writeout = now;
}
}

// Samples
if (has_sampling ())
{
entry->sample_current.add (value, false);

// Log sink
duration = now - log_last_sample_writeout;
if (config.log_interval_samples > 0 && duration.count () > config.log_interval_samples)
std::chrono::duration<double, std::milli> duration = now - entry->sample_start_time;
if (duration.count () > entry->sample_interval)
{
log_samples_impl (log_sample);
log_last_sample_writeout = now;
entry->sample_start_time = now;

// Make a snapshot of samples for thread safety and to get a stable container
entry->sample_current.set_timestamp (std::chrono::system_clock::now ());
entry->samples.push_back (entry->sample_current);
entry->sample_current.set_value (0);

if (!entry->sample_observers.empty ())
{
auto snapshot (entry->samples);
entry->sample_observers.notify (snapshot);
}

// Log sink
duration = now - log_last_sample_writeout;
if (config.log_interval_samples > 0 && duration.count () > config.log_interval_samples)
{
log_samples_impl (log_sample);
log_last_sample_writeout = now;
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions nano/lib/stats.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

#include <chrono>
#include <initializer_list>
#include <map>
#include <memory>
#include <mutex>
#include <string>
#include <unordered_map>

namespace nano
{
Expand Down Expand Up @@ -440,7 +440,7 @@ class stats final
nano::stats_config config;

/** Stat entries are sorted by key to simplify processing of log output */
std::map<uint32_t, std::shared_ptr<nano::stat_entry>> entries;
std::unordered_map<uint32_t, std::shared_ptr<nano::stat_entry>> entries;
std::chrono::steady_clock::time_point log_last_count_writeout{ std::chrono::steady_clock::now () };
std::chrono::steady_clock::time_point log_last_sample_writeout{ std::chrono::steady_clock::now () };

Expand Down