Fixing usage of HPX_HAVE_ITTNOTIFY

STEllAR-GROUP · Feb 4, 2017 · a6084a8 · a6084a8
1 parent 3bf35c4
commit a6084a8
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/hpx/runtime/actions/action_support.hpp b/hpx/runtime/actions/action_support.hpp
@@ -24,7 +24,7 @@
 #include <hpx/traits/is_bitwise_serializable.hpp>
 #include <hpx/util/detail/count_num_args.hpp>
 #include <hpx/util/tuple.hpp>
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
 #include <hpx/util/itt_notify.hpp>
 #endif
 
@@ -145,7 +145,7 @@ namespace hpx { namespace actions
         }
 #endif
 
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
         template <typename Action>
         util::itt::string_handle const& get_action_name_itt()
 #ifndef HPX_HAVE_AUTOMATIC_SERIALIZATION_REGISTRATION

diff --git a/hpx/runtime/actions/base_action.hpp b/hpx/runtime/actions/base_action.hpp
@@ -20,7 +20,7 @@
 #include <hpx/runtime/threads/thread_data_fwd.hpp>
 #include <hpx/runtime/threads/thread_enums.hpp>
 #include <hpx/traits/polymorphic_traits.hpp>
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
 #include <hpx/util/itt_notify.hpp>
 #endif
 
@@ -127,7 +127,7 @@ namespace hpx { namespace actions
             naming::gid_type&& target, naming::address_type lva,
             std::size_t num_thread) = 0;
 
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
         /// The function \a get_action_name_itt returns the name of this action
         /// as a ITT string_handle
         virtual util::itt::string_handle const& get_action_name_itt() const = 0;

diff --git a/hpx/runtime/actions/basic_action.hpp b/hpx/runtime/actions/basic_action.hpp
@@ -41,7 +41,7 @@
 #include <hpx/util/logging.hpp>
 #include <hpx/util/tuple.hpp>
 #include <hpx/util/void_guard.hpp>
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
 #include <hpx/util/itt_notify.hpp>
 #endif
 
