util: Minor updates to Statman

Author: fwsGonzo

api/util/statman.hpp

@@ -25,38 +25,27 @@
 #include <membitmap>
 #include <smp_utils>
 
-/** This type is thrown when Statman's span is full */
 struct Stats_out_of_memory : public std::out_of_range {
   explicit Stats_out_of_memory()
-    : std::out_of_range(std::string{"Statman has no room for more statistics"})
+    : std::out_of_range("Statman has no room for more statistics")
     {}
-}; //< struct Stats_out_of_memory
+};
 
-
-/** This type is thrown from within the operations of class Statman */
 struct Stats_exception : public std::runtime_error {
   using runtime_error::runtime_error;
-}; //< struct Stats_exception
+};
 
-///
-///
-///
 class Stat {
 public:
-  static const int MAX_NAME_LEN {47};
-  ///
-  ///
-  ///
+  static const int MAX_NAME_LEN = 47;
+
   enum Stat_type: uint8_t
   {
     FLOAT,
     UINT32,
     UINT64
   };
 
-  ///
-  ///
-  ///
   Stat(const Stat_type type, const std::string& name);
   ~Stat() = default;
 
@@ -93,7 +82,7 @@ class Stat {
   };
   Stat_type type_;
 
-  char name_[MAX_NAME_LEN];
+  char name_[MAX_NAME_LEN+1];
 
   Stat(const Stat& other) = delete;
   Stat(const Stat&& other) = delete;

src/kernel/timers.cpp

@@ -65,10 +65,10 @@ struct alignas(SMP_ALIGN) timer_system
   // timers sorted by timestamp
   std::multimap<duration_t, Timers::id_t> scheduled;
   /** Stats */
-  int64_t*  oneshot_started;
-  int64_t*  oneshot_stopped;
-  uint32_t* periodic_started;
-  uint32_t* periodic_stopped;
+  int64_t*  oneshot_started = nullptr;
+  int64_t*  oneshot_stopped = nullptr;
+  uint32_t* periodic_started = nullptr;
+  uint32_t* periodic_stopped = nullptr;
 };
 static SMP_ARRAY<timer_system> systems;
 
@@ -83,7 +83,7 @@ void Timers::init(const start_func_t& start, const stop_func_t& stop)
   system.arch_start_func = start;
   system.arch_stop_func  = stop;
 
-  std::string CPU = "cpu" + std::to_string(SMP::cpu_id());
+  const std::string CPU = "cpu" + std::to_string(SMP::cpu_id());
   system.oneshot_started = (int64_t*) &Statman::get().create(Stat::UINT64, CPU + ".timers.oneshot_started").get_uint64();
   system.oneshot_stopped = (int64_t*) &Statman::get().create(Stat::UINT64, CPU + ".timers.oneshot_stopped").get_uint64();
   system.periodic_started = &Statman::get().create(Stat::UINT32, CPU + ".timers.periodic_started").get_uint32();

src/util/statman.cpp

@@ -28,18 +28,11 @@ Statman& Statman::get() {
 
 ///////////////////////////////////////////////////////////////////////////////
 Stat::Stat(const Stat_type type, const std::string& name)
-  : type_{type}
+  : ui64(0), type_{type}
 {
   if(name.size() > MAX_NAME_LEN)
     throw Stats_exception{"Creating stat: Name cannot be longer than " + std::to_string(MAX_NAME_LEN) + " characters"};
 
-  switch (type) {
-    case UINT32: ui32 = 0;    break;
-    case UINT64: ui64 = 0;    break;
-    case FLOAT:  f    = 0.0f; break;
-    default: throw Stats_exception{"Unimplemented stat type"};
-  }
-
   snprintf(name_, sizeof(name_), "%s", name.c_str());
 }
 
@@ -79,7 +72,7 @@ uint64_t& Stat::get_uint64() {
 void Statman::init(const uintptr_t start, const Size_type num_bytes)
 {
   if (num_bytes < 0)
-    throw Stats_exception{"Creating Statman: A negative number of bytes has been given"};
+    throw Stats_exception("Can't initialize statman with negative size");
 
   const int N = num_bytes / sizeof(Stat);
   this->stats_     = reinterpret_cast<Stat*>(start);
@@ -103,7 +96,7 @@ Stat& Statman::create(const Stat::Stat_type type, const std::string& name) {
   volatile scoped_spinlock lock(this->stlock);
 #endif
   if (name.empty())
-    throw Stats_exception{"Cannot create Stat with no name"};
+    throw Stats_exception("Cannot create Stat with no name");
 
   const int idx = bitmap.first_free();
   if (idx == -1 || idx >= capacity())