From 23e7cb17b896846afd2858285a9725c8f2e79dac Mon Sep 17 00:00:00 2001 From: Josh Finken Date: Fri, 15 Dec 2023 08:48:41 -0700 Subject: [PATCH 1/2] Remove symbols like '[' and '#' from the headers of the results files --- performance_metrics/src/events_logger.cpp | 2 +- .../src/resource_usage_logger.cpp | 14 +++---- performance_metrics/src/stat_logger.cpp | 38 +++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/performance_metrics/src/events_logger.cpp b/performance_metrics/src/events_logger.cpp index 7a0239e..45dc77c 100644 --- a/performance_metrics/src/events_logger.cpp +++ b/performance_metrics/src/events_logger.cpp @@ -33,7 +33,7 @@ EventsLogger::EventsLogger(const std::string & filename, const bool csv_out) } std::cout << "[EventsLogger]: Logging to " << m_filename << std::endl; - stream_out(m_file, "Time[ms]", _p_time_width); + stream_out(m_file, "Time_ms", _p_time_width); stream_out(m_file, "Caller", _p_caller_width); stream_out(m_file, "Code", _p_code_width); stream_out(m_file, "Description", _p_desc_width, false); diff --git a/performance_metrics/src/resource_usage_logger.cpp b/performance_metrics/src/resource_usage_logger.cpp index 959a140..da2ca6e 100644 --- a/performance_metrics/src/resource_usage_logger.cpp +++ b/performance_metrics/src/resource_usage_logger.cpp @@ -174,13 +174,13 @@ void ResourceUsageLogger::_stream_out( void ResourceUsageLogger::_print_header(std::ostream & stream) { - _stream_out(stream, "time[ms]"); - _stream_out(stream, "cpu[%]", m_narrow_space); - _stream_out(stream, "arena[KB]"); - _stream_out(stream, "in_use[KB]"); - _stream_out(stream, "mmap[KB]"); - _stream_out(stream, "rss[KB]"); - _stream_out(stream, "vsz[KB]", m_wide_space, m_prec, m_has_system_info); + _stream_out(stream, "time_ms"); + _stream_out(stream, "cpu_perc", m_narrow_space); + _stream_out(stream, "arena_KB"); + _stream_out(stream, "in_use_KB"); + _stream_out(stream, "mmap_KB"); + _stream_out(stream, "rss_KB"); + _stream_out(stream, "vsz_KB", m_wide_space, m_prec, m_has_system_info); if (m_has_system_info) { _stream_out(stream, "pubs"); diff --git a/performance_metrics/src/stat_logger.cpp b/performance_metrics/src/stat_logger.cpp index 2702b55..5ee6b59 100644 --- a/performance_metrics/src/stat_logger.cpp +++ b/performance_metrics/src/stat_logger.cpp @@ -55,14 +55,14 @@ void log_total_stats( static_cast(total_too_late) / total_received * 100; // log header - stream_out(csv_out, stream, "received[#]", wide_space); - stream_out(csv_out, stream, "mean[us]", narrow_space); - stream_out(csv_out, stream, "late[#]", narrow_space); - stream_out(csv_out, stream, "late[%]", narrow_space); - stream_out(csv_out, stream, "too_late[#]", wide_space); - stream_out(csv_out, stream, "too_late[%]", wide_space); - stream_out(csv_out, stream, "lost[#]", narrow_space); - stream_out(csv_out, stream, "lost[%]", narrow_space, false); + stream_out(csv_out, stream, "received_num", wide_space); + stream_out(csv_out, stream, "mean_us", narrow_space); + stream_out(csv_out, stream, "late_num", narrow_space); + stream_out(csv_out, stream, "late_perc", narrow_space); + stream_out(csv_out, stream, "too_late_num", wide_space); + stream_out(csv_out, stream, "too_late_perc", wide_space); + stream_out(csv_out, stream, "lost_num", narrow_space); + stream_out(csv_out, stream, "lost_perc", narrow_space, false); stream << std::endl; // log total values @@ -94,17 +94,17 @@ void log_trackers_latency_all_stats( stream << header_title << std::endl; stream_out(csv_out, stream, "node", wide_space); stream_out(csv_out, stream, "topic", wide_space); - stream_out(csv_out, stream, "size[b]", narrow_space); - stream_out(csv_out, stream, "received[#]", wide_space); - stream_out(csv_out, stream, "late[#]", narrow_space); - stream_out(csv_out, stream, "too_late[#]", wide_space); - stream_out(csv_out, stream, "lost[#]", narrow_space); - stream_out(csv_out, stream, "mean[us]", narrow_space); - stream_out(csv_out, stream, "sd[us]", narrow_space); - stream_out(csv_out, stream, "min[us]", narrow_space); - stream_out(csv_out, stream, "max[us]", narrow_space); - stream_out(csv_out, stream, "freq[hz]", narrow_space); - stream_out(csv_out, stream, "throughput[Kb/s]", wide_space, false); + stream_out(csv_out, stream, "size_b", narrow_space); + stream_out(csv_out, stream, "received_num", wide_space); + stream_out(csv_out, stream, "late_num", narrow_space); + stream_out(csv_out, stream, "too_late_num", wide_space); + stream_out(csv_out, stream, "lost_num", narrow_space); + stream_out(csv_out, stream, "mean_us", narrow_space); + stream_out(csv_out, stream, "sd_us", narrow_space); + stream_out(csv_out, stream, "min_us", narrow_space); + stream_out(csv_out, stream, "max_us", narrow_space); + stream_out(csv_out, stream, "freq_hz", narrow_space); + stream_out(csv_out, stream, "throughput_Kb_per_sec", wide_space, false); stream << std::endl; }; From e42f8b6fbae972d6dfe7242465b0797c51a912aa Mon Sep 17 00:00:00 2001 From: Josh Finken Date: Wed, 20 Dec 2023 10:21:30 -0700 Subject: [PATCH 2/2] PR feedback: in the header change _num to _msgs --- performance_metrics/src/stat_logger.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/performance_metrics/src/stat_logger.cpp b/performance_metrics/src/stat_logger.cpp index 5ee6b59..ed12b9c 100644 --- a/performance_metrics/src/stat_logger.cpp +++ b/performance_metrics/src/stat_logger.cpp @@ -55,13 +55,13 @@ void log_total_stats( static_cast(total_too_late) / total_received * 100; // log header - stream_out(csv_out, stream, "received_num", wide_space); + stream_out(csv_out, stream, "received_msgs", wide_space); stream_out(csv_out, stream, "mean_us", narrow_space); - stream_out(csv_out, stream, "late_num", narrow_space); + stream_out(csv_out, stream, "late_msgs", narrow_space); stream_out(csv_out, stream, "late_perc", narrow_space); - stream_out(csv_out, stream, "too_late_num", wide_space); + stream_out(csv_out, stream, "too_late_msgs", wide_space); stream_out(csv_out, stream, "too_late_perc", wide_space); - stream_out(csv_out, stream, "lost_num", narrow_space); + stream_out(csv_out, stream, "lost_msgs", narrow_space); stream_out(csv_out, stream, "lost_perc", narrow_space, false); stream << std::endl; @@ -95,10 +95,10 @@ void log_trackers_latency_all_stats( stream_out(csv_out, stream, "node", wide_space); stream_out(csv_out, stream, "topic", wide_space); stream_out(csv_out, stream, "size_b", narrow_space); - stream_out(csv_out, stream, "received_num", wide_space); - stream_out(csv_out, stream, "late_num", narrow_space); - stream_out(csv_out, stream, "too_late_num", wide_space); - stream_out(csv_out, stream, "lost_num", narrow_space); + stream_out(csv_out, stream, "received_msgs", wide_space); + stream_out(csv_out, stream, "late_msgs", narrow_space); + stream_out(csv_out, stream, "too_late_msgs", wide_space); + stream_out(csv_out, stream, "lost_msgs", narrow_space); stream_out(csv_out, stream, "mean_us", narrow_space); stream_out(csv_out, stream, "sd_us", narrow_space); stream_out(csv_out, stream, "min_us", narrow_space);