@@ -836,7 +836,7 @@ namespace hpx { namespace serialization
 #define HPX_DEFINE_GET_ACTION_NAME(action)                                    \
     HPX_DEFINE_GET_ACTION_NAME_(action, action)                               \
 /**/
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
 #define HPX_DEFINE_GET_ACTION_NAME_ITT(action, actionname)                    \
     namespace hpx { namespace actions { namespace detail {                    \
         template<> HPX_ALWAYS_EXPORT                                          \
@@ -893,7 +893,7 @@ namespace hpx { namespace serialization
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
 #define HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID_ITT(action)           \
     namespace hpx { namespace actions { namespace detail {                    \
         template <> HPX_ALWAYS_EXPORT                                         \

diff --git a/hpx/runtime/actions/basic_action_fwd.hpp b/hpx/runtime/actions/basic_action_fwd.hpp
@@ -9,7 +9,7 @@
 #define HPX_RUNTIME_ACTIONS_BASIC_ACTION_FWD_HPP
 
 #include <hpx/config.hpp>
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
 #include <hpx/util/itt_notify.hpp>
 #endif
 
@@ -28,7 +28,7 @@ namespace hpx { namespace actions
         template <typename Action>
         char const* get_action_name();
 
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
         template <typename Action>
         util::itt::string_handle const& get_action_name_itt();
 #endif

diff --git a/hpx/runtime/actions/transfer_base_action.hpp b/hpx/runtime/actions/transfer_base_action.hpp
@@ -136,7 +136,7 @@ namespace hpx { namespace actions
             return detail::get_action_name<derived_type>();
         }
 
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
         /// The function \a get_action_name_itt returns the name of this action
         /// as a ITT string_handle
         util::itt::string_handle const& get_action_name_itt() const

diff --git a/hpx/runtime/applier/apply_helper.hpp b/hpx/runtime/applier/apply_helper.hpp
@@ -74,7 +74,7 @@ namespace hpx { namespace applier { namespace detail
             data.lva = lva;
 #endif
 #if defined(HPX_HAVE_THREAD_DESCRIPTION)
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
             data.description = util::thread_description(
                 actions::detail::get_action_name<Action>(),
                 actions::detail::get_action_name_itt<Action>());
@@ -113,7 +113,7 @@ namespace hpx { namespace applier { namespace detail
             data.lva = lva;
 #endif
 #if defined(HPX_HAVE_THREAD_DESCRIPTION)
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
             data.description = util::thread_description(
                 actions::detail::get_action_name<Action>(),
                 actions::detail::get_action_name_itt<Action>());

diff --git a/hpx/runtime/threads/detail/scheduling_loop.hpp b/hpx/runtime/threads/detail/scheduling_loop.hpp
@@ -336,7 +336,7 @@ namespace hpx { namespace threads { namespace detail
                             // store the returned state in the thread
                             {
                                 is_active_wrapper utilization(counters.is_active_);
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
                                 util::itt::caller_context cctx(ctx);
 //                                 util::itt::undo_frame_context undoframe(fctx);
                                 util::itt::task task(domain, thrd->get_description());

diff --git a/hpx/util/thread_description.hpp b/hpx/util/thread_description.hpp
@@ -12,7 +12,7 @@
 #include <hpx/traits/get_function_address.hpp>
 #include <hpx/traits/is_action.hpp>
 #include <hpx/util/assert.hpp>
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
 #include <hpx/util/itt_notify.hpp>
 #endif
 
@@ -44,7 +44,7 @@ namespace hpx { namespace util
 
         data_type type_;
         data data_;
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
         util::itt::string_handle desc_itt_;
 #endif
 
@@ -63,7 +63,7 @@ namespace hpx { namespace util
             data_.desc_ = desc;
         }
 
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
         thread_description(char const* desc,
                 util::itt::string_handle const& sh) HPX_NOEXCEPT
           : type_(data_type_description)
@@ -99,7 +99,7 @@ namespace hpx { namespace util
           : type_(data_type_description)
         {
             data_.desc_ = hpx::actions::detail::get_action_name<Action>();
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
             desc_itt_ = hpx::actions::detail::get_action_name_itt<Action>();
 #endif
         }
@@ -115,7 +115,7 @@ namespace hpx { namespace util
             return data_.desc_;
         }
 
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
         util::itt::string_handle get_description_itt() const HPX_NOEXCEPT
         {
             HPX_ASSERT(type_ == data_type_description);
@@ -197,7 +197,7 @@ namespace hpx { namespace util
             return "<unknown>";
         }
 
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
         util::itt::string_handle get_description_itt() const HPX_NOEXCEPT
         {
             HPX_ASSERT(type_ == data_type_description);

diff --git a/src/runtime/parcelset/parcel.cpp b/src/runtime/parcelset/parcel.cpp
@@ -442,7 +442,7 @@ namespace hpx { namespace parcelset
         // continuation support, this is handled in the transfer action
         action_->load_schedule(ar, std::move(data_.dest_), lva, num_thread);
 
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
         static util::itt::event parcel_recv("recv_parcel");
         util::itt::event_tick(parcel_recv);
 #endif

diff --git a/src/runtime/parcelset/parcelhandler.cpp b/src/runtime/parcelset/parcelhandler.cpp
@@ -397,7 +397,7 @@ namespace hpx { namespace parcelset
             // invoke the original handler
             f(ec, p);
 
-#if defined(HPX_HAVE_ITTNOTIFY) && !defined(HPX_HAVE_APEX)
+#if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
             static util::itt::event parcel_send("send_parcel");
             util::itt::event_tick(parcel_send);
 #endif

diff --git a/src/util/runtime_configuration.cpp b/src/util/runtime_configuration.cpp
@@ -457,7 +457,7 @@ namespace hpx { namespace util
         pre_initialize_ini();
 
         // set global config options
-#ifdef HPX_HAVE_ITTNOTIFY
+#if HPX_HAVE_ITTNOTIFY != 0
         use_ittnotify_api = get_itt_notify_mode();
 #endif
         HPX_ASSERT(init_small_stack_size() >= HPX_SMALL_STACK_SIZE);
@@ -519,7 +519,7 @@ namespace hpx { namespace util
         post_initialize_ini(hpx_ini_file, cmdline_ini_defs);
 
         // set global config options
-#ifdef HPX_HAVE_ITTNOTIFY
+#if HPX_HAVE_ITTNOTIFY != 0
         use_ittnotify_api = get_itt_notify_mode();
 #endif
         HPX_ASSERT(init_small_stack_size() >= HPX_SMALL_STACK_SIZE);