Clean the code.

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

diff --git a/src/smpi/smpi_shared.cpp b/src/smpi/smpi_shared.cpp
index ee0687d..38883ba 100644 (file)
--- a/src/smpi/smpi_shared.cpp
+++ b/src/smpi/smpi_shared.cpp
@@ -224,7 +224,11 @@ 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';
+  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(!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;
@@ -245,7 +249,6 @@ 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);
-
   if(use_huge_page)
     mem = (void*)ALIGN_UP((uint64_t)allocated_ptr, HUGE_PAGE_SIZE);
   else
@@ -279,8 +282,10 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int
   int mmap_base_flag = MAP_FIXED | MAP_SHARED | MAP_POPULATE;
   int mmap_flag = mmap_base_flag;
   int huge_fd = use_huge_page ? smpi_shared_malloc_bogusfile_huge_page : smpi_shared_malloc_bogusfile;
+#ifdef MAP_HUGETLB
   if(use_huge_page)
     mmap_flag |= MAP_HUGETLB;
+#endif
 
   XBT_DEBUG("global shared allocation, begin mmap");