From 4c4671eeabdfa4c951086939613eaccf7f2b973d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 6 Mar 2016 21:37:56 +0100 Subject: [PATCH] one set of macros for min/max is enough --- examples/msg/bittorrent/peer.c | 2 +- examples/msg/mc/bugged2.c | 2 +- include/xbt/base.h | 7 ------- src/smpi/colls/allgatherv-mpich-rdb.c | 2 +- src/smpi/colls/reduce-binomial.c | 2 +- src/smpi/colls/reduce_scatter-mpich.c | 6 +++--- src/xbt/log.c | 2 +- 7 files changed, 8 insertions(+), 15 deletions(-) diff --git a/examples/msg/bittorrent/peer.c b/examples/msg/bittorrent/peer.c index 372194bbb7..0ef1d35574 100644 --- a/examples/msg/bittorrent/peer.c +++ b/examples/msg/bittorrent/peer.c @@ -781,7 +781,7 @@ void send_request_to_peer(peer_t peer, connection_t remote_peer, int piece) block_index = get_first_block(peer, piece); if (block_index != -1) { block_length = PIECES_BLOCKS - block_index; - block_length = min(BLOCKS_REQUESTED, block_length); + block_length = MIN(BLOCKS_REQUESTED, block_length); send_request(peer, remote_peer->mailbox, piece, block_index, block_length); } } diff --git a/examples/msg/mc/bugged2.c b/examples/msg/mc/bugged2.c index a0376a8b82..4cda68c9cc 100644 --- a/examples/msg/mc/bugged2.c +++ b/examples/msg/mc/bugged2.c @@ -36,7 +36,7 @@ int server(int argc, char *argv[]) task2 = NULL; XBT_INFO("Received %lu", val2); - MC_assert(min(val1, val2) == 1); + MC_assert(MIN(val1, val2) == 1); MSG_task_receive(&task1, "mymailbox"); val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s"); diff --git a/include/xbt/base.h b/include/xbt/base.h index d266b5ad3a..4347e66ffd 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -199,13 +199,6 @@ #endif -#if !defined (max) && !defined(__cplusplus) -# define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif -#if !defined (min) && !defined(__cplusplus) -# define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - #define TRUE 1 #define FALSE 0 diff --git a/src/smpi/colls/allgatherv-mpich-rdb.c b/src/smpi/colls/allgatherv-mpich-rdb.c index e4edda955e..fcf9079e5b 100644 --- a/src/smpi/colls/allgatherv-mpich-rdb.c +++ b/src/smpi/colls/allgatherv-mpich-rdb.c @@ -42,7 +42,7 @@ int smpi_coll_tuned_allgatherv_mpich_rdb ( smpi_datatype_extent(recvtype, &recvtype_true_lb, &recvtype_true_extent); - tmp_buf_rl= (void*)smpi_get_tmp_sendbuffer(total_count*(max(recvtype_true_extent,recvtype_extent))); + tmp_buf_rl= (void*)smpi_get_tmp_sendbuffer(total_count*(MAX(recvtype_true_extent,recvtype_extent))); /* adjust for potential negative lower bound in datatype */ tmp_buf = (void *)((char*)tmp_buf_rl - recvtype_true_lb); diff --git a/src/smpi/colls/reduce-binomial.c b/src/smpi/colls/reduce-binomial.c index 607bb6fc42..180a07de30 100644 --- a/src/smpi/colls/reduce-binomial.c +++ b/src/smpi/colls/reduce-binomial.c @@ -46,7 +46,7 @@ int smpi_coll_tuned_reduce_binomial(void *sendbuf, void *recvbuf, int count, /* If I'm not the root, then my recvbuf may not be valid, therefore I have to allocate a temporary one */ if (rank != root) { - recvbuf = (void *) smpi_get_tmp_recvbuffer(count*(max(extent,true_extent))); + recvbuf = (void *) smpi_get_tmp_recvbuffer(count*(MAX(extent,true_extent))); recvbuf = (void *)((char*)recvbuf - true_lb); } if ((rank != root) || (sendbuf != MPI_IN_PLACE)) { diff --git a/src/smpi/colls/reduce_scatter-mpich.c b/src/smpi/colls/reduce_scatter-mpich.c index 83a802bebf..447cc33677 100644 --- a/src/smpi/colls/reduce_scatter-mpich.c +++ b/src/smpi/colls/reduce_scatter-mpich.c @@ -63,7 +63,7 @@ int smpi_coll_tuned_reduce_scatter_mpich_pair(void *sendbuf, void *recvbuf, int } /* allocate temporary buffer to store incoming data */ - tmp_recvbuf = (void*)smpi_get_tmp_recvbuffer(recvcounts[rank]*(max(true_extent,extent))+1); + tmp_recvbuf = (void*)smpi_get_tmp_recvbuffer(recvcounts[rank]*(MAX(true_extent,extent))+1); /* adjust for potential negative lower bound in datatype */ tmp_recvbuf = (void *)((char*)tmp_recvbuf - true_lb); @@ -300,13 +300,13 @@ int smpi_coll_tuned_reduce_scatter_mpich_rdb(void *sendbuf, void *recvbuf, int r /* noncommutative and (non-pof2 or block irregular), use recursive doubling. */ /* need to allocate temporary buffer to receive incoming data*/ - tmp_recvbuf= (void *) smpi_get_tmp_recvbuffer( total_count*(max(true_extent,extent))); + tmp_recvbuf= (void *) smpi_get_tmp_recvbuffer( total_count*(MAX(true_extent,extent))); /* adjust for potential negative lower bound in datatype */ tmp_recvbuf = (void *)((char*)tmp_recvbuf - true_lb); /* need to allocate another temporary buffer to accumulate results */ - tmp_results = (void *)smpi_get_tmp_sendbuffer( total_count*(max(true_extent,extent))); + tmp_results = (void *)smpi_get_tmp_sendbuffer( total_count*(MAX(true_extent,extent))); /* adjust for potential negative lower bound in datatype */ tmp_results = (void *)((char*)tmp_results - true_lb); diff --git a/src/xbt/log.c b/src/xbt/log.c index 2019f4c769..075e482c0a 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -1161,7 +1161,7 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string) set->fmt = xbt_strdup(eq + 1); } else { char buff[512]; - snprintf(buff, min(512, eq - dot), "%s", dot + 1); + snprintf(buff, MIN(512, eq - dot), "%s", dot + 1); THROWF(arg_error, 0, "Unknown setting of the log category: '%s'", buff); } -- 2.20.1