X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9dcc23b08f5e5cc47936451000e5a863c6f5055..2d37e348a09783cda723c7019640ee69de168324:/src/smpi/internals/smpi_shared.cpp diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp index b8b50fd24e..f4ccaaadd1 100644 --- 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-2019. 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 #include "private.hpp" +#include "xbt/config.hpp" + #include #include @@ -151,7 +153,7 @@ static void *smpi_shared_malloc_local(size_t size, const char *file, int line) if (res.second) { // The new element was inserted. // Generate a shared memory name from the address of the shared_data: - char shmname[32]; // cannot be longer than PSHMNAMLEN = 31 on Mac OS X (shm_open raises ENAMETOOLONG otherwise) + char shmname[32]; // cannot be longer than PSHMNAMLEN = 31 on macOS (shm_open raises ENAMETOOLONG otherwise) snprintf(shmname, 31, "/shmalloc%p", &*data); int fd = shm_open(shmname, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (fd < 0) { @@ -191,14 +193,14 @@ 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) { - std::string huge_page_mount_point = xbt_cfg_get_string("smpi/shared-malloc-hugepage"); + std::string huge_page_mount_point = simgrid::config::get_value("smpi/shared-malloc-hugepage"); bool use_huge_page = not huge_page_mount_point.empty(); #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(xbt_cfg_get_double("smpi/shared-malloc-blocksize")); + smpi_shared_malloc_blocksize = + static_cast(simgrid::config::get_value("smpi/shared-malloc-blocksize")); void* mem; size_t allocated_size; if(use_huge_page) { @@ -284,7 +286,7 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int strerror(errno)); } size_t low_page_start_offset = ALIGN_UP((int64_t)start_offset, PAGE_SIZE); - size_t low_page_stop_offset = start_block_offset < ALIGN_DOWN((int64_t)stop_offset, PAGE_SIZE) ? start_block_offset : ALIGN_DOWN((int64_t)stop_offset, PAGE_SIZE); + size_t low_page_stop_offset = (int64_t)start_block_offset < ALIGN_DOWN((int64_t)stop_offset, PAGE_SIZE) ? start_block_offset : ALIGN_DOWN((int64_t)stop_offset, (int64_t)PAGE_SIZE); if(low_page_start_offset < low_page_stop_offset) { XBT_DEBUG("\t\tglobal shared allocation, mmap block start"); void* pos = (void*)((unsigned long)mem + low_page_start_offset); @@ -338,9 +340,9 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int } void *smpi_shared_malloc(size_t size, const char *file, int line) { - if (size > 0 && smpi_cfg_shared_malloc == shmalloc_local) { + if (size > 0 && smpi_cfg_shared_malloc == SharedMallocType::LOCAL) { return smpi_shared_malloc_local(size, file, line); - } else if (smpi_cfg_shared_malloc == shmalloc_global) { + } else if (smpi_cfg_shared_malloc == SharedMallocType::GLOBAL) { int nb_shared_blocks = 1; size_t shared_block_offsets[2] = {0, size}; return smpi_shared_malloc_partial(size, shared_block_offsets, nb_shared_blocks); @@ -353,7 +355,7 @@ int smpi_is_shared(void* ptr, std::vector> &private_bl private_blocks.clear(); // being paranoid if (allocs_metadata.empty()) return 0; - if ( smpi_cfg_shared_malloc == shmalloc_local || smpi_cfg_shared_malloc == shmalloc_global) { + if (smpi_cfg_shared_malloc == SharedMallocType::LOCAL || smpi_cfg_shared_malloc == SharedMallocType::GLOBAL) { auto low = allocs_metadata.lower_bound(ptr); if (low != allocs_metadata.end() && low->first == ptr) { private_blocks = low->second.private_blocks; @@ -375,18 +377,22 @@ int smpi_is_shared(void* ptr, std::vector> &private_bl } } -std::vector> shift_and_frame_private_blocks(const std::vector> vec, size_t offset, size_t buff_size) { - std::vector> 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> shift_and_frame_private_blocks(const std::vector>& vec, + size_t offset, size_t buff_size) +{ + std::vector> 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> merge_private_blocks(std::vector> src, std::vector> dst) { +std::vector> merge_private_blocks(const std::vector>& src, + const std::vector>& dst) +{ std::vector> result; unsigned i_src = 0; unsigned i_dst = 0; @@ -413,7 +419,7 @@ std::vector> merge_private_blocks(std::vectorcount); } - } else if (smpi_cfg_shared_malloc == shmalloc_global) { + } else if (smpi_cfg_shared_malloc == SharedMallocType::GLOBAL) { auto meta = allocs_metadata.find(ptr); if (meta != allocs_metadata.end()){ meta->second.data->second.count--;