From e02193cd208251f5023c70c62dacbbc8c16ed2d5 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sat, 4 Jul 2020 22:29:03 +0200 Subject: [PATCH] [sonar] Make cast explicit. --- src/xbt/mmalloc/mmalloc.c | 2 +- src/xbt/xbt_os_time.c | 10 +++++----- .../macro-partial-shared-communication.c | 16 ++++++++-------- .../macro-partial-shared/macro-partial-shared.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/xbt/mmalloc/mmalloc.c b/src/xbt/mmalloc/mmalloc.c index d9a44efb87..4eb0133213 100644 --- a/src/xbt/mmalloc/mmalloc.c +++ b/src/xbt/mmalloc/mmalloc.c @@ -250,7 +250,7 @@ void *mmalloc_no_memset(xbt_mheap_t mdp, size_t size) result = mmalloc(mdp, BLOCKSIZE); // does not return NULL block = BLOCK(result); - mdp->heapinfo[block].type = log; + mdp->heapinfo[block].type = (int)log; /* Link all fragments but the first as free, and add the block to the swag of blocks containing free frags */ size_t i; for (i = 1; i < (size_t) (BLOCKSIZE >> log); ++i) { diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c index b80030cbbb..1a1c371435 100644 --- a/src/xbt/xbt_os_time.c +++ b/src/xbt/xbt_os_time.c @@ -80,7 +80,7 @@ double xbt_os_time(void) return (double) (time(NULL)); #endif /* HAVE_GETTIMEOFDAY? */ - return tv.tv_sec + tv.tv_usec / 1000000.0; + return (double)tv.tv_sec + (double)tv.tv_usec / 1e6; } void xbt_os_sleep(double sec) @@ -91,14 +91,14 @@ void xbt_os_sleep(double sec) #elif HAVE_NANOSLEEP struct timespec ts; - ts.tv_sec = sec; - ts.tv_nsec = (sec - floor(sec)) * 1e9; + ts.tv_sec = (time_t)sec; + ts.tv_nsec = (long)((sec - floor(sec)) * 1e9); nanosleep (&ts, NULL); #else /* don't have nanosleep. Use select to sleep less than one second */ struct timeval timeout; - timeout.tv_sec = (unsigned long) (sec); - timeout.tv_usec = (sec - floor(sec)) * 1000000; + timeout.tv_sec = (long)sec; + timeout.tv_usec = (long)(sec - floor(sec)) * 1e6); select(0, NULL, NULL, NULL, &timeout); #endif diff --git a/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c b/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c index 5b537dcffe..03ff5ecad4 100644 --- a/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c +++ b/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c @@ -12,7 +12,7 @@ // Set the elements between buf[start] and buf[stop-1] to (i+value)%256 static void set(uint8_t *buf, size_t start, size_t stop, uint8_t value) { for(size_t i = start; i < stop; i++) { - buf[i] = (i+value)%256; + buf[i] = (uint8_t)((i + value) % 256); } } @@ -64,15 +64,15 @@ int main(int argc, char *argv[]) for(int i = 0; i < nb_blocks-1; i++) { size_t start = shared_blocks[2*i+1]; size_t stop = shared_blocks[2*i+2]; - set(buf, start, stop, rank); + set(buf, start, stop, (uint8_t)rank); } } // Then, even processes send their buffer to their successor if(rank%2 == 0) { - MPI_Send(buf, mem_size, MPI_UINT8_T, rank+1, 0, MPI_COMM_WORLD); + MPI_Send(buf, (int)mem_size, MPI_UINT8_T, rank + 1, 0, MPI_COMM_WORLD); } else { - MPI_Recv(buf, mem_size, MPI_UINT8_T, rank-1, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE); + MPI_Recv(buf, (int)mem_size, MPI_UINT8_T, rank - 1, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE); } @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) for(int i = 0; i < nb_blocks-1; i++) { size_t start = shared_blocks[2*i+1]; size_t stop = shared_blocks[2*i+2]; - int comm = check_all(buf, start, stop, rank-1); + int comm = check_all(buf, start, stop, (uint8_t)(rank - 1)); printf("[%d] The result of the (normal) communication check for block (0x%zx, 0x%zx) is: %d\n", rank, start, stop, comm); } memset(buf, rank, mem_size); @@ -92,10 +92,10 @@ int main(int argc, char *argv[]) // Then, even processes send a sub-part of their buffer their successor // Note that the last block should not be copied entirely if(rank%2 == 0) { - MPI_Send(buf+0x10000, mem_size-0xa00000, MPI_UINT8_T, rank+1, 0, MPI_COMM_WORLD); + MPI_Send(buf + 0x10000, (int)(mem_size - 0xa00000), MPI_UINT8_T, rank + 1, 0, MPI_COMM_WORLD); } else { - MPI_Recv(buf+0x10000, mem_size-0xa00000, MPI_UINT8_T, rank-1, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE); + MPI_Recv(buf + 0x10000, (int)(mem_size - 0xa00000), MPI_UINT8_T, rank - 1, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE); } @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) for(int i = 0; i < nb_blocks-1; i++) { size_t start = shared_blocks[2*i+1]; size_t stop = shared_blocks[2*i+2]; - int comm = check_all(buf, start, stop, rank-1); + int comm = check_all(buf, start, stop, (uint8_t)(rank - 1)); printf("[%d] The result of the (shifted) communication check for block (0x%zx, 0x%zx) is: %d\n", rank, start, stop, comm); } } diff --git a/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c b/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c index e378b5a856..29168cc9d0 100644 --- a/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c +++ b/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c @@ -11,7 +11,7 @@ // Set the elements between buf[start] and buf[stop-1] to (i+value)%256 static void set(uint8_t *buf, size_t start, size_t stop, uint8_t value) { for(size_t i = start; i < stop; i++) { - buf[i] = (i+value)%256; + buf[i] = (uint8_t)((i + value) % 256); } } -- 2.20.1