[XPTIFW] Addressing review feedback II

Signed-off-by: Vasanth Tovinkere <[email protected]>

Author: tovinkere

xptifw/basic_test/cl_processor.hpp

@@ -33,8 +33,8 @@ using titles_t = std::vector<std::string>;
 
 class ScopedTimer {
 public:
-  typedef std::chrono::time_point<std::chrono::high_resolution_clock>
-      time_unit_t;
+  using time_unit_t =
+      std::chrono::time_point<std::chrono::high_resolution_clock>;
   ScopedTimer(uint64_t &ns, double &ratio, size_t count = 1)
       : MDuration{ns}, MAverage{ratio}, MInstances{count} {
     MBefore = std::chrono::high_resolution_clock::now();
@@ -60,7 +60,6 @@ class CommandLineOption {
   CommandLineOption()
       : MRequired(false), MType(OptionType::String),
         MHelp("No help available.") {}
-  ~CommandLineOption() {}
 
   CommandLineOption &setRequired(bool yesOrNo) {
     MRequired = yesOrNo;
@@ -93,17 +92,15 @@ class CommandLineOption {
 
 class CommandLineParser {
 public:
-  typedef std::unordered_map<std::string, CommandLineOption>
-      CommandLineOptions_t;
-  typedef std::unordered_map<std::string, std::string> key_value_t;
+  using CommandLineOptions_t =
+      std::unordered_map<std::string, CommandLineOption>;
+  using key_value_t = std::unordered_map<std::string, std::string>;
 
   CommandLineParser() {
     MReservedKey = "--help";
     MReservedKeyAbbr = "-h";
   }
 
-  ~CommandLineParser() {}
-
   void parse(int argc, char **argv) {
     MCommandLineOptions.resize(argc);
     // Go through the command-line options list and build an internal

xptifw/include/xpti_int64_hash_table.hpp

@@ -11,7 +11,7 @@
 #include <unordered_map>
 
 #ifdef XPTI_STATISTICS
-#include <stdio.h>
+#include <cstdio>
 #endif
 
 #ifdef XPTI_USE_TBB

xptifw/include/xpti_string_table.hpp

@@ -7,12 +7,11 @@
 #include "xpti_data_types.h"
 
 #include <atomic>
-#include <iostream>
 #include <mutex>
 #include <unordered_map>
 
 #ifdef XPTI_STATISTICS
-#include <stdio.h>
+#include <cstdio>
 #endif
 
 #ifdef XPTI_USE_TBB

xptifw/samples/basic_collector/basic_collector.cpp

@@ -9,10 +9,10 @@
 #include "xpti_trace_framework.h"
 
 #include <chrono>
+#include <cstdio>
 #include <iostream>
 #include <map>
 #include <mutex>
-#include <stdio.h>
 #include <string>
 #include <thread>
 #include <unordered_map>

xptifw/samples/include/xpti_timers.hpp

@@ -15,10 +15,7 @@
 namespace xpti {
 class ThreadID {
 public:
-  typedef std::unordered_map<std::string, int> thread_lut_t;
-
-  ThreadID() : m_tid(0) {}
-  ~ThreadID() {}
+  using thread_lut_t = std::unordered_map<std::string, int>;
 
   inline uint32_t enumID(std::thread::id &curr) {
     std::stringstream s;
@@ -45,13 +42,13 @@ class ThreadID {
   }
 
 private:
-  std::atomic<uint32_t> m_tid;
+  std::atomic<uint32_t> m_tid = {0};
   thread_lut_t m_thread_lookup;
 };
 
 namespace timer {
 #include <cstdint>
-typedef uint64_t tick_t;
+using tick_t = uint64_t;
 #if defined(_WIN32) || defined(_WIN64)
 #include "windows.h"
 inline xpti::timer::tick_t rdtsc() {

xptifw/src/xpti_trace_framework.cpp

@@ -8,17 +8,14 @@
 #include "xpti_string_table.hpp"
 
 #include <cassert>
+#include <cstdio>
 #include <map>
 #include <mutex>
 #include <sstream>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#ifdef XPTI_STATISTICS
-#include <stdio.h>
-#endif
-
 #ifdef XPTI_USE_TBB
 #include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_unordered_map.h>
@@ -104,7 +101,6 @@ class Subscribers {
 #endif
       // This plugin has already been loaded, so let's return previously
       // recorded handle
-      printf("Plugin (%s) has already been loaded..\n", Path);
       plugin_data_t &Data = MNameLUT[Path];
       assert(Data.valid && "Lookup is invalid!");
       if (Data.valid)
@@ -384,10 +380,12 @@ class Tracepoints {
   // performed.
   //
   void printStatistics() {
+#ifdef XPTI_STATISTICS
     printf("Tracepoint inserts : [%lu] \n", MInsertions.load());
     printf("Tracepoint lookups : [%lu]\n", MRetrievals.load());
     printf("Tracepoint Hashmap :\n");
     MPayloadLUT.printStatistics();
+#endif
   }
 
 private:
@@ -646,8 +644,6 @@ class Notifications {
   using stream_cb_t = std::unordered_map<uint16_t, cb_t>;
   using statistics_t = std::unordered_map<uint16_t, uint64_t>;
 #endif
-  Notifications() = default;
-  ~Notifications() = default;
 
   xpti::result_t registerCallback(uint8_t StreamID, uint16_t TraceType,
                                   xpti::tracepoint_callback_api_t cbFunc) {
@@ -898,7 +894,6 @@ class Framework {
     MTraceEnabled =
         (g_helper.checkTraceEnv() && MSubscribers.hasValidSubscribers());
   }
-  ~Framework() = default;
 
   void clear() {
     MUniversalIDs = {1};