#306: tls: fix warning about unused static struct

DARMA-tasking · Apr 16, 2019 · ba3e950 · ba3e950
1 parent bdcc629
commit ba3e950
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/vt/utils/tls/null_tls.h b/src/vt/utils/tls/null_tls.h
@@ -53,16 +53,20 @@ namespace vt { namespace util { namespace tls {
 
 template <typename T, char const* tag>
 struct ThreadLocalNull {
-  static T& get() { return value_; }
+  T& get() { access_++; return value_; }
+  int64_t numAccess() const { return access_; }
 private:
   static T value_;
+  int64_t access_ = 0;
 };
 
 template <typename T, char const* tag, T val>
 struct ThreadLocalInitNull {
-  static T& get() { return value_; }
+  T& get() { access_++; return value_; }
+  int64_t numAccess() const { return access_; }
 private:
   static T value_;
+  int64_t access_ = 0;
 };
 
 template <typename T, char const* tag>

diff --git a/src/vt/utils/tls/omp_tls.h b/src/vt/utils/tls/omp_tls.h
@@ -54,26 +54,30 @@ namespace vt { namespace util { namespace tls {
 
 template <typename T, char const* tag, T val>
 struct ThreadLocalInitOMP {
-  static T& get() { return value_; }
+  T& get() { access_++; return value_; }
+  int64_t numAccess() const { return access_; }
 private:
   #if defined(__GNUC__)
     static thread_local T value_;
   #else
     static T value_;
     #pragma omp threadprivate (value_)
   #endif
+  int64_t access_ = 0;
 };
 
 template <typename T, char const* tag>
 struct ThreadLocalOMP {
-  static T& get() { return value_; }
+  T& get() { access_++; return value_; }
+  int64_t numAccess() const { return access_; }
 private:
   #if defined(__GNUC__)
     static thread_local T value_;
   #else
     static T value_;
     #pragma omp threadprivate (value_)
   #endif
+  int64_t access_ = 0;
 };
 
 #if defined(__GNUC__)

diff --git a/src/vt/utils/tls/std_tls.h b/src/vt/utils/tls/std_tls.h
@@ -53,16 +53,20 @@ namespace vt { namespace util { namespace tls {
 
 template <typename T, char const* tag, T val = T{}>
 struct ThreadLocalInitSTD {
-  static T& get() { return value_; }
+  T& get() { access_++; return value_; }
+  int64_t numAccess() const { return access_; }
 private:
   static thread_local T value_;
+  int64_t access_ = 0;
 };
 
 template <typename T, char const* tag>
 struct ThreadLocalSTD {
-  static T& get() { return value_; }
+  T& get() { access_++; return value_; }
+  int64_t numAccess() const { return access_; }
 private:
   static thread_local T value_;
+  int64_t access_ = 0;
 };
 
 template <typename T, char const* tag, T val>

diff --git a/src/vt/utils/tls/tls.impl.h b/src/vt/utils/tls/tls.impl.h
@@ -69,7 +69,7 @@ namespace vt { namespace util { namespace tls {
 #define ExternImplTLS(tlcls, type, var)                                      \
   InnerTLS(tlcls, type, var, , , extern, )
 #define AccessImplTLS(var)                                                   \
-  decltype(TagTLS(var))::get()
+  TagTLS(var).get()
 
 // Variants for static file TLS variables
 #define DeclareStImplTLS(tlcls, type, var)                                   \
@@ -101,7 +101,7 @@ namespace vt { namespace util { namespace tls {
   InnerClsOutTLS(tlcls, cls, type, var, InitTempTLS(init), InitStrTLS(var))
 // Variant for static class TLS variables access
 #define AccessClsImplTLS(cls, var)                                           \
-  decltype(cls::TagTLS(var))::get()
+  cls::TagTLS(var).get()
 
 }}} /* end namespace vt::util::tls */