Merge pull request #158 from eseiler/misc/timer

[MISC] Split timer into two classes
seqan · Nov 7, 2023 · 737a231 · 737a231 · vercel · Nov 7, 2023
2 parents b6d288e + 7846d5e
commit 737a231
Show file tree

Hide file tree

Showing 10 changed files with 351 additions and 118 deletions.
diff --git a/include/hibf/build/build_data.hpp b/include/hibf/build/build_data.hpp
@@ -29,10 +29,10 @@ struct build_data
     std::vector<double> fpr_correction{};
 
     // Timers do not copy the stored duration upon copy construction/assignment
-    mutable timer<concurrent::yes> index_allocation_timer{};
-    mutable timer<concurrent::yes> user_bin_io_timer{};
-    mutable timer<concurrent::yes> merge_kmers_timer{};
-    mutable timer<concurrent::yes> fill_ibf_timer{};
+    mutable concurrent_timer index_allocation_timer{};
+    mutable concurrent_timer user_bin_io_timer{};
+    mutable concurrent_timer merge_kmers_timer{};
+    mutable concurrent_timer fill_ibf_timer{};
 
     size_t request_ibf_idx()
     {

diff --git a/include/hibf/build/insert_into_ibf.hpp b/include/hibf/build/insert_into_ibf.hpp
@@ -25,7 +25,7 @@ void insert_into_ibf(robin_hood::unordered_flat_set<uint64_t> const & kmers,
                      size_t const number_of_bins,
                      size_t const bin_index,
                      seqan::hibf::interleaved_bloom_filter & ibf,
-                     timer<concurrent::yes> & fill_ibf_timer);
+                     concurrent_timer & fill_ibf_timer);
 
 //!\overload
 void insert_into_ibf(build_data const & data,

diff --git a/include/hibf/build/update_parent_kmers.hpp b/include/hibf/build/update_parent_kmers.hpp
@@ -23,9 +23,9 @@ namespace seqan::hibf::build
  */
 inline void update_parent_kmers(robin_hood::unordered_flat_set<uint64_t> & parent_kmers,
                                 robin_hood::unordered_flat_set<uint64_t> const & kmers,
-                                timer<concurrent::yes> & merge_kmers_timer)
+                                concurrent_timer & merge_kmers_timer)
 {
-    timer<concurrent::no> local_merge_kmers_timer{};
+    serial_timer local_merge_kmers_timer{};
     local_merge_kmers_timer.start();
     parent_kmers.insert(kmers.begin(), kmers.end());
     local_merge_kmers_timer.stop();

diff --git a/include/hibf/hierarchical_interleaved_bloom_filter.hpp b/include/hibf/hierarchical_interleaved_bloom_filter.hpp
@@ -249,10 +249,10 @@ class hierarchical_interleaved_bloom_filter
      * \brief Only contains values after the HIBF has been constructed.
      * \{
      */
-    timer<concurrent::yes> index_allocation_timer{};
-    timer<concurrent::yes> user_bin_io_timer{};
-    timer<concurrent::yes> merge_kmers_timer{};
-    timer<concurrent::yes> fill_ibf_timer{};
+    concurrent_timer index_allocation_timer{};
+    concurrent_timer user_bin_io_timer{};
+    concurrent_timer merge_kmers_timer{};
+    concurrent_timer fill_ibf_timer{};
     //!\}
     //!\endcond
 };