[HICN-713] Transport Library Major Refactoring 2

Co-authored-by: Luca Muscariello <muscariello@ieee.org>
Co-authored-by: Michele Papalini <micpapal@cisco.com>
Co-authored-by: Olivier Roques <oroques+fdio@cisco.com>
Co-authored-by: Giulio Grassi <gigrassi@cisco.com>
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I5b2c667bad66feb45abdb5effe22ed0f6c85d1c2

1 files changed, 4 insertions, 19 deletions

diff --git a/libtransport/src/io_modules/forwarder/global_id_counter.h b/libtransport/src/io_modules/forwarder/global_id_counter.h
index fe8d76730..0a67b76d5 100644
--- a/libtransport/src/io_modules/forwarder/global_id_counter.h
+++ b/libtransport/src/io_modules/forwarder/global_id_counter.h
@@ -15,6 +15,8 @@
 
 #pragma once
 
+#include <hicn/transport/utils/singleton.h>
+
 #include <atomic>
 #include <mutex>
 
@@ -23,32 +25,15 @@ namespace transport {
 namespace core {
 
 template <typename T = uint64_t>
-class GlobalCounter {
+class GlobalCounter : public utils::Singleton<GlobalCounter<T>> {
  public:
-  static GlobalCounter& getInstance() {
-    std::lock_guard<std::mutex> lock(global_mutex_);
-
-    if (!instance_) {
-      instance_.reset(new GlobalCounter());
-    }
-
-    return *instance_;
-  }
-
+  friend class utils::Singleton<GlobalCounter>;
   T getNext() { return counter_++; }
 
  private:
   GlobalCounter() : counter_(0) {}
-  static std::unique_ptr<GlobalCounter<T>> instance_;
-  static std::mutex global_mutex_;
   std::atomic<T> counter_;
 };
 
-template <typename T>
-std::unique_ptr<GlobalCounter<T>> GlobalCounter<T>::instance_ = nullptr;
-
-template <typename T>
-std::mutex GlobalCounter<T>::global_mutex_;
-
 }  // namespace core
 }  // namespace transport
\ No newline at end of file