Merge pull request #3024 from STEllAR-GROUP/inspect-fixes

Inspect fixes
STEllAR-GROUP · Nov 26, 2017 · b3dbbcb · b3dbbcb
2 parents 7efddcc + 6a37186
commit b3dbbcb
Show file tree

Hide file tree

Showing 29 changed files with 94 additions and 99 deletions.
diff --git a/cmake/templates/config_defines.hpp.in b/cmake/templates/config_defines.hpp.in
@@ -16,7 +16,8 @@
 #define HPX_PREFIX "@HPX_DEFINES_PREFIX@"
 #endif
 @hpx_config_defines@
-#if defined(HPX_HAVE_MAX_CPU_COUNT) && (HPX_HAVE_MAX_CPU_COUNT > 64) && !defined(HPX_HAVE_MORE_THAN_64_THREADS)
+#if defined(HPX_HAVE_MAX_CPU_COUNT) && (HPX_HAVE_MAX_CPU_COUNT > 64) &&       \
+    !defined(HPX_HAVE_MORE_THAN_64_THREADS)
 #define HPX_HAVE_MORE_THAN_64_THREADS
 #endif
 

diff --git a/cmake/templates/static_parcelports.hpp.in b/cmake/templates/static_parcelports.hpp.in
@@ -10,6 +10,8 @@
 
 #include <hpx/util/assert.hpp>
 
