Merge remote-tracking branch 'remotes/STEllAR-GROUP/master' into 80_l…

…ine_limit
STEllAR-GROUP · Aug 17, 2015 · ad92958 · ad92958
2 parents 5f33af7 + 0dee1c0
commit ad92958
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -191,8 +191,21 @@ hpx_option(HPX_WITH_COMPILE_ONLY_TESTS BOOL
   "Create build system support for compile time only HPX tests (default ON)"
   ON CATEGORY "Build Targets")
 
+# Enable IO-counters on linux systems only
+set(HPX_WITH_IO_COUNTERS_DEFAULT OFF)
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+  set(HPX_WITH_IO_COUNTERS_DEFAULT ON)
+endif()
+
+hpx_option(HPX_WITH_IO_COUNTERS BOOL
+  "Build HPX runtime (default: ${HPX_WITH_IO_COUNTERS_DEFAULT})"
+  ${HPX_WITH_IO_COUNTERS_DEFAULT} ADVANCED CATEGORY "Build Targets")
+if(HPX_WITH_IO_COUNTERS)
+  hpx_add_config_define(HPX_HAVE_IO_COUNTERS)
+endif()
+
 set(HPX_FULL_RPATH_DEFAULT ON)
-if(APPLE)
+if(APPLE OR MSVC)
   set(HPX_FULL_RPATH_DEFAULT OFF)
 endif()
 hpx_option(HPX_WITH_FULL_RPATH BOOL

diff --git a/docs/manual/build_system/cmake_variables.qbk b/docs/manual/build_system/cmake_variables.qbk
@@ -35,6 +35,7 @@ The options are split into these categories:
 * [link build_system.cmake_variables.HPX_WITH_COMPRESSION_BZIP2 HPX_WITH_COMPRESSION_BZIP2]
 * [link build_system.cmake_variables.HPX_WITH_COMPRESSION_SNAPPY HPX_WITH_COMPRESSION_SNAPPY]
 * [link build_system.cmake_variables.HPX_WITH_COMPRESSION_ZLIB HPX_WITH_COMPRESSION_ZLIB]
+* [link build_system.cmake_variables.HPX_WITH_FPGA_QUEUES HPX_WITH_FPGA_QUEUES]
 * [link build_system.cmake_variables.HPX_WITH_FULL_RPATH HPX_WITH_FULL_RPATH]
 * [link build_system.cmake_variables.HPX_WITH_GCC_VERSION_CHECK HPX_WITH_GCC_VERSION_CHECK]
 * [link build_system.cmake_variables.HPX_WITH_GENERIC_CONTEXT_COROUTINES HPX_WITH_GENERIC_CONTEXT_COROUTINES]
@@ -57,6 +58,7 @@ The options are split into these categories:
         [[[#build_system.cmake_variables.HPX_WITH_COMPRESSION_BZIP2] `HPX_WITH_COMPRESSION_BZIP2:BOOL`][Enable bzip2 compression for parcel data (default: OFF).]]
         [[[#build_system.cmake_variables.HPX_WITH_COMPRESSION_SNAPPY] `HPX_WITH_COMPRESSION_SNAPPY:BOOL`][Enable snappy compression for parcel data (default: OFF).]]
         [[[#build_system.cmake_variables.HPX_WITH_COMPRESSION_ZLIB] `HPX_WITH_COMPRESSION_ZLIB:BOOL`][Enable zlib compression for parcel data (default: OFF).]]
+        [[[#build_system.cmake_variables.HPX_WITH_FPGA_QUEUES] `HPX_WITH_FPGA_QUEUES:BOOL`][Enable special FPGA based queues and schedulers (default: OFF)]]
         [[[#build_system.cmake_variables.HPX_WITH_FULL_RPATH] `HPX_WITH_FULL_RPATH:BOOL`][Build and link HPX libraries and executables with full RPATHs (default: ON)]]
         [[[#build_system.cmake_variables.HPX_WITH_GCC_VERSION_CHECK] `HPX_WITH_GCC_VERSION_CHECK:BOOL`][Don't ignore version reported by gcc (default: ON)]]
         [[[#build_system.cmake_variables.HPX_WITH_GENERIC_CONTEXT_COROUTINES] `HPX_WITH_GENERIC_CONTEXT_COROUTINES:BOOL`][Use Boost.Context as the underlying coroutines context switch implementation.]]
@@ -76,6 +78,7 @@ The options are split into these categories:
 * [link build_system.cmake_variables.HPX_WITH_DOCUMENTATION HPX_WITH_DOCUMENTATION]
 * [link build_system.cmake_variables.HPX_WITH_DOCUMENTATION_SINGLEPAGE HPX_WITH_DOCUMENTATION_SINGLEPAGE]
 * [link build_system.cmake_variables.HPX_WITH_EXAMPLES HPX_WITH_EXAMPLES]
+* [link build_system.cmake_variables.HPX_WITH_IO_COUNTERS HPX_WITH_IO_COUNTERS]
 * [link build_system.cmake_variables.HPX_WITH_PSEUDO_DEPENDENCIES HPX_WITH_PSEUDO_DEPENDENCIES]
 * [link build_system.cmake_variables.HPX_WITH_RUNTIME HPX_WITH_RUNTIME]
 * [link build_system.cmake_variables.HPX_WITH_TESTS HPX_WITH_TESTS]
@@ -92,6 +95,7 @@ The options are split into these categories:
         [[[#build_system.cmake_variables.HPX_WITH_DOCUMENTATION] `HPX_WITH_DOCUMENTATION:BOOL`][Build the HPX documentation (default OFF).]]
         [[[#build_system.cmake_variables.HPX_WITH_DOCUMENTATION_SINGLEPAGE] `HPX_WITH_DOCUMENTATION_SINGLEPAGE:BOOL`][The HPX documentation should be build as a single page HTML (default OFF).]]
         [[[#build_system.cmake_variables.HPX_WITH_EXAMPLES] `HPX_WITH_EXAMPLES:BOOL`][Build the HPX examples (default ON)]]
+        [[[#build_system.cmake_variables.HPX_WITH_IO_COUNTERS] `HPX_WITH_IO_COUNTERS:BOOL`][Build HPX runtime (default: OFF)]]
         [[[#build_system.cmake_variables.HPX_WITH_PSEUDO_DEPENDENCIES] `HPX_WITH_PSEUDO_DEPENDENCIES:BOOL`][Force creating pseudo targets and pseudo dependencies (default OFF).]]
         [[[#build_system.cmake_variables.HPX_WITH_RUNTIME] `HPX_WITH_RUNTIME:BOOL`][Build HPX runtime (default: ON)]]
         [[[#build_system.cmake_variables.HPX_WITH_TESTS] `HPX_WITH_TESTS:BOOL`][Build the HPX tests (default ON)]]

diff --git a/hpx/parallel/executors/parallel_executor.hpp b/hpx/parallel/executors/parallel_executor.hpp
@@ -66,7 +66,7 @@ namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v3)
         template <typename Archive>
         void serialize(Archive & ar, const unsigned int version)
         {
-            ar & static_cast<boost::uint32_t>(l_);
+            ar & l_;
         }
         /// \endcond
 

diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt
@@ -8,13 +8,18 @@
 set(subdirs
     component_storage
     containers
-    io_counters
     iostreams
     memory
     papi_counters
     security
    )
 
+if(HPX_WITH_IO_COUNTERS)
+  set(subdirs ${subdirs}
+      io_counters
+     )
+endif()
+
 add_hpx_pseudo_target(components)
 
 foreach(subdir ${subdirs})

diff --git a/src/components/io_counters/CMakeLists.txt b/src/components/io_counters/CMakeLists.txt
@@ -8,7 +8,7 @@ set(root "${PROJECT_SOURCE_DIR}/hpx/components/io_counters")
 
 if(HPX_WITH_DEFAULT_TARGETS)
   add_hpx_component(io_counters
-    FOLDER "Core/Components"
+    FOLDER "Core/Components/Counters"
     HEADER_ROOT ${root}
     AUTOGLOB
     PLUGIN)

diff --git a/src/components/io_counters/io_counters.cpp b/src/components/io_counters/io_counters.cpp
@@ -96,49 +96,49 @@ namespace hpx { namespace performance_counters { namespace io
                 boost::str(boost::format("failed to parse " PROC_IO_PATH) % pid));
     }
 
-    uint64_t get_pio_riss(bool)
+    boost::uint64_t get_pio_riss(bool)
     {
         proc_io pio;
         parse_proc_io(pio);
         return pio.riss;
     }
 
-    uint64_t get_pio_wiss(bool)
+    boost::uint64_t get_pio_wiss(bool)
     {
         proc_io pio;
         parse_proc_io(pio);
         return pio.wiss;
     }
 
-    uint64_t get_pio_rsysc(bool)
+    boost::uint64_t get_pio_rsysc(bool)
     {
         proc_io pio;
         parse_proc_io(pio);
         return pio.rsysc;
     }
 
-    uint64_t get_pio_wsysc(bool)
+    boost::uint64_t get_pio_wsysc(bool)
     {
         proc_io pio;
         parse_proc_io(pio);
         return pio.wsysc;
     }
 
-    uint64_t get_pio_rstor(bool)
+    boost::uint64_t get_pio_rstor(bool)
     {
         proc_io pio;
         parse_proc_io(pio);
         return pio.rstor;
     }
 
-    uint64_t get_pio_wstor(bool)
+    boost::uint64_t get_pio_wstor(bool)
     {
         proc_io pio;
         parse_proc_io(pio);
         return pio.wstor;
     }
 
-    uint64_t get_pio_wcanc(bool)
+    boost::uint64_t get_pio_wcanc(bool)
     {
         proc_io pio;
         parse_proc_io(pio);

diff --git a/src/components/memory/CMakeLists.txt b/src/components/memory/CMakeLists.txt
@@ -8,14 +8,12 @@ set(root "${PROJECT_SOURCE_DIR}/hpx/components/memory")
 
 if(HPX_WITH_DEFAULT_TARGETS)
   add_hpx_component(memory
-    FOLDER "Core/Components"
+    FOLDER "Core/Components/Counters"
     HEADER_ROOT ${root}
     AUTOGLOB
     PLUGIN)
 endif()
 
-add_hpx_pseudo_dependencies(components.memory
-                            memory_component)
-add_hpx_pseudo_dependencies(core
-                          components.memory)
+add_hpx_pseudo_dependencies(components.memory memory_component)
+add_hpx_pseudo_dependencies(core components.memory)
 
diff --git a/tests/unit/serialization/serialization_list.cpp b/tests/unit/serialization/serialization_list.cpp
@@ -169,23 +169,37 @@ void test_fp(T min, T max)
 int main()
 {
     test_bool();
-    test<char>((std::numeric_limits<char>::min)(), (std::numeric_limits<char>::max)());
-    test<int>((std::numeric_limits<int>::min)(), (std::numeric_limits<int>::min)() + 100);
-    test<int>((std::numeric_limits<int>::max)() - 100, (std::numeric_limits<int>::max)());
+    test<char>((std::numeric_limits<char>::min)(),
+        (std::numeric_limits<char>::max)());
+    test<int>((std::numeric_limits<int>::min)(),
+        (std::numeric_limits<int>::min)() + 100);
+    test<int>((std::numeric_limits<int>::max)() - 100,
+        (std::numeric_limits<int>::max)());
     test<int>(-100, 100);
-    test<unsigned>((std::numeric_limits<unsigned>::min)(), (std::numeric_limits<unsigned>::min)() + 100);
-    test<unsigned>((std::numeric_limits<unsigned>::max)() - 100, (std::numeric_limits<unsigned>::max)());
-    test<long>((std::numeric_limits<long>::min)(), (std::numeric_limits<long>::min)() + 100);
-    test<long>((std::numeric_limits<long>::max)() - 100, (std::numeric_limits<long>::max)());
+    test<unsigned>((std::numeric_limits<unsigned>::min)(),
+        (std::numeric_limits<unsigned>::min)() + 100);
+    test<unsigned>((std::numeric_limits<unsigned>::max)() - 100,
+        (std::numeric_limits<unsigned>::max)());
+    test<long>((std::numeric_limits<long>::min)(),
+        (std::numeric_limits<long>::min)() + 100);
+    test<long>((std::numeric_limits<long>::max)() - 100,
+        (std::numeric_limits<long>::max)());
     test<long>(-100, 100);
-    test<unsigned long>((std::numeric_limits<unsigned long>::min)(), (std::numeric_limits<unsigned long>::min)() + 100);
-    test<unsigned long>((std::numeric_limits<unsigned long>::max)() - 100, (std::numeric_limits<unsigned long>::max)());
-    test_fp<float>((std::numeric_limits<float>::min)(), (std::numeric_limits<float>::min)() + 100);
-    test_fp<float>((std::numeric_limits<float>::max)() - 100, (std::numeric_limits<float>::max)()); //it's incorrect
-    // because floatmax() - 100 causes cancellations error, digits are not affected
+    test<unsigned long>((std::numeric_limits<unsigned long>::min)(),
+        (std::numeric_limits<unsigned long>::min)() + 100);
+    test<unsigned long>((std::numeric_limits<unsigned long>::max)() - 100,
+        (std::numeric_limits<unsigned long>::max)());
+    test_fp<float>((std::numeric_limits<float>::min)(),
+        (std::numeric_limits<float>::min)() + 100);
+    test_fp<float>((std::numeric_limits<float>::max)() - 100,
+        (std::numeric_limits<float>::max)()); //it's incorrect
+    // because floatmax() - 100 causes cancellations error,
+    // digits are not affected
     test_fp<float>(-100, 100);
-    test<double>((std::numeric_limits<double>::min)(), (std::numeric_limits<double>::min)() + 100);
-    test<double>((std::numeric_limits<double>::max)() - 100, (std::numeric_limits<double>::max)()); //it's the same
+    test<double>((std::numeric_limits<double>::min)(),
+        (std::numeric_limits<double>::min)() + 100);
+    test<double>((std::numeric_limits<double>::max)() - 100,
+        (std::numeric_limits<double>::max)()); //it's the same
     test<double>(-100, 100);
 
     return hpx::util::report_errors();