Merge pull request #2888 from STEllAR-GROUP/fixing_2881

Fix compilation problems if HPX_WITH_ITT_NOTIFY=ON
STEllAR-GROUP · Sep 7, 2017 · 60a0111 · 60a0111
2 parents 3542836 + 942580c
commit 60a0111
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 21 deletions.
diff --git a/hpx/lcos/detail/future_data.hpp b/hpx/lcos/detail/future_data.hpp
@@ -1182,7 +1182,7 @@ namespace hpx { namespace traits
     template <typename F1, typename F2>
     struct get_function_annotation_itt<lcos::detail::compose_cb_impl<F1, F2> >
     {
-        static char const*
+        static util::itt::string_handle
             call(lcos::detail::compose_cb_impl<F1, F2> const& f) noexcept
         {
             return get_function_annotation_itt<F1>::call(f.f1_);

diff --git a/hpx/parallel/algorithms/for_each.hpp b/hpx/parallel/algorithms/for_each.hpp
@@ -565,7 +565,7 @@ namespace hpx { namespace traits
     struct get_function_annotation_itt<
         parallel::v1::detail::for_each_iteration<ExPolicy, F, Proj> >
     {
-        static char const* call(
+        static util::itt::string_handle call(
             parallel::v1::detail::for_each_iteration<ExPolicy, F, Proj> const& f)
                 noexcept
         {

diff --git a/hpx/parallel/algorithms/for_loop.hpp b/hpx/parallel/algorithms/for_loop.hpp
@@ -1172,7 +1172,7 @@ namespace hpx { namespace traits
     struct get_function_annotation_itt<
         parallel::v2::detail::part_iterations<F, S, Tuple> >
     {
-        static char const* call(
+        static util::itt::string_handle call(
             parallel::v2::detail::part_iterations<F, S, Tuple> const& f)
                 noexcept
         {

diff --git a/hpx/parallel/algorithms/transform.hpp b/hpx/parallel/algorithms/transform.hpp
@@ -965,7 +965,7 @@ namespace hpx { namespace traits
     struct get_function_annotation_itt<
         parallel::v1::detail::transform_iteration<ExPolicy, F, Proj> >
     {
-        static char const* call(
+        static util::itt::string_handle call(
             parallel::v1::detail::transform_iteration<ExPolicy, F, Proj> const& f)
                 noexcept
         {

diff --git a/hpx/parallel/util/detail/partitioner_iteration.hpp b/hpx/parallel/util/detail/partitioner_iteration.hpp
@@ -87,7 +87,7 @@ namespace hpx { namespace traits
     struct get_function_annotation_itt<
         parallel::util::detail::partitioner_iteration<Result, F> >
     {
-        static char const* call(
+        static util::itt::string_handle call(
             parallel::util::detail::partitioner_iteration<Result, F> const& f)
                 noexcept
         {

diff --git a/hpx/util/bind.hpp b/hpx/util/bind.hpp
@@ -337,14 +337,15 @@ namespace hpx { namespace util
             }
 
 #if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
-            char const* get_function_annotation_itt() const
+            util::itt::string_handle get_function_annotation_itt() const
             {
 #if defined(HPX_HAVE_THREAD_DESCRIPTION)
                 return traits::get_function_annotation_itt<
                         typename std::decay<F>::type
                     >::call(_f);
 #else
-                return nullptr;
+                static util::itt::string_handle sh("bound");
+                return sh;
 #endif
             }
 #endif
@@ -452,12 +453,13 @@ namespace hpx { namespace util
             }
 
 #if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
-            char const* get_function_annotation_itt() const
+            util::itt::string_handle get_function_annotation_itt() const
             {
 #if defined(HPX_HAVE_THREAD_DESCRIPTION)
                 return traits::get_function_annotation_itt<F>::call(_f);
 #else
-                return nullptr;
+                static util::itt::string_handle sh("one_shot_wrapper");
+                return sh;
 #endif
             }
 #endif
@@ -544,7 +546,7 @@ namespace hpx { namespace traits
     template <typename Sig>
     struct get_function_annotation_itt<util::detail::bound<Sig> >
     {
-        static char const*
+        static util::itt::string_handle
             call(util::detail::bound<Sig> const& f) noexcept
         {
             return f.get_function_annotation_itt();
@@ -554,7 +556,7 @@ namespace hpx { namespace traits
     template <typename F>
     struct get_function_annotation_itt<util::detail::one_shot_wrapper<F> >
     {
-        static char const*
+        static util::itt::string_handle
             call(util::detail::one_shot_wrapper<F> const& f) noexcept
         {
             return f.get_function_annotation_itt();

diff --git a/hpx/util/deferred_call.hpp b/hpx/util/deferred_call.hpp
@@ -129,14 +129,15 @@ namespace hpx { namespace util
             }
 
 #if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
-            char const* get_function_annotation_itt() const
+            util::itt::string_handle get_function_annotation_itt() const
             {
 #if defined(HPX_HAVE_THREAD_DESCRIPTION)
                 return traits::get_function_annotation_itt<
                         typename util::decay_unwrap<F>::type
                     >::call(_f);
 #else
-                return nullptr;
+                static util::itt::string_handle sh("deferred");
+                return sh;
 #endif
             }
 #endif
@@ -202,7 +203,7 @@ namespace hpx { namespace traits
     template <typename Sig>
     struct get_function_annotation_itt<util::detail::deferred<Sig> >
     {
-        static char const*
+        static util::itt::string_handle
             call(util::detail::deferred<Sig> const& f) noexcept
         {
             return f.get_function_annotation_itt();

diff --git a/hpx/util/detail/basic_function.hpp b/hpx/util/detail/basic_function.hpp
@@ -214,12 +214,13 @@ namespace hpx { namespace util { namespace detail
 #endif
         }
 
-        char const* get_function_annotation_itt() const
+        util::itt::string_handle get_function_annotation_itt() const
         {
 #if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
             return vptr->get_function_annotation_itt(object);
 #else
-            return nullptr;
+            static util::itt::string_handle sh;
+            return sh;
 #endif
         }
 

diff --git a/hpx/util/detail/vtable/callable_vtable.hpp b/hpx/util/detail/vtable/callable_vtable.hpp
@@ -38,11 +38,12 @@ namespace hpx { namespace util { namespace detail
 
 #if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
         template <typename T>
-        HPX_FORCEINLINE static char const* _get_function_annotation_itt(void** f)
+        HPX_FORCEINLINE static util::itt::string_handle
+            _get_function_annotation_itt(void** f)
         {
             return traits::get_function_annotation_itt<T>::call(vtable::get<T>(f));
         }
-        char const* (*get_function_annotation_itt)(void**);
+        util::itt::string_handle (*get_function_annotation_itt)(void**);
 #endif
 #endif
 

diff --git a/hpx/util/function.hpp b/hpx/util/function.hpp
@@ -164,7 +164,7 @@ namespace hpx { namespace traits
     template <typename Sig, bool Serializable>
     struct get_function_annotation_itt<util::function<Sig, Serializable> >
     {
-        static char const*
+        static util::itt::string_handle
             call(util::function<Sig, Serializable> const& f) noexcept
         {
             return f.get_function_annotation_itt();

diff --git a/hpx/util/itt_notify.hpp b/hpx/util/itt_notify.hpp
@@ -668,7 +668,7 @@ namespace hpx { namespace util { namespace itt
     ///////////////////////////////////////////////////////////////////////////
     struct string_handle
     {
-        string_handle(char const* s) {}
+        string_handle(char const* s = nullptr) {}
     };
 
     //////////////////////////////////////////////////////////////////////////

diff --git a/hpx/util/unique_function.hpp b/hpx/util/unique_function.hpp
@@ -126,7 +126,7 @@ namespace hpx { namespace traits
     template <typename Sig, bool Serializable>
     struct get_function_annotation_itt<util::unique_function<Sig, Serializable> >
     {
-        static char const*
+        static util::itt::string_handle
             call(util::unique_function<Sig, Serializable> const& f) noexcept
         {
             return f.get_function_annotation_itt();