X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84a38727188f3a94505e5539f636ba241d73263d..7ac4abc35931448d0bbc5f3c1260320dfe4110c9:/src/smpi/smpi_shared.cpp

diff --git a/src/smpi/smpi_shared.cpp b/src/smpi/smpi_shared.cpp
index 32bdecd7ef..e5f24d6c42 100644
--- a/src/smpi/smpi_shared.cpp
+++ b/src/smpi/smpi_shared.cpp
@@ -38,7 +38,6 @@
 
 #include "private.h"
 #include "private.hpp"
-#include "smpi/smpi_shared_malloc.hpp"
 #include "xbt/dict.h"
 #include "xbt/ex.hpp"
 #include <errno.h>
@@ -87,7 +86,7 @@ public:
     return filename_length == that.filename_length && line == that.line &&
            std::memcmp(filename, that.filename, filename_length) == 0;
   }
-  bool operator!=(smpi_source_location const& that) const { return !(*this == that); }
+  bool operator!=(smpi_source_location const& that) const { return not(*this == that); }
 };
 }
 
@@ -224,14 +223,15 @@ static void *smpi_shared_malloc_local(size_t size, const char *file, int line)
 void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int nb_shared_blocks)
 {
   char *huge_page_mount_point = xbt_cfg_get_string("smpi/shared-malloc-hugepage");
-  const bool use_huge_page = huge_page_mount_point[0] != '\0';
-#ifndef MAP_HUGETLB
-    xbt_assert(!use_huge_page, "Huge pages are not available on your system.");
+  bool use_huge_page = huge_page_mount_point[0] != '\0';
+#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, *allocated_ptr;
   size_t allocated_size;
-#ifdef MAP_HUGETLB
   if(use_huge_page) {
     xbt_assert(smpi_shared_malloc_blocksize == HUGE_PAGE_SIZE, "the block size of shared malloc should be equal to the size of a huge page.");
     allocated_size = size + 2*smpi_shared_malloc_blocksize;
@@ -240,10 +240,6 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int
     xbt_assert(smpi_shared_malloc_blocksize % PAGE_SIZE == 0, "the block size of shared malloc should be a multiple of the page size.");
     allocated_size = size;
   }
-#else
-  xbt_assert(smpi_shared_malloc_blocksize % PAGE_SIZE == 0, "the block size of shared malloc should be a multiple of the page size.");
-  allocated_size = size;
-#endif
 
 
   /* First reserve memory area */
@@ -253,20 +249,20 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int
   xbt_assert(allocated_ptr != MAP_FAILED, "Failed to allocate %zuMiB of memory. Run \"sysctl vm.overcommit_memory=1\" as root "
                                 "to allow big allocations.\n",
              size >> 20);
-#ifdef MAP_HUGETLB
   if(use_huge_page)
     mem = (void*)ALIGN_UP((uint64_t)allocated_ptr, HUGE_PAGE_SIZE);
   else
     mem = allocated_ptr;
-#else
-  mem = allocated_ptr;
-#endif
 
   XBT_DEBUG("global shared allocation. Blocksize %lu", smpi_shared_malloc_blocksize);
   /* Create a fd to a new file on disk, make it smpi_shared_malloc_blocksize big, and unlink it.
    * It still exists in memory but not in the file system (thus it cannot be leaked). */
-  /* Create bogus file if not done already */
-#ifdef MAP_HUGETLB
+  /* Create bogus file if not done already
+   * We need two different bogusfiles:
+   *    smpi_shared_malloc_bogusfile_huge_page is used for calls to mmap *with* MAP_HUGETLB,
+   *    smpi_shared_malloc_bogusfile is used for calls to mmap *without* MAP_HUGETLB.
+   * We cannot use a same file for the two type of calls, since the first one needs to be
+   * opened in a hugetlbfs mount point whereas the second needs to be a "classical" file. */
   if(use_huge_page && smpi_shared_malloc_bogusfile_huge_page == -1) {
     const char *const array[] = {huge_page_mount_point, "simgrid-shmalloc-XXXXXX", nullptr};
     char *huge_page_filename = xbt_str_join_array(array, "/");
@@ -275,7 +271,6 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int
     unlink(huge_page_filename);
     xbt_free(huge_page_filename);
   }
-#endif
   if(smpi_shared_malloc_bogusfile == -1) {
     char *name                   = xbt_strdup("/tmp/simgrid-shmalloc-XXXXXX");
     smpi_shared_malloc_bogusfile = mkstemp(name);