From e9dcc23b08f5e5cc47936451000e5a863c6f5055 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Tue, 13 Mar 2018 01:45:16 +0100 Subject: [PATCH] intel compilers detected some mistakes --- include/simgrid/forward.h | 2 +- src/instr/instr_config.cpp | 2 -- src/smpi/internals/smpi_shared.cpp | 12 ++++++------ src/xbt/dynar.cpp | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 772a50ab5e..8e83f4a421 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -152,6 +152,6 @@ typedef unsigned long long sg_size_t; */ typedef long long sg_offset_t; -typedef unsigned long aid_t; +typedef long aid_t; #endif /* SIMGRID_TYPES_H */ diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index bcccadcb36..be37b07a2d 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -55,7 +55,6 @@ static bool trace_basic; static bool trace_display_sizes = false; static bool trace_disable_link; static bool trace_disable_power; -static int trace_precision; static bool trace_configured = false; static bool trace_active = false; @@ -82,7 +81,6 @@ static void TRACE_getopts() trace_display_sizes = xbt_cfg_get_boolean(OPT_TRACING_DISPLAY_SIZES); trace_disable_link = xbt_cfg_get_boolean(OPT_TRACING_DISABLE_LINK); trace_disable_power = xbt_cfg_get_boolean(OPT_TRACING_DISABLE_POWER); - trace_precision = xbt_cfg_get_int(OPT_TRACING_PRECISION); } int TRACE_start() diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp index 9bf2045811..b8b50fd24e 100644 --- a/src/smpi/internals/smpi_shared.cpp +++ b/src/smpi/internals/smpi_shared.cpp @@ -218,7 +218,7 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int "to allow big allocations.\n", size >> 20); if(use_huge_page) - mem = (void*)ALIGN_UP((uint64_t)allocated_ptr, HUGE_PAGE_SIZE); + mem = (void*)ALIGN_UP((int64_t)allocated_ptr, HUGE_PAGE_SIZE); else mem = allocated_ptr; @@ -269,8 +269,8 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int if(i_block < nb_shared_blocks-1) xbt_assert(stop_offset < shared_block_offsets[2*i_block+2], "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); + size_t start_block_offset = ALIGN_UP((int64_t)start_offset, smpi_shared_malloc_blocksize); + size_t stop_block_offset = ALIGN_DOWN((int64_t)stop_offset, smpi_shared_malloc_blocksize); for (size_t offset = start_block_offset; offset < stop_block_offset; offset += smpi_shared_malloc_blocksize) { XBT_DEBUG("\t\tglobal shared allocation, mmap block offset %zx", offset); void* pos = (void*)((unsigned long)mem + offset); @@ -283,8 +283,8 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int "and that the directory you are passing is mounted correctly (mount /path/to/huge -t hugetlbfs -o rw,mode=0777).", strerror(errno)); } - size_t low_page_start_offset = ALIGN_UP(start_offset, PAGE_SIZE); - size_t low_page_stop_offset = start_block_offset < ALIGN_DOWN(stop_offset, PAGE_SIZE) ? start_block_offset : ALIGN_DOWN(stop_offset, PAGE_SIZE); + 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); 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); @@ -297,7 +297,7 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int } if(low_page_stop_offset <= stop_block_offset) { XBT_DEBUG("\t\tglobal shared allocation, mmap block stop"); - size_t high_page_stop_offset = stop_offset == size ? size : ALIGN_DOWN(stop_offset, PAGE_SIZE); + size_t high_page_stop_offset = stop_offset == size ? size : ALIGN_DOWN((int64_t)stop_offset, PAGE_SIZE); if(high_page_stop_offset > stop_block_offset) { void* pos = (void*)((unsigned long)mem + stop_block_offset); void* res = mmap(pos, high_page_stop_offset-stop_block_offset, PROT_READ | PROT_WRITE, mmap_base_flag, // not a full huge page diff --git a/src/xbt/dynar.cpp b/src/xbt/dynar.cpp index c6a637c834..2d1164545c 100644 --- a/src/xbt/dynar.cpp +++ b/src/xbt/dynar.cpp @@ -444,7 +444,7 @@ extern "C" unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void* const el } THROWF(not_found_error, 0, "Element %p not part of dynar %p", elem, dynar); - return -1; // Won't happen, just to please eclipse + return 0; // Won't happen, just to please eclipse } /** @brief Returns the position of the element in the dynar (or -1 if not found) -- 2.20.1