Change xbt_cfg_get_bool -> simgrid::config::get_config<bool>.

[simgrid.git] / src / smpi / internals / smpi_shared.cpp

diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp
index b4f18eb..bc42b78 100644 (file)
--- a/src/smpi/internals/smpi_shared.cpp
+++ b/src/smpi/internals/smpi_shared.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2009-2017. The SimGrid Team. All rights reserved.    */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -37,6 +37,8 @@
 #include <cstring>
 
 #include "private.hpp"
+#include "xbt/config.hpp"
+
 #include <cerrno>
 
 #include <sys/types.h>
@@ -196,7 +198,6 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int
 #ifndef MAP_HUGETLB /* If the system header don't define that mmap flag */
   xbt_assert(not use_huge_page,
              "Huge pages are not available on your system, you cannot use the smpi/shared-malloc-hugepage option.");
-  use_huge_page = 0;
 #endif
   smpi_shared_malloc_blocksize = static_cast<unsigned long>(xbt_cfg_get_double("smpi/shared-malloc-blocksize"));
   void* mem;
@@ -375,18 +376,22 @@ int smpi_is_shared(void* ptr, std::vector<std::pair<size_t, size_t>> &private_bl
   }
 }
 
-std::vector<std::pair<size_t, size_t>> shift_and_frame_private_blocks(const std::vector<std::pair<size_t, size_t>> vec, size_t offset, size_t buff_size) {
-    std::vector<std::pair<size_t, size_t>> result;
-    for (auto const& block : vec) {
-      auto new_block = std::make_pair(std::min(std::max((size_t)0, block.first - offset), buff_size),
-                                      std::min(std::max((size_t)0, block.second - offset), buff_size));
-      if (new_block.second > 0 && new_block.first < buff_size)
-        result.push_back(new_block);
-    }
-    return result;
+std::vector<std::pair<size_t, size_t>> shift_and_frame_private_blocks(const std::vector<std::pair<size_t, size_t>>& vec,
+                                                                      size_t offset, size_t buff_size)
+{
+  std::vector<std::pair<size_t, size_t>> result;
+  for (auto const& block : vec) {
+    auto new_block = std::make_pair(std::min(std::max((size_t)0, block.first - offset), buff_size),
+                                    std::min(std::max((size_t)0, block.second - offset), buff_size));
+    if (new_block.second > 0 && new_block.first < buff_size)
+      result.push_back(new_block);
+  }
+  return result;
 }
 
-std::vector<std::pair<size_t, size_t>> merge_private_blocks(std::vector<std::pair<size_t, size_t>> src, std::vector<std::pair<size_t, size_t>> dst) {
+std::vector<std::pair<size_t, size_t>> merge_private_blocks(const std::vector<std::pair<size_t, size_t>>& src,
+                                                            const std::vector<std::pair<size_t, size_t>>& dst)
+{
   std::vector<std::pair<size_t, size_t>> result;
   unsigned i_src = 0;
   unsigned i_dst = 0;