Alternative proposal, anonymous namespaces in two separate header fil…

…es (#66)

src/c++/CMakeLists.txt

@@ -14,7 +14,8 @@ include(CMakePackageConfigHelpers)
 add_library(${CMAKE_PROJECT_NAME} SHARED
         profiler.h    profiler.cpp
         hashtable.h   hashtable.cpp
-        clock.h       clock.cpp
+        clockmethods.h
+        clocktypes.h
         )
 
 # Link library to and external libs (also use project warnings and options).
@@ -23,7 +24,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE
 
 set_project_warnings(${CMAKE_PROJECT_NAME})
 
-set(PUBLIC_HEADER_FILES profiler.h hashtable.h clock.h)
+set(PUBLIC_HEADER_FILES profiler.h hashtable.h clockmethods.h clocktypes.h)
 
 # Set the properties of the library including, the version and language. Also
 # set which header files are to be public and installed, this can be useful

src/c++/clockmethods.h

@@ -0,0 +1,13 @@
+#ifndef CLOCK_METHODS_H
+#define CLOCK_METHODS_H
+
+namespace {
+
+    timepoint_t now()
+    {
+      return std::chrono::steady_clock::now();
+    }
+
+} // end anonymous namespace
+
+#endif

src/c++/clocktypes.h

@@ -0,0 +1,14 @@
+#ifndef CLOCK_TYPES_H
+#define CLOCK_TYPES_H
+
+#include <chrono>
+
+namespace {
+
+    // Time point and duration type definitions
+    using duration_t  = std::chrono::duration<double>;
+    using timepoint_t = std::chrono::time_point<std::chrono::steady_clock,duration_t>;
+
+}
+
+#endif

src/c++/hashtable.cpp

@@ -18,9 +18,9 @@
 
 HashEntry::HashEntry(std::string_view region_name)
       : region_name_(region_name)
-      , total_walltime_(Clock::duration_t::zero())
-      , self_walltime_(Clock::duration_t::zero())
-      , child_walltime_(Clock::duration_t::zero())
+      , total_walltime_(duration_t::zero())
+      , self_walltime_(duration_t::zero())
+      , child_walltime_(duration_t::zero())
       , call_count_(0)
       {}
 
@@ -55,7 +55,7 @@ size_t HashTable::query_insert(std::string_view region_name) noexcept
  *
  */
 
-void HashTable::update(size_t hash, Clock::duration_t time_delta)
+void HashTable::update(size_t hash, duration_t time_delta)
 {
   // Assertions
   assert (table_.size() > 0);
@@ -74,7 +74,7 @@ void HashTable::update(size_t hash, Clock::duration_t time_delta)
  *
  */
 
-void HashTable::add_child_time(size_t hash, Clock::duration_t time_delta)
+void HashTable::add_child_time(size_t hash, duration_t time_delta)
 {
   // Assertions
   assert (table_.size() > 0);

src/c++/hashtable.h

@@ -28,8 +28,7 @@
 #include <string>
 #include <string_view>
 
-#include "clock.h"
-
+#include "clocktypes.h"
 
 /**
  * @brief  Structure to hold information for a particular routine.
@@ -47,9 +46,9 @@ struct HashEntry{
 
     // Data members
     std::string            region_name_;
-    Clock::duration_t      total_walltime_;
-    Clock::duration_t      self_walltime_;
-    Clock::duration_t      child_walltime_;
+    duration_t             total_walltime_;
+    duration_t             self_walltime_;
+    duration_t             child_walltime_;
     unsigned long long int call_count_;
 
 };
@@ -80,12 +79,12 @@ class HashTable{
 
     // Prototypes
     size_t query_insert(std::string_view) noexcept;
-    void update(size_t, Clock::duration_t);
+    void update(size_t, duration_t);
     void write();
 
     // Member functions
     std::vector<size_t> list_keys();
-    void add_child_time(size_t, Clock::duration_t);
+    void add_child_time(size_t, duration_t);
     void compute_self_times();
 
     // Getters

src/c++/profiler.cpp

@@ -10,6 +10,8 @@
 #include <cassert>
 #include <chrono>
 
+#include "clockmethods.h"
+
 /**
  * @brief Constructor
  *
@@ -29,7 +31,7 @@ Profiler::Profiler(){
     HashTable new_table(tid);
     thread_hashtables_.push_back(new_table);
 
-    std::vector<std::pair<size_t,Clock::timepoint_t>> new_list;
+    std::vector<std::pair<size_t,timepoint_t>> new_list;
     thread_traceback_.push_back(new_list);
   }
 
@@ -60,7 +62,7 @@ size_t Profiler::start(std::string_view region_name)
   size_t const hash = thread_hashtables_[tid].query_insert(region_name);
 
   // Add routine to the traceback.
-  auto start_time = Clock::now();
+  auto start_time = now();
   thread_traceback_[tid].push_back(std::make_pair(hash, start_time));
 
   return hash;
@@ -75,7 +77,7 @@ void Profiler::stop(size_t const hash)
 {
 
   // First job: log the stop time.
-  auto stop_time = Clock::now();
+  auto stop_time = now();
 
   // Determine the thread number
   auto tid = static_cast<hashtable_iterator_t_>(0);

src/c++/profiler.h

@@ -39,11 +39,11 @@ class Profiler
     // Data members
     int max_threads_;
     std::vector<HashTable> thread_hashtables_;
-    std::vector<std::vector<std::pair<size_t,Clock::timepoint_t>>> thread_traceback_;
+    std::vector<std::vector<std::pair<size_t,timepoint_t>>> thread_traceback_;
 
     // Type definitions for vector array indexing.
     typedef std::vector<HashTable>::size_type hashtable_iterator_t_;
-    typedef std::vector<std::vector<std::pair<size_t,Clock::timepoint_t>>>::size_type pair_iterator_t_;
+    typedef std::vector<std::vector<std::pair<size_t,timepoint_t>>>::size_type pair_iterator_t_;
 
   public: