From b18770630126b37e52930954672167aae649b3a0 Mon Sep 17 00:00:00 2001 From: pwpmurthy Date: Wed, 12 Apr 2023 14:49:58 +0000 Subject: [PATCH] Removed CPU dependency Just code commented as it was used only for printing logs Signed-off-by: pwpmurthy Change-Id: I7b2993d3f66f0c67f4085e4894e9184c564a722b Signed-off-by: pwpmurthy --- RIC-E2-TERMINATION/sctpThread.cpp | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/RIC-E2-TERMINATION/sctpThread.cpp b/RIC-E2-TERMINATION/sctpThread.cpp index d34a4e5..b0f58ab 100644 --- a/RIC-E2-TERMINATION/sctpThread.cpp +++ b/RIC-E2-TERMINATION/sctpThread.cpp @@ -59,7 +59,7 @@ static void catch_function(int signal) { BOOST_LOG_INLINE_GLOBAL_LOGGER_DEFAULT(my_logger, src::logger_mt) boost::shared_ptr> boostLogger; -double cpuClock = 0.0; +// double cpuClock = 0.0; bool jsonTrace = false; char* getinterfaceip() @@ -289,23 +289,26 @@ void init_log() { dynamic_log_level_change(); mdclog_attr_destroy(attr); } -auto start_time = std::chrono::high_resolution_clock::now(); -typedef std::chrono::duration> seconds_t; +//auto start_time = std::chrono::high_resolution_clock::now(); +//typedef std::chrono::duration> seconds_t; -double age() { - return seconds_t(std::chrono::high_resolution_clock::now() - start_time).count(); -} +//double age() { +// return seconds_t(std::chrono::high_resolution_clock::now() - start_time).count(); +//} -double approx_CPU_MHz(unsigned sleepTime) { - using namespace std::chrono_literals; - uint32_t aux = 0; - uint64_t cycles_start = rdtscp(aux); - double time_start = age(); - std::this_thread::sleep_for(sleepTime * 1ms); - uint64_t elapsed_cycles = rdtscp(aux) - cycles_start; - double elapsed_time = age() - time_start; - return elapsed_cycles / elapsed_time; -} +// If model name in "/proc/cpuinfo" is happens to be "Common KVM processor" then +// approx_CPU_MHz() results in "SIGILL - Illegal Instruction" signal. +// +// double approx_CPU_MHz(unsigned sleepTime) { +// using namespace std::chrono_literals; +// uint32_t aux = 0; +// uint64_t cycles_start = rdtscp(aux); +// double time_start = age(); +// std::this_thread::sleep_for(sleepTime * 1ms); +// uint64_t elapsed_cycles = rdtscp(aux) - cycles_start; +// double elapsed_time = age() - time_start; +// return elapsed_cycles / elapsed_time; +//} //std::atomic rmrCounter{0}; std::atomic num_of_messages{0}; @@ -600,9 +603,9 @@ int main(const int argc, char **argv) { exit(1); } - cpuClock = approx_CPU_MHz(100); +// cpuClock = approx_CPU_MHz(100); - mdclog_write(MDCLOG_DEBUG, "CPU speed %11.11f", cpuClock); +// mdclog_write(MDCLOG_DEBUG, "CPU speed %11.11f", cpuClock); auto result = parse(argc, argv, sctpParams); -- 2.16.6