#include "private.h"
#include "private.hpp"
-#include "smpi/smpi_shared_malloc.hpp"
#include "xbt/dict.h"
#include "xbt/ex.hpp"
#include <errno.h>
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); }
};
}
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(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;
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
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 */
+ /* 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) {
- char *array[] = {huge_page_mount_point, "simgrid-shmalloc-XXXXXX", nullptr};
+ const char *const array[] = {huge_page_mount_point, "simgrid-shmalloc-XXXXXX", nullptr};
char *huge_page_filename = xbt_str_join_array(array, "/");
smpi_shared_malloc_bogusfile_huge_page = mkstemp(huge_page_filename);
XBT_DEBUG("bogusfile_huge_page: %s\n", huge_page_filename);
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");
"stop_offset (%zu) should be lower than its successor start offset (%zu)", stop_offset, shared_block_offsets[2*i_block+2]);
size_t start_block_offset = ALIGN_UP(start_offset, smpi_shared_malloc_blocksize);
size_t stop_block_offset = ALIGN_DOWN(stop_offset, smpi_shared_malloc_blocksize);
- unsigned int i;
- for (int block_id=0, i = start_block_offset / smpi_shared_malloc_blocksize; i < stop_block_offset / smpi_shared_malloc_blocksize; block_id++, i++) {
+ for (unsigned block_id=0, i = start_block_offset / smpi_shared_malloc_blocksize; i < stop_block_offset / smpi_shared_malloc_blocksize; block_id++, i++) {
XBT_DEBUG("\t\tglobal shared allocation, mmap block offset %d", block_id);
void* pos = (void*)((unsigned long)mem + i * smpi_shared_malloc_blocksize);
void* res = mmap(pos, smpi_shared_malloc_blocksize, PROT_READ | PROT_WRITE, mmap_flag,