+#include <vector>
+
 @_parcelport_export@
 namespace hpx { namespace parcelset
 {

diff --git a/cmake/tests/cxx14_return_type_deduction.cpp b/cmake/tests/cxx14_return_type_deduction.cpp
@@ -5,7 +5,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ////////////////////////////////////////////////////////////////////////////////
 
-auto check(int a, int b)
+auto check1(int a, int b)
 {
     int c = a + b;
     return c;
@@ -24,7 +24,7 @@ int main()
 {
     int a = 10;
     int b = 20;
-    check(a, b);
+    check1(a, b);
     double c = check2(30.0);
 }
 
diff --git a/examples/quickstart/composable_guard.cpp b/examples/quickstart/composable_guard.cpp
@@ -57,7 +57,7 @@ void both() {
 
 int increments = 3000;
 
-void check() {
+void check_() {
     if(2*increments == i1 && 2*increments == i2) {
         std::cout << "Test passed" << std::endl;
     } else {
@@ -80,7 +80,7 @@ int hpx_main(boost::program_options::variables_map& vm) {
         run_guarded(*l2,incr2);
     }
 
-    run_guarded(guards,check);
+    run_guarded(guards,check_);
     return hpx::finalize();
 }
 

diff --git a/hpx/lcos/local/composable_guard.hpp b/hpx/lcos/local/composable_guard.hpp
@@ -109,16 +109,16 @@ namespace hpx { namespace lcos { namespace local
             {}
 
             ~debug_object() {
-                check();
+                check_();
                 magic = ~debug_magic;
             }
 
-            void check() {
+            void check_() {
                 HPX_ASSERT(magic != ~debug_magic);
                 HPX_ASSERT(magic == debug_magic);
             }
 #else
-            void check() {}
+            void check_() {}
 #endif
         };
 

diff --git a/hpx/plugins/parcelport/mpi/sender_connection.hpp b/hpx/plugins/parcelport/mpi/sender_connection.hpp
@@ -90,7 +90,7 @@ namespace hpx { namespace parcelset { namespace policies { namespace mpi
             return there_;
         }
 
-        void verify(parcelset::locality const & parcel_locality_id) const
+        void verify_(parcelset::locality const & parcel_locality_id) const
         {
         }
 

diff --git a/hpx/plugins/parcelport/tcp/sender.hpp b/hpx/plugins/parcelport/tcp/sender.hpp
@@ -74,7 +74,7 @@ namespace hpx { namespace parcelset { namespace policies { namespace tcp
             return there_;
         }
 
-        void verify(parcelset::locality const & parcel_locality_id) const
+        void verify_(parcelset::locality const & parcel_locality_id) const
         {
 #if defined(HPX_DEBUG)
             boost::system::error_code ec;

diff --git a/hpx/runtime/parcelset/parcelport_impl.hpp b/hpx/runtime/parcelset/parcelport_impl.hpp
@@ -883,7 +883,7 @@ namespace hpx { namespace parcelset
 #if defined(HPX_DEBUG)
             // verify the connection points to the right destination
 //            HPX_ASSERT(parcel_locality_id == sender_connection->destination());
-            sender_connection->verify(parcel_locality_id);
+            sender_connection->verify_(parcel_locality_id);
 #endif
             // encode the parcels
             std::size_t num_parcels = encode_parcels(*this, &parcels[0],

diff --git a/hpx/runtime/threads/coroutines/detail/context_posix.hpp b/hpx/runtime/threads/coroutines/detail/context_posix.hpp
@@ -69,7 +69,7 @@
 namespace hpx { namespace threads { namespace coroutines { namespace detail {
 namespace posix { namespace pth
 {
-    inline int check(int rc)
+    inline int check_(int rc)
     {
         // The makecontext() functions return zero for success, nonzero for
         // error. The Pth library returns TRUE for success, FALSE for error,
@@ -83,16 +83,17 @@ namespace posix { namespace pth
 #define HPX_COROUTINE_POSIX_IMPL "Pth implementation"
 #define HPX_COROUTINE_DECLARE_CONTEXT(name) pth_uctx_t name
 #define HPX_COROUTINE_CREATE_CONTEXT(ctx)                                     \
-    hpx::threads::coroutines::detail::posix::pth::check(pth_uctx_create(&(ctx)))
+    hpx::threads::coroutines::detail::posix::pth::check_(pth_uctx_create(&(ctx)))
 #define HPX_COROUTINE_MAKE_CONTEXT(ctx, stack, size, startfunc, startarg, exitto) \
     /* const sigset_t* sigmask = nullptr: we don't expect per-context signal masks */ \
-    hpx::threads::coroutines::detail::posix::pth::check(                      \
-        pth_uctx_make(*(ctx), static_cast<char*>(stack), (size), nullptr,        \
+    hpx::threads::coroutines::detail::posix::pth::check_(                   \
+        pth_uctx_make(*(ctx), static_cast<char*>(stack), (size), nullptr,     \
         (startfunc), (startarg), (exitto)))
 #define HPX_COROUTINE_SWAP_CONTEXT(from, to)                                  \
-    hpx::threads::coroutines::detail::posix::pth::check(pth_uctx_switch(*(from), *(to)))
+    hpx::threads::coroutines::detail::posix::pth::check_(                   \
+        pth_uctx_switch(*(from), *(to)))                                      \
 #define HPX_COROUTINE_DESTROY_CONTEXT(ctx)                                    \
-    hpx::threads::coroutines::detail::posix::pth::check(pth_uctx_destroy(ctx))
+    hpx::threads::coroutines::detail::posix::pth::check_(pth_uctx_destroy(ctx))
 
 #else // generic Posix platform (e.g. OS X >= 10.5)
 

diff --git a/hpx/util/lightweight_test.hpp b/hpx/util/lightweight_test.hpp
@@ -64,7 +64,7 @@ struct fixture
     std::size_t get(counter_type c) const;
 
     template <typename T>
-    bool check(char const* file, int line, char const* function,
+    bool check_(char const* file, int line, char const* function,
                counter_type c, T const& t, char const* msg)
     {
         if (!t)
@@ -209,14 +209,14 @@ inline int report_errors(std::ostream& stream = std::cerr)
 }} // hpx::util
 
 #define HPX_TEST(expr)                                                        \
-    ::hpx::util::detail::global_fixture.check                                 \
+    ::hpx::util::detail::global_fixture.check_                                \
         (__FILE__, __LINE__, BOOST_CURRENT_FUNCTION,                          \
          ::hpx::util::counter_test,                                           \
          expr, "test '" HPX_PP_STRINGIZE(expr) "'")                           \
     /***/
 
 #define HPX_TEST_MSG(expr, msg)                                               \
-    ::hpx::util::detail::global_fixture.check                                 \
+    ::hpx::util::detail::global_fixture.check_                                \
         (__FILE__, __LINE__, BOOST_CURRENT_FUNCTION,                          \
          ::hpx::util::counter_test,                                           \
          expr, msg)                                                           \
@@ -278,14 +278,14 @@ inline int report_errors(std::ostream& stream = std::cerr)
     /***/
 
 #define HPX_SANITY(expr)                                                      \
-    ::hpx::util::detail::global_fixture.check                                 \
+    ::hpx::util::detail::global_fixture.check_                                \
         (__FILE__, __LINE__, BOOST_CURRENT_FUNCTION,                          \
          ::hpx::util::counter_sanity,                                         \
          expr, "sanity check '" HPX_PP_STRINGIZE(expr) "'")                   \
     /***/
 
 #define HPX_SANITY_MSG(expr, msg)                                             \
-    ::hpx::util::detail::global_fixture.check                                 \
+    ::hpx::util::detail::global_fixture.check_                                \
         (__FILE__, __LINE__, BOOST_CURRENT_FUNCTION,                          \
          ::hpx::util::counter_sanity,                                         \
          expr, msg)                                                           \

diff --git a/plugins/parcelport/CMakeLists.txt b/plugins/parcelport/CMakeLists.txt
@@ -106,7 +106,9 @@ macro(add_parcelport_modules)
     set(_parcelport_init)
     foreach(parcelport ${HPX_STATIC_PARCELPORT_PLUGINS})
       set(_parcelport_export
-        "${_parcelport_export}HPX_EXPORT hpx::plugins::parcelport_factory_base *parcelport_${parcelport}_factory_init(std::vector<hpx::plugins::parcelport_factory_base *>& factories);\n")
+        "${_parcelport_export}HPX_EXPORT hpx::plugins::parcelport_factory_base *parcelport_${parcelport}_factory_init(\n")
+      set(_parcelport_export
+        "${_parcelport_export}    std::vector<hpx::plugins::parcelport_factory_base *>& factories);\n")
       set(_parcelport_init
         "${_parcelport_init}        parcelport_${parcelport}_factory_init(factories);\n")
     endforeach()

diff --git a/plugins/parcelport/libfabric/sender.hpp b/plugins/parcelport/libfabric/sender.hpp
@@ -95,7 +95,7 @@ namespace libfabric
 
         // --------------------------------------------------------------------
         // @TODO: unused, but required by the parcelport interface
-        void verify(parcelset::locality const & parcel_locality_id) const {}
+        void verify_(parcelset::locality const & parcel_locality_id) const {}
 
         // --------------------------------------------------------------------
         // The main message send routine : package the header, send it

diff --git a/plugins/parcelport/verbs/sender_connection.hpp b/plugins/parcelport/verbs/sender_connection.hpp
@@ -62,7 +62,7 @@ namespace verbs
             return snd_buffer_type(snd_data_type(chunk_pool_), chunk_pool_);
         }
 
-        void verify(parcelset::locality const & parcel_locality_id) const
+        void verify_(parcelset::locality const & parcel_locality_id) const
         {
         }
 

diff --git a/src/lcos/local/composable_guard.cpp b/src/lcos/local/composable_guard.cpp
@@ -43,7 +43,7 @@ namespace hpx { namespace lcos { namespace local
         {
             if (task == nullptr)
                 return;
-            task->check();
+            task->check_();
             delete task;
         }
     }
@@ -52,7 +52,7 @@ namespace hpx { namespace lcos { namespace local
     {
         if (!sorted) {
             std::sort(guards.begin(), guards.end());
-            (*guards.begin())->check();
+            (*guards.begin())->check_();
             sorted = true;
         }
     }
@@ -88,10 +88,10 @@ namespace hpx { namespace lcos { namespace local
     static void run_guarded(guard& g, detail::guard_task* task)
     {
         HPX_ASSERT(task != nullptr);
-        task->check();
+        task->check_();
         detail::guard_task* prev = g.task.exchange(task);
         if (prev != nullptr) {
-            prev->check();
+            prev->check_();
             detail::guard_task* zero = nullptr;
             if (!prev->next.compare_exchange_strong(zero, task)) {
                 run_composable(task);
@@ -115,7 +115,7 @@ namespace hpx { namespace lcos { namespace local
             // continue processing.
             for (std::size_t k=0; k<n; k++) {
                 detail::guard_task* lt = sd->stages[k];
-                lt->check();
+                lt->check_();
                 HPX_ASSERT(!lt->single_guard);
                 zero = nullptr;
                 if (!lt->next.compare_exchange_strong(zero, lt)) {
@@ -151,7 +151,7 @@ namespace hpx { namespace lcos { namespace local
             return;
         } else if (n == 1) {
             run_guarded(*guards.guards[0], std::move(task));
-            guards.check();
+            guards.check_();
             return;
         }
         guards.sort();
@@ -185,7 +185,7 @@ namespace hpx { namespace lcos { namespace local
             // the next field, we halt processing on items queued
             // to this guard.
             HPX_ASSERT(task != nullptr);
-            task->check();
+            task->check_();
             if (!task->next.compare_exchange_strong(zero, task)) {
                 HPX_ASSERT(zero != nullptr);
                 run_composable(zero);
@@ -202,7 +202,7 @@ namespace hpx { namespace lcos { namespace local
         if(task == empty)
             return;
         HPX_ASSERT(task != nullptr);
-        task->check();
+        task->check_();
         if (task->single_guard) {
             run_composable_cleanup rcc(task);
             task->run();

diff --git a/tests/performance/local/foreach_scaling.cpp b/tests/performance/local/foreach_scaling.cpp
@@ -149,7 +149,7 @@ int hpx_main(boost::program_options::variables_map& vm)
     chunk_size = vm["chunk_size"].as<int>();
     num_overlapping_loops = vm["overlapping_loops"].as<int>();
 
-    //verify that input is within domain of program
+    // verify that input is within domain of program
     if(test_count == 0 || test_count < 0) {
         hpx::cout << "test_count cannot be zero or negative...\n" << hpx::flush;
     } else if (delay < 0) {

diff --git a/tests/regressions/performance_counters/papi_counters_active_interface.cpp b/tests/regressions/performance_counters/papi_counters_active_interface.cpp
@@ -58,7 +58,7 @@ int hpx_main(boost::program_options::variables_map&)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int check(int fd)
+int check_(int fd)
 {
     std::string out;
     std::vector<double> cnt;
@@ -140,7 +140,7 @@ int main(int argc, char* argv[])
     hpx::start(argc+1, opt);
 
     // Collect and process the output.
-    int rc = check(pipefd[0]);
+    int rc = check_(pipefd[0]);
 
     hpx::stop();
     return rc;

diff --git a/tests/unit/lcos/run_guarded.cpp b/tests/unit/lcos/run_guarded.cpp
@@ -45,7 +45,7 @@ void both() {
 int increments = 3000;
 
 
-void check()
+void check_()
 {
     HPX_TEST(2*increments == i1 && 2*increments == i2);
 }
@@ -65,7 +65,7 @@ int hpx_main(boost::program_options::variables_map& vm) {
         run_guarded(*l2,incr2);
     }
 
-    run_guarded(guards, &::check);
+    run_guarded(guards, &::check_);
     return hpx::finalize();
 }
 

diff --git a/tests/unit/parallel/algorithms/sort.cpp b/tests/unit/parallel/algorithms/sort.cpp
@@ -35,7 +35,7 @@ void sort_benchmark()
         hpx::parallel::sort(execution::par, c.begin(), c.end());
         double elapsed = t.elapsed();
 
-        bool is_sorted = (verify(c, std::less<double>(), elapsed, true)!=0);
+        bool is_sorted = (verify_(c, std::less<double>(), elapsed, true)!=0);
         HPX_TEST(is_sorted);
         if (is_sorted) {
             std::cout << "<DartMeasurement name=\"SortDoublesTime\" \n"