From d53d00d608a60a6f05e77ea7b7cd5c4e544d7ab1 Mon Sep 17 00:00:00 2001
From: degomme <augustin.degomme@unibas.ch>
Date: Sun, 5 Mar 2017 17:51:52 +0100
Subject: [PATCH] Move all smpi colls to cpp.

---
 ...llgather-2dmesh.c => allgather-2dmesh.cpp} |   0
 ...llgather-3dmesh.c => allgather-3dmesh.cpp} |   0
 .../{allgather-GB.c => allgather-GB.cpp}      |   0
 ...ther-NTSLR-NB.c => allgather-NTSLR-NB.cpp} |   0
 ...{allgather-NTSLR.c => allgather-NTSLR.cpp} |   0
 ...gather-SMP-NTS.c => allgather-SMP-NTS.cpp} |   0
 ...{allgather-bruck.c => allgather-bruck.cpp} |   0
 ...-loosely-lr.c => allgather-loosely-lr.cpp} |   0
 ...vapich-smp.c => allgather-mvapich-smp.cpp} |   4 +-
 ....c => allgather-ompi-neighborexchange.cpp} |   0
 .../{allgather-pair.c => allgather-pair.cpp}  |   0
 .../{allgather-rdb.c => allgather-rdb.cpp}    |   2 +-
 .../{allgather-rhv.c => allgather-rhv.cpp}    |   2 +-
 .../{allgather-ring.c => allgather-ring.cpp}  |   0
 ...-smp-simple.c => allgather-smp-simple.cpp} |   0
 ...imple.c => allgather-spreading-simple.cpp} |   0
 .../{allgatherv-GB.c => allgatherv-GB.cpp}    |   0
 ...v-mpich-rdb.c => allgatherv-mpich-rdb.cpp} |   4 +-
 ...mpich-ring.c => allgatherv-mpich-ring.cpp} |   0
 ...ompi-bruck.c => allgatherv-ompi-bruck.cpp} |   0
 ...c => allgatherv-ompi-neighborexchange.cpp} |   0
 ...{allgatherv-pair.c => allgatherv-pair.cpp} |   0
 ...{allgatherv-ring.c => allgatherv-ring.cpp} |   0
 .../{allreduce-lr.c => allreduce-lr.cpp}      |   0
 ...-mvapich-rs.c => allreduce-mvapich-rs.cpp} |  10 +-
 ...evel.c => allreduce-mvapich-two-level.cpp} |   0
 ...ed.c => allreduce-ompi-ring-segmented.cpp} |   4 +-
 ...reduce-rab-rdb.c => allreduce-rab-rdb.cpp} |   8 +-
 .../{allreduce-rab1.c => allreduce-rab1.cpp}  |   2 +-
 .../{allreduce-rab2.c => allreduce-rab2.cpp}  |   0
 .../{allreduce-rdb.c => allreduce-rdb.cpp}    |   0
 ...duce-redbcast.c => allreduce-redbcast.cpp} |   0
 ....c => allreduce-smp-binomial-pipeline.cpp} |   0
 ...-binomial.c => allreduce-smp-binomial.cpp} |   0
 ...reduce-smp-rdb.c => allreduce-smp-rdb.cpp} |   0
 ...mp-rsag-lr.c => allreduce-smp-rsag-lr.cpp} |   0
 ...-rsag-rab.c => allreduce-smp-rsag-rab.cpp} |   0
 ...duce-smp-rsag.c => allreduce-smp-rsag.cpp} |   0
 ...{alltoall-2dmesh.c => alltoall-2dmesh.cpp} |   0
 ...{alltoall-3dmesh.c => alltoall-3dmesh.cpp} |   0
 .../{alltoall-bruck.c => alltoall-bruck.cpp}  |   0
 ...st.c => alltoall-mvapich-scatter-dest.cpp} |   0
 ...rier.c => alltoall-pair-light-barrier.cpp} |   0
 ...arrier.c => alltoall-pair-mpi-barrier.cpp} |   0
 ...arrier.c => alltoall-pair-one-barrier.cpp} |   0
 .../{alltoall-pair.c => alltoall-pair.cpp}    |   0
 .../{alltoall-rdb.c => alltoall-rdb.cpp}      |   0
 ...rier.c => alltoall-ring-light-barrier.cpp} |   0
 ...arrier.c => alltoall-ring-mpi-barrier.cpp} |   0
 ...arrier.c => alltoall-ring-one-barrier.cpp} |   0
 .../{alltoall-ring.c => alltoall-ring.cpp}    |   0
 ...{alltoallv-bruck.c => alltoallv-bruck.cpp} |   0
 ...near.c => alltoallv-ompi-basic-linear.cpp} |   2 +-
 ...ier.c => alltoallv-pair-light-barrier.cpp} |   0
 ...rrier.c => alltoallv-pair-mpi-barrier.cpp} |   0
 ...rrier.c => alltoallv-pair-one-barrier.cpp} |   0
 .../{alltoallv-pair.c => alltoallv-pair.cpp}  |   0
 ...ier.c => alltoallv-ring-light-barrier.cpp} |   0
 ...rrier.c => alltoallv-ring-mpi-barrier.cpp} |   0
 ...rrier.c => alltoallv-ring-one-barrier.cpp} |   0
 .../{alltoallv-ring.c => alltoallv-ring.cpp}  |   0
 ...pich2-pair.c => barrier-mvapich2-pair.cpp} |   0
 .../{barrier-ompi.c => barrier-ompi.cpp}      |   0
 .../colls/{bcast-NTSB.c => bcast-NTSB.cpp}    |   0
 ...cast-NTSL-Isend.c => bcast-NTSL-Isend.cpp} |   0
 .../colls/{bcast-NTSL.c => bcast-NTSL.cpp}    |   0
 ...cast-SMP-binary.c => bcast-SMP-binary.cpp} |   0
 ...-SMP-binomial.c => bcast-SMP-binomial.cpp} |   0
 ...cast-SMP-linear.c => bcast-SMP-linear.cpp} |   0
 ...c => bcast-arrival-pattern-aware-wait.cpp} |   0
 ...ware.c => bcast-arrival-pattern-aware.cpp} |   0
 ...al-scatter.c => bcast-arrival-scatter.cpp} |   0
 ...inomial-tree.c => bcast-binomial-tree.cpp} |   0
 ...pipeline.c => bcast-flattree-pipeline.cpp} |   0
 .../{bcast-flattree.c => bcast-flattree.cpp}  |   0
 ...st-mvapich-smp.c => bcast-mvapich-smp.cpp} |   0
 ...mpi-pipeline.c => bcast-ompi-pipeline.cpp} |   4 +-
 ...bintree.c => bcast-ompi-split-bintree.cpp} |   2 +-
 ...ather.c => bcast-scatter-LR-allgather.cpp} |   0
 ...ther.c => bcast-scatter-rdb-allgather.cpp} |   0
 ...{coll_tuned_topo.c => coll_tuned_topo.cpp} |   0
 .../{colls_global.c => colls_global.cpp}      |   0
 .../{gather-mvapich.c => gather-mvapich.cpp}  |   4 +-
 .../colls/{gather-ompi.c => gather-ompi.cpp}  |   0
 .../colls/{reduce-NTSL.c => reduce-NTSL.cpp}  |   0
 ...are.c => reduce-arrival-pattern-aware.cpp} |   0
 ...{reduce-binomial.c => reduce-binomial.cpp} |   0
 ...educe-flat-tree.c => reduce-flat-tree.cpp} |   2 +-
 ...h-knomial.c => reduce-mvapich-knomial.cpp} |   6 +-
 ...o-level.c => reduce-mvapich-two-level.cpp} |   0
 .../colls/{reduce-ompi.c => reduce-ompi.cpp}  |   0
 .../colls/{reduce-rab.c => reduce-rab.cpp}    |  12 +-
 ...ter-gather.c => reduce-scatter-gather.cpp} |   0
 ...atter-mpich.c => reduce_scatter-mpich.cpp} |   4 +-
 ...scatter-ompi.c => reduce_scatter-ompi.cpp} |   0
 ...-level.c => scatter-mvapich-two-level.cpp} |  16 +-
 .../{scatter-ompi.c => scatter-ompi.cpp}      |   0
 ...selector.c => smpi_intel_mpi_selector.cpp} |   2 +-
 ...ich_selector.c => smpi_mpich_selector.cpp} |   4 +-
 ..._selector.c => smpi_mvapich2_selector.cpp} |  20 +-
 .../colls/smpi_mvapich2_selector_stampede.h   |  72 +++----
 ...i_selector.c => smpi_openmpi_selector.cpp} |   0
 tools/cmake/DefinePackages.cmake              | 202 +++++++++---------
 103 files changed, 194 insertions(+), 194 deletions(-)
 rename src/smpi/colls/{allgather-2dmesh.c => allgather-2dmesh.cpp} (100%)
 rename src/smpi/colls/{allgather-3dmesh.c => allgather-3dmesh.cpp} (100%)
 rename src/smpi/colls/{allgather-GB.c => allgather-GB.cpp} (100%)
 rename src/smpi/colls/{allgather-NTSLR-NB.c => allgather-NTSLR-NB.cpp} (100%)
 rename src/smpi/colls/{allgather-NTSLR.c => allgather-NTSLR.cpp} (100%)
 rename src/smpi/colls/{allgather-SMP-NTS.c => allgather-SMP-NTS.cpp} (100%)
 rename src/smpi/colls/{allgather-bruck.c => allgather-bruck.cpp} (100%)
 rename src/smpi/colls/{allgather-loosely-lr.c => allgather-loosely-lr.cpp} (100%)
 rename src/smpi/colls/{allgather-mvapich-smp.c => allgather-mvapich-smp.cpp} (97%)
 rename src/smpi/colls/{allgather-ompi-neighborexchange.c => allgather-ompi-neighborexchange.cpp} (100%)
 rename src/smpi/colls/{allgather-pair.c => allgather-pair.cpp} (100%)
 rename src/smpi/colls/{allgather-rdb.c => allgather-rdb.cpp} (99%)
 rename src/smpi/colls/{allgather-rhv.c => allgather-rhv.cpp} (99%)
 rename src/smpi/colls/{allgather-ring.c => allgather-ring.cpp} (100%)
 rename src/smpi/colls/{allgather-smp-simple.c => allgather-smp-simple.cpp} (100%)
 rename src/smpi/colls/{allgather-spreading-simple.c => allgather-spreading-simple.cpp} (100%)
 rename src/smpi/colls/{allgatherv-GB.c => allgatherv-GB.cpp} (100%)
 rename src/smpi/colls/{allgatherv-mpich-rdb.c => allgatherv-mpich-rdb.cpp} (99%)
 rename src/smpi/colls/{allgatherv-mpich-ring.c => allgatherv-mpich-ring.cpp} (100%)
 rename src/smpi/colls/{allgatherv-ompi-bruck.c => allgatherv-ompi-bruck.cpp} (100%)
 rename src/smpi/colls/{allgatherv-ompi-neighborexchange.c => allgatherv-ompi-neighborexchange.cpp} (100%)
 rename src/smpi/colls/{allgatherv-pair.c => allgatherv-pair.cpp} (100%)
 rename src/smpi/colls/{allgatherv-ring.c => allgatherv-ring.cpp} (100%)
 rename src/smpi/colls/{allreduce-lr.c => allreduce-lr.cpp} (100%)
 rename src/smpi/colls/{allreduce-mvapich-rs.c => allreduce-mvapich-rs.cpp} (97%)
 rename src/smpi/colls/{allreduce-mvapich-two-level.c => allreduce-mvapich-two-level.cpp} (100%)
 rename src/smpi/colls/{allreduce-ompi-ring-segmented.c => allreduce-ompi-ring-segmented.cpp} (99%)
 rename src/smpi/colls/{allreduce-rab-rdb.c => allreduce-rab-rdb.cpp} (97%)
 rename src/smpi/colls/{allreduce-rab1.c => allreduce-rab1.cpp} (98%)
 rename src/smpi/colls/{allreduce-rab2.c => allreduce-rab2.cpp} (100%)
 rename src/smpi/colls/{allreduce-rdb.c => allreduce-rdb.cpp} (100%)
 rename src/smpi/colls/{allreduce-redbcast.c => allreduce-redbcast.cpp} (100%)
 rename src/smpi/colls/{allreduce-smp-binomial-pipeline.c => allreduce-smp-binomial-pipeline.cpp} (100%)
 rename src/smpi/colls/{allreduce-smp-binomial.c => allreduce-smp-binomial.cpp} (100%)
 rename src/smpi/colls/{allreduce-smp-rdb.c => allreduce-smp-rdb.cpp} (100%)
 rename src/smpi/colls/{allreduce-smp-rsag-lr.c => allreduce-smp-rsag-lr.cpp} (100%)
 rename src/smpi/colls/{allreduce-smp-rsag-rab.c => allreduce-smp-rsag-rab.cpp} (100%)
 rename src/smpi/colls/{allreduce-smp-rsag.c => allreduce-smp-rsag.cpp} (100%)
 rename src/smpi/colls/{alltoall-2dmesh.c => alltoall-2dmesh.cpp} (100%)
 rename src/smpi/colls/{alltoall-3dmesh.c => alltoall-3dmesh.cpp} (100%)
 rename src/smpi/colls/{alltoall-bruck.c => alltoall-bruck.cpp} (100%)
 rename src/smpi/colls/{alltoall-mvapich-scatter-dest.c => alltoall-mvapich-scatter-dest.cpp} (100%)
 rename src/smpi/colls/{alltoall-pair-light-barrier.c => alltoall-pair-light-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoall-pair-mpi-barrier.c => alltoall-pair-mpi-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoall-pair-one-barrier.c => alltoall-pair-one-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoall-pair.c => alltoall-pair.cpp} (100%)
 rename src/smpi/colls/{alltoall-rdb.c => alltoall-rdb.cpp} (100%)
 rename src/smpi/colls/{alltoall-ring-light-barrier.c => alltoall-ring-light-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoall-ring-mpi-barrier.c => alltoall-ring-mpi-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoall-ring-one-barrier.c => alltoall-ring-one-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoall-ring.c => alltoall-ring.cpp} (100%)
 rename src/smpi/colls/{alltoallv-bruck.c => alltoallv-bruck.cpp} (100%)
 rename src/smpi/colls/{alltoallv-ompi-basic-linear.c => alltoallv-ompi-basic-linear.cpp} (97%)
 rename src/smpi/colls/{alltoallv-pair-light-barrier.c => alltoallv-pair-light-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoallv-pair-mpi-barrier.c => alltoallv-pair-mpi-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoallv-pair-one-barrier.c => alltoallv-pair-one-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoallv-pair.c => alltoallv-pair.cpp} (100%)
 rename src/smpi/colls/{alltoallv-ring-light-barrier.c => alltoallv-ring-light-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoallv-ring-mpi-barrier.c => alltoallv-ring-mpi-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoallv-ring-one-barrier.c => alltoallv-ring-one-barrier.cpp} (100%)
 rename src/smpi/colls/{alltoallv-ring.c => alltoallv-ring.cpp} (100%)
 rename src/smpi/colls/{barrier-mvapich2-pair.c => barrier-mvapich2-pair.cpp} (100%)
 rename src/smpi/colls/{barrier-ompi.c => barrier-ompi.cpp} (100%)
 rename src/smpi/colls/{bcast-NTSB.c => bcast-NTSB.cpp} (100%)
 rename src/smpi/colls/{bcast-NTSL-Isend.c => bcast-NTSL-Isend.cpp} (100%)
 rename src/smpi/colls/{bcast-NTSL.c => bcast-NTSL.cpp} (100%)
 rename src/smpi/colls/{bcast-SMP-binary.c => bcast-SMP-binary.cpp} (100%)
 rename src/smpi/colls/{bcast-SMP-binomial.c => bcast-SMP-binomial.cpp} (100%)
 rename src/smpi/colls/{bcast-SMP-linear.c => bcast-SMP-linear.cpp} (100%)
 rename src/smpi/colls/{bcast-arrival-pattern-aware-wait.c => bcast-arrival-pattern-aware-wait.cpp} (100%)
 rename src/smpi/colls/{bcast-arrival-pattern-aware.c => bcast-arrival-pattern-aware.cpp} (100%)
 rename src/smpi/colls/{bcast-arrival-scatter.c => bcast-arrival-scatter.cpp} (100%)
 rename src/smpi/colls/{bcast-binomial-tree.c => bcast-binomial-tree.cpp} (100%)
 rename src/smpi/colls/{bcast-flattree-pipeline.c => bcast-flattree-pipeline.cpp} (100%)
 rename src/smpi/colls/{bcast-flattree.c => bcast-flattree.cpp} (100%)
 rename src/smpi/colls/{bcast-mvapich-smp.c => bcast-mvapich-smp.cpp} (100%)
 rename src/smpi/colls/{bcast-ompi-pipeline.c => bcast-ompi-pipeline.cpp} (98%)
 rename src/smpi/colls/{bcast-ompi-split-bintree.c => bcast-ompi-split-bintree.cpp} (99%)
 rename src/smpi/colls/{bcast-scatter-LR-allgather.c => bcast-scatter-LR-allgather.cpp} (100%)
 rename src/smpi/colls/{bcast-scatter-rdb-allgather.c => bcast-scatter-rdb-allgather.cpp} (100%)
 rename src/smpi/colls/{coll_tuned_topo.c => coll_tuned_topo.cpp} (100%)
 rename src/smpi/colls/{colls_global.c => colls_global.cpp} (100%)
 rename src/smpi/colls/{gather-mvapich.c => gather-mvapich.cpp} (98%)
 rename src/smpi/colls/{gather-ompi.c => gather-ompi.cpp} (100%)
 rename src/smpi/colls/{reduce-NTSL.c => reduce-NTSL.cpp} (100%)
 rename src/smpi/colls/{reduce-arrival-pattern-aware.c => reduce-arrival-pattern-aware.cpp} (100%)
 rename src/smpi/colls/{reduce-binomial.c => reduce-binomial.cpp} (100%)
 rename src/smpi/colls/{reduce-flat-tree.c => reduce-flat-tree.cpp} (97%)
 rename src/smpi/colls/{reduce-mvapich-knomial.c => reduce-mvapich-knomial.cpp} (95%)
 rename src/smpi/colls/{reduce-mvapich-two-level.c => reduce-mvapich-two-level.cpp} (100%)
 rename src/smpi/colls/{reduce-ompi.c => reduce-ompi.cpp} (100%)
 rename src/smpi/colls/{reduce-rab.c => reduce-rab.cpp} (98%)
 rename src/smpi/colls/{reduce-scatter-gather.c => reduce-scatter-gather.cpp} (100%)
 rename src/smpi/colls/{reduce_scatter-mpich.c => reduce_scatter-mpich.cpp} (99%)
 rename src/smpi/colls/{reduce_scatter-ompi.c => reduce_scatter-ompi.cpp} (100%)
 rename src/smpi/colls/{scatter-mvapich-two-level.c => scatter-mvapich-two-level.cpp} (95%)
 rename src/smpi/colls/{scatter-ompi.c => scatter-ompi.cpp} (100%)
 rename src/smpi/colls/{smpi_intel_mpi_selector.c => smpi_intel_mpi_selector.cpp} (99%)
 rename src/smpi/colls/{smpi_mpich_selector.c => smpi_mpich_selector.cpp} (99%)
 rename src/smpi/colls/{smpi_mvapich2_selector.c => smpi_mvapich2_selector.cpp} (99%)
 rename src/smpi/colls/{smpi_openmpi_selector.c => smpi_openmpi_selector.cpp} (100%)

diff --git a/src/smpi/colls/allgather-2dmesh.c b/src/smpi/colls/allgather-2dmesh.cpp
similarity index 100%
rename from src/smpi/colls/allgather-2dmesh.c
rename to src/smpi/colls/allgather-2dmesh.cpp
diff --git a/src/smpi/colls/allgather-3dmesh.c b/src/smpi/colls/allgather-3dmesh.cpp
similarity index 100%
rename from src/smpi/colls/allgather-3dmesh.c
rename to src/smpi/colls/allgather-3dmesh.cpp
diff --git a/src/smpi/colls/allgather-GB.c b/src/smpi/colls/allgather-GB.cpp
similarity index 100%
rename from src/smpi/colls/allgather-GB.c
rename to src/smpi/colls/allgather-GB.cpp
diff --git a/src/smpi/colls/allgather-NTSLR-NB.c b/src/smpi/colls/allgather-NTSLR-NB.cpp
similarity index 100%
rename from src/smpi/colls/allgather-NTSLR-NB.c
rename to src/smpi/colls/allgather-NTSLR-NB.cpp
diff --git a/src/smpi/colls/allgather-NTSLR.c b/src/smpi/colls/allgather-NTSLR.cpp
similarity index 100%
rename from src/smpi/colls/allgather-NTSLR.c
rename to src/smpi/colls/allgather-NTSLR.cpp
diff --git a/src/smpi/colls/allgather-SMP-NTS.c b/src/smpi/colls/allgather-SMP-NTS.cpp
similarity index 100%
rename from src/smpi/colls/allgather-SMP-NTS.c
rename to src/smpi/colls/allgather-SMP-NTS.cpp
diff --git a/src/smpi/colls/allgather-bruck.c b/src/smpi/colls/allgather-bruck.cpp
similarity index 100%
rename from src/smpi/colls/allgather-bruck.c
rename to src/smpi/colls/allgather-bruck.cpp
diff --git a/src/smpi/colls/allgather-loosely-lr.c b/src/smpi/colls/allgather-loosely-lr.cpp
similarity index 100%
rename from src/smpi/colls/allgather-loosely-lr.c
rename to src/smpi/colls/allgather-loosely-lr.cpp
diff --git a/src/smpi/colls/allgather-mvapich-smp.c b/src/smpi/colls/allgather-mvapich-smp.cpp
similarity index 97%
rename from src/smpi/colls/allgather-mvapich-smp.c
rename to src/smpi/colls/allgather-mvapich-smp.cpp
index 150798d5eb..e479361175 100644
--- a/src/smpi/colls/allgather-mvapich-smp.c
+++ b/src/smpi/colls/allgather-mvapich-smp.cpp
@@ -112,8 +112,8 @@ int smpi_coll_tuned_allgather_mvapich2_smp(void *sendbuf,int sendcnt, MPI_Dataty
 
             node_sizes = smpi_comm_get_non_uniform_map(comm);
 
-            displs = xbt_malloc(sizeof (int) * leader_comm_size);
-            recvcnts = xbt_malloc(sizeof (int) * leader_comm_size);
+            displs =  static_cast<int *>(xbt_malloc(sizeof (int) * leader_comm_size));
+            recvcnts =  static_cast<int *>(xbt_malloc(sizeof (int) * leader_comm_size));
             if (!displs || !recvcnts) {
                 return MPI_ERR_OTHER;
             }
diff --git a/src/smpi/colls/allgather-ompi-neighborexchange.c b/src/smpi/colls/allgather-ompi-neighborexchange.cpp
similarity index 100%
rename from src/smpi/colls/allgather-ompi-neighborexchange.c
rename to src/smpi/colls/allgather-ompi-neighborexchange.cpp
diff --git a/src/smpi/colls/allgather-pair.c b/src/smpi/colls/allgather-pair.cpp
similarity index 100%
rename from src/smpi/colls/allgather-pair.c
rename to src/smpi/colls/allgather-pair.cpp
diff --git a/src/smpi/colls/allgather-rdb.c b/src/smpi/colls/allgather-rdb.cpp
similarity index 99%
rename from src/smpi/colls/allgather-rdb.c
rename to src/smpi/colls/allgather-rdb.cpp
index 84acf3d99f..745af6405d 100644
--- a/src/smpi/colls/allgather-rdb.c
+++ b/src/smpi/colls/allgather-rdb.cpp
@@ -21,7 +21,7 @@ smpi_coll_tuned_allgather_rdb(void *sbuf, int send_count,
   int dst_tree_root, rank_tree_root, last_recv_count = 0, num_procs_completed;
   int offset, tmp_mask;
   int tag = COLL_TAG_ALLGATHER;
-  int mask = 1;
+  unsigned int mask = 1;
   int success = 0;
   int curr_count = recv_count;
 
diff --git a/src/smpi/colls/allgather-rhv.c b/src/smpi/colls/allgather-rhv.cpp
similarity index 99%
rename from src/smpi/colls/allgather-rhv.c
rename to src/smpi/colls/allgather-rhv.cpp
index 3aaf479d9a..6b41f55466 100644
--- a/src/smpi/colls/allgather-rhv.c
+++ b/src/smpi/colls/allgather-rhv.cpp
@@ -21,7 +21,7 @@ smpi_coll_tuned_allgather_rhv(void *sbuf, int send_count,
   int i, dst, send_base_offset, recv_base_offset, send_chunk, recv_chunk,
       send_offset, recv_offset;
   int tag = COLL_TAG_ALLGATHER;
-  int mask;
+  unsigned int mask;
   int curr_count;
 
   // get size of the communicator, followed by rank 
diff --git a/src/smpi/colls/allgather-ring.c b/src/smpi/colls/allgather-ring.cpp
similarity index 100%
rename from src/smpi/colls/allgather-ring.c
rename to src/smpi/colls/allgather-ring.cpp
diff --git a/src/smpi/colls/allgather-smp-simple.c b/src/smpi/colls/allgather-smp-simple.cpp
similarity index 100%
rename from src/smpi/colls/allgather-smp-simple.c
rename to src/smpi/colls/allgather-smp-simple.cpp
diff --git a/src/smpi/colls/allgather-spreading-simple.c b/src/smpi/colls/allgather-spreading-simple.cpp
similarity index 100%
rename from src/smpi/colls/allgather-spreading-simple.c
rename to src/smpi/colls/allgather-spreading-simple.cpp
diff --git a/src/smpi/colls/allgatherv-GB.c b/src/smpi/colls/allgatherv-GB.cpp
similarity index 100%
rename from src/smpi/colls/allgatherv-GB.c
rename to src/smpi/colls/allgatherv-GB.cpp
diff --git a/src/smpi/colls/allgatherv-mpich-rdb.c b/src/smpi/colls/allgatherv-mpich-rdb.cpp
similarity index 99%
rename from src/smpi/colls/allgatherv-mpich-rdb.c
rename to src/smpi/colls/allgatherv-mpich-rdb.cpp
index a3614e5f69..099297c646 100644
--- a/src/smpi/colls/allgatherv-mpich-rdb.c
+++ b/src/smpi/colls/allgatherv-mpich-rdb.cpp
@@ -17,10 +17,10 @@ int smpi_coll_tuned_allgatherv_mpich_rdb (
   MPI_Datatype recvtype,
   MPI_Comm comm)
 {
-  int  j, i;
+  unsigned int  j, i;
   MPI_Status status;
   MPI_Aint  recvtype_extent, recvtype_true_extent, recvtype_true_lb;
-  int curr_cnt, dst, total_count;
+  unsigned int curr_cnt, dst, total_count;
   void *tmp_buf, *tmp_buf_rl;
   unsigned int mask, dst_tree_root, my_tree_root, position,
     send_offset, recv_offset, last_recv_cnt=0, nprocs_completed, k,
diff --git a/src/smpi/colls/allgatherv-mpich-ring.c b/src/smpi/colls/allgatherv-mpich-ring.cpp
similarity index 100%
rename from src/smpi/colls/allgatherv-mpich-ring.c
rename to src/smpi/colls/allgatherv-mpich-ring.cpp
diff --git a/src/smpi/colls/allgatherv-ompi-bruck.c b/src/smpi/colls/allgatherv-ompi-bruck.cpp
similarity index 100%
rename from src/smpi/colls/allgatherv-ompi-bruck.c
rename to src/smpi/colls/allgatherv-ompi-bruck.cpp
diff --git a/src/smpi/colls/allgatherv-ompi-neighborexchange.c b/src/smpi/colls/allgatherv-ompi-neighborexchange.cpp
similarity index 100%
rename from src/smpi/colls/allgatherv-ompi-neighborexchange.c
rename to src/smpi/colls/allgatherv-ompi-neighborexchange.cpp
diff --git a/src/smpi/colls/allgatherv-pair.c b/src/smpi/colls/allgatherv-pair.cpp
similarity index 100%
rename from src/smpi/colls/allgatherv-pair.c
rename to src/smpi/colls/allgatherv-pair.cpp
diff --git a/src/smpi/colls/allgatherv-ring.c b/src/smpi/colls/allgatherv-ring.cpp
similarity index 100%
rename from src/smpi/colls/allgatherv-ring.c
rename to src/smpi/colls/allgatherv-ring.cpp
diff --git a/src/smpi/colls/allreduce-lr.c b/src/smpi/colls/allreduce-lr.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-lr.c
rename to src/smpi/colls/allreduce-lr.cpp
diff --git a/src/smpi/colls/allreduce-mvapich-rs.c b/src/smpi/colls/allreduce-mvapich-rs.cpp
similarity index 97%
rename from src/smpi/colls/allreduce-mvapich-rs.c
rename to src/smpi/colls/allreduce-mvapich-rs.cpp
index 0bd2dbef6d..10940e376c 100644
--- a/src/smpi/colls/allreduce-mvapich-rs.c
+++ b/src/smpi/colls/allreduce-mvapich-rs.cpp
@@ -31,9 +31,9 @@ int smpi_coll_tuned_allreduce_mvapich2_rs(void *sendbuf,
 {
     int mpi_errno = MPI_SUCCESS;
     int newrank = 0;
-    unsigned int mask, pof2;
-    int dst, is_commutative, rem, newdst, i,
-        send_idx, recv_idx, last_idx, send_cnt, recv_cnt, *cnts, *disps;
+    int mask, pof2, i, send_idx, recv_idx, last_idx, send_cnt;
+    int dst, is_commutative, rem, newdst,
+        recv_cnt, *cnts, *disps;
     MPI_Aint true_lb, true_extent, extent;
     void *tmp_buf, *tmp_buf_free;
 
@@ -43,8 +43,8 @@ int smpi_coll_tuned_allreduce_mvapich2_rs(void *sendbuf,
 
     /* homogeneous */
 
-    unsigned int comm_size =  smpi_comm_size(comm);
-    unsigned int rank = smpi_comm_rank(comm);
+    int comm_size =  smpi_comm_size(comm);
+    int rank = smpi_comm_rank(comm);
 
     is_commutative = smpi_op_is_commute(op);
 
diff --git a/src/smpi/colls/allreduce-mvapich-two-level.c b/src/smpi/colls/allreduce-mvapich-two-level.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-mvapich-two-level.c
rename to src/smpi/colls/allreduce-mvapich-two-level.cpp
diff --git a/src/smpi/colls/allreduce-ompi-ring-segmented.c b/src/smpi/colls/allreduce-ompi-ring-segmented.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-ompi-ring-segmented.c
rename to src/smpi/colls/allreduce-ompi-ring-segmented.cpp
index a8ea2ac5c2..6c85cedf2b 100644
--- a/src/smpi/colls/allreduce-ompi-ring-segmented.c
+++ b/src/smpi/colls/allreduce-ompi-ring-segmented.cpp
@@ -175,8 +175,8 @@ smpi_coll_tuned_allreduce_ompi_ring_segmented(void *sbuf, void *rbuf, int count,
    ptrdiff_t block_offset, max_real_segsize;
    MPI_Request reqs[2] = {NULL, NULL};
    const size_t segsize = 1 << 20; /* 1 MB */
-   unsigned int size = smpi_comm_size(comm);
-   unsigned int rank = smpi_comm_rank(comm);
+   int size = smpi_comm_size(comm);
+   int rank = smpi_comm_rank(comm);
 
    XBT_DEBUG("coll:tuned:allreduce_intra_ring_segmented rank %d, count %d", rank, count);
 
diff --git a/src/smpi/colls/allreduce-rab-rdb.c b/src/smpi/colls/allreduce-rab-rdb.cpp
similarity index 97%
rename from src/smpi/colls/allreduce-rab-rdb.c
rename to src/smpi/colls/allreduce-rab-rdb.cpp
index 7499785afb..27f36280ef 100644
--- a/src/smpi/colls/allreduce-rab-rdb.c
+++ b/src/smpi/colls/allreduce-rab-rdb.cpp
@@ -11,15 +11,15 @@ int smpi_coll_tuned_allreduce_rab_rdb(void *sbuff, void *rbuff, int count,
                                       MPI_Comm comm)
 {
   int tag = COLL_TAG_ALLREDUCE;
-  unsigned int mask, pof2;
-  int dst, newrank, rem, newdst, i,
-      send_idx, recv_idx, last_idx, send_cnt, recv_cnt, *cnts, *disps;
+  unsigned int mask, pof2, i, recv_idx, last_idx, send_idx, send_cnt;
+  int dst, newrank, rem, newdst,
+      recv_cnt, *cnts, *disps;
   MPI_Aint extent;
   MPI_Status status;
   void *tmp_buf = NULL;
 
   unsigned int nprocs = smpi_comm_size(comm);
-  unsigned int rank = smpi_comm_rank(comm);
+  int rank = smpi_comm_rank(comm);
 
   extent = smpi_datatype_get_extent(dtype);
   tmp_buf = (void *) smpi_get_tmp_sendbuffer(count * extent);
diff --git a/src/smpi/colls/allreduce-rab1.c b/src/smpi/colls/allreduce-rab1.cpp
similarity index 98%
rename from src/smpi/colls/allreduce-rab1.c
rename to src/smpi/colls/allreduce-rab1.cpp
index 173d3e530d..cb31de6516 100644
--- a/src/smpi/colls/allreduce-rab1.c
+++ b/src/smpi/colls/allreduce-rab1.cpp
@@ -20,7 +20,7 @@ int smpi_coll_tuned_allreduce_rab1(void *sbuff, void *rbuff,
 
   void *recv, *tmp_buf;
 
-  unsigned int rank = smpi_comm_rank(comm);
+  int rank = smpi_comm_rank(comm);
   unsigned int nprocs = smpi_comm_size(comm);
 
   if((nprocs&(nprocs-1)))
diff --git a/src/smpi/colls/allreduce-rab2.c b/src/smpi/colls/allreduce-rab2.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-rab2.c
rename to src/smpi/colls/allreduce-rab2.cpp
diff --git a/src/smpi/colls/allreduce-rdb.c b/src/smpi/colls/allreduce-rdb.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-rdb.c
rename to src/smpi/colls/allreduce-rdb.cpp
diff --git a/src/smpi/colls/allreduce-redbcast.c b/src/smpi/colls/allreduce-redbcast.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-redbcast.c
rename to src/smpi/colls/allreduce-redbcast.cpp
diff --git a/src/smpi/colls/allreduce-smp-binomial-pipeline.c b/src/smpi/colls/allreduce-smp-binomial-pipeline.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-smp-binomial-pipeline.c
rename to src/smpi/colls/allreduce-smp-binomial-pipeline.cpp
diff --git a/src/smpi/colls/allreduce-smp-binomial.c b/src/smpi/colls/allreduce-smp-binomial.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-smp-binomial.c
rename to src/smpi/colls/allreduce-smp-binomial.cpp
diff --git a/src/smpi/colls/allreduce-smp-rdb.c b/src/smpi/colls/allreduce-smp-rdb.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-smp-rdb.c
rename to src/smpi/colls/allreduce-smp-rdb.cpp
diff --git a/src/smpi/colls/allreduce-smp-rsag-lr.c b/src/smpi/colls/allreduce-smp-rsag-lr.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-smp-rsag-lr.c
rename to src/smpi/colls/allreduce-smp-rsag-lr.cpp
diff --git a/src/smpi/colls/allreduce-smp-rsag-rab.c b/src/smpi/colls/allreduce-smp-rsag-rab.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-smp-rsag-rab.c
rename to src/smpi/colls/allreduce-smp-rsag-rab.cpp
diff --git a/src/smpi/colls/allreduce-smp-rsag.c b/src/smpi/colls/allreduce-smp-rsag.cpp
similarity index 100%
rename from src/smpi/colls/allreduce-smp-rsag.c
rename to src/smpi/colls/allreduce-smp-rsag.cpp
diff --git a/src/smpi/colls/alltoall-2dmesh.c b/src/smpi/colls/alltoall-2dmesh.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-2dmesh.c
rename to src/smpi/colls/alltoall-2dmesh.cpp
diff --git a/src/smpi/colls/alltoall-3dmesh.c b/src/smpi/colls/alltoall-3dmesh.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-3dmesh.c
rename to src/smpi/colls/alltoall-3dmesh.cpp
diff --git a/src/smpi/colls/alltoall-bruck.c b/src/smpi/colls/alltoall-bruck.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-bruck.c
rename to src/smpi/colls/alltoall-bruck.cpp
diff --git a/src/smpi/colls/alltoall-mvapich-scatter-dest.c b/src/smpi/colls/alltoall-mvapich-scatter-dest.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-mvapich-scatter-dest.c
rename to src/smpi/colls/alltoall-mvapich-scatter-dest.cpp
diff --git a/src/smpi/colls/alltoall-pair-light-barrier.c b/src/smpi/colls/alltoall-pair-light-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-pair-light-barrier.c
rename to src/smpi/colls/alltoall-pair-light-barrier.cpp
diff --git a/src/smpi/colls/alltoall-pair-mpi-barrier.c b/src/smpi/colls/alltoall-pair-mpi-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-pair-mpi-barrier.c
rename to src/smpi/colls/alltoall-pair-mpi-barrier.cpp
diff --git a/src/smpi/colls/alltoall-pair-one-barrier.c b/src/smpi/colls/alltoall-pair-one-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-pair-one-barrier.c
rename to src/smpi/colls/alltoall-pair-one-barrier.cpp
diff --git a/src/smpi/colls/alltoall-pair.c b/src/smpi/colls/alltoall-pair.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-pair.c
rename to src/smpi/colls/alltoall-pair.cpp
diff --git a/src/smpi/colls/alltoall-rdb.c b/src/smpi/colls/alltoall-rdb.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-rdb.c
rename to src/smpi/colls/alltoall-rdb.cpp
diff --git a/src/smpi/colls/alltoall-ring-light-barrier.c b/src/smpi/colls/alltoall-ring-light-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-ring-light-barrier.c
rename to src/smpi/colls/alltoall-ring-light-barrier.cpp
diff --git a/src/smpi/colls/alltoall-ring-mpi-barrier.c b/src/smpi/colls/alltoall-ring-mpi-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-ring-mpi-barrier.c
rename to src/smpi/colls/alltoall-ring-mpi-barrier.cpp
diff --git a/src/smpi/colls/alltoall-ring-one-barrier.c b/src/smpi/colls/alltoall-ring-one-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-ring-one-barrier.c
rename to src/smpi/colls/alltoall-ring-one-barrier.cpp
diff --git a/src/smpi/colls/alltoall-ring.c b/src/smpi/colls/alltoall-ring.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-ring.c
rename to src/smpi/colls/alltoall-ring.cpp
diff --git a/src/smpi/colls/alltoallv-bruck.c b/src/smpi/colls/alltoallv-bruck.cpp
similarity index 100%
rename from src/smpi/colls/alltoallv-bruck.c
rename to src/smpi/colls/alltoallv-bruck.cpp
diff --git a/src/smpi/colls/alltoallv-ompi-basic-linear.c b/src/smpi/colls/alltoallv-ompi-basic-linear.cpp
similarity index 97%
rename from src/smpi/colls/alltoallv-ompi-basic-linear.c
rename to src/smpi/colls/alltoallv-ompi-basic-linear.cpp
index c4218e8db7..6b170be8f3 100644
--- a/src/smpi/colls/alltoallv-ompi-basic-linear.c
+++ b/src/smpi/colls/alltoallv-ompi-basic-linear.cpp
@@ -28,7 +28,7 @@ smpi_coll_tuned_alltoallv_ompi_basic_linear(void *sbuf, int *scounts, int *sdisp
     MPI_Request *preq;
     size = smpi_comm_size(comm);
     rank = smpi_comm_rank(comm);
-    MPI_Request *ireqs= xbt_malloc(sizeof(MPI_Request) * size * 2);
+    MPI_Request *ireqs= static_cast<MPI_Request*>(xbt_malloc(sizeof(MPI_Request) * size * 2));
     XBT_DEBUG(
                  "coll:tuned:alltoallv_intra_basic_linear rank %d", rank);
 
diff --git a/src/smpi/colls/alltoallv-pair-light-barrier.c b/src/smpi/colls/alltoallv-pair-light-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoallv-pair-light-barrier.c
rename to src/smpi/colls/alltoallv-pair-light-barrier.cpp
diff --git a/src/smpi/colls/alltoallv-pair-mpi-barrier.c b/src/smpi/colls/alltoallv-pair-mpi-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoallv-pair-mpi-barrier.c
rename to src/smpi/colls/alltoallv-pair-mpi-barrier.cpp
diff --git a/src/smpi/colls/alltoallv-pair-one-barrier.c b/src/smpi/colls/alltoallv-pair-one-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoallv-pair-one-barrier.c
rename to src/smpi/colls/alltoallv-pair-one-barrier.cpp
diff --git a/src/smpi/colls/alltoallv-pair.c b/src/smpi/colls/alltoallv-pair.cpp
similarity index 100%
rename from src/smpi/colls/alltoallv-pair.c
rename to src/smpi/colls/alltoallv-pair.cpp
diff --git a/src/smpi/colls/alltoallv-ring-light-barrier.c b/src/smpi/colls/alltoallv-ring-light-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoallv-ring-light-barrier.c
rename to src/smpi/colls/alltoallv-ring-light-barrier.cpp
diff --git a/src/smpi/colls/alltoallv-ring-mpi-barrier.c b/src/smpi/colls/alltoallv-ring-mpi-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoallv-ring-mpi-barrier.c
rename to src/smpi/colls/alltoallv-ring-mpi-barrier.cpp
diff --git a/src/smpi/colls/alltoallv-ring-one-barrier.c b/src/smpi/colls/alltoallv-ring-one-barrier.cpp
similarity index 100%
rename from src/smpi/colls/alltoallv-ring-one-barrier.c
rename to src/smpi/colls/alltoallv-ring-one-barrier.cpp
diff --git a/src/smpi/colls/alltoallv-ring.c b/src/smpi/colls/alltoallv-ring.cpp
similarity index 100%
rename from src/smpi/colls/alltoallv-ring.c
rename to src/smpi/colls/alltoallv-ring.cpp
diff --git a/src/smpi/colls/barrier-mvapich2-pair.c b/src/smpi/colls/barrier-mvapich2-pair.cpp
similarity index 100%
rename from src/smpi/colls/barrier-mvapich2-pair.c
rename to src/smpi/colls/barrier-mvapich2-pair.cpp
diff --git a/src/smpi/colls/barrier-ompi.c b/src/smpi/colls/barrier-ompi.cpp
similarity index 100%
rename from src/smpi/colls/barrier-ompi.c
rename to src/smpi/colls/barrier-ompi.cpp
diff --git a/src/smpi/colls/bcast-NTSB.c b/src/smpi/colls/bcast-NTSB.cpp
similarity index 100%
rename from src/smpi/colls/bcast-NTSB.c
rename to src/smpi/colls/bcast-NTSB.cpp
diff --git a/src/smpi/colls/bcast-NTSL-Isend.c b/src/smpi/colls/bcast-NTSL-Isend.cpp
similarity index 100%
rename from src/smpi/colls/bcast-NTSL-Isend.c
rename to src/smpi/colls/bcast-NTSL-Isend.cpp
diff --git a/src/smpi/colls/bcast-NTSL.c b/src/smpi/colls/bcast-NTSL.cpp
similarity index 100%
rename from src/smpi/colls/bcast-NTSL.c
rename to src/smpi/colls/bcast-NTSL.cpp
diff --git a/src/smpi/colls/bcast-SMP-binary.c b/src/smpi/colls/bcast-SMP-binary.cpp
similarity index 100%
rename from src/smpi/colls/bcast-SMP-binary.c
rename to src/smpi/colls/bcast-SMP-binary.cpp
diff --git a/src/smpi/colls/bcast-SMP-binomial.c b/src/smpi/colls/bcast-SMP-binomial.cpp
similarity index 100%
rename from src/smpi/colls/bcast-SMP-binomial.c
rename to src/smpi/colls/bcast-SMP-binomial.cpp
diff --git a/src/smpi/colls/bcast-SMP-linear.c b/src/smpi/colls/bcast-SMP-linear.cpp
similarity index 100%
rename from src/smpi/colls/bcast-SMP-linear.c
rename to src/smpi/colls/bcast-SMP-linear.cpp
diff --git a/src/smpi/colls/bcast-arrival-pattern-aware-wait.c b/src/smpi/colls/bcast-arrival-pattern-aware-wait.cpp
similarity index 100%
rename from src/smpi/colls/bcast-arrival-pattern-aware-wait.c
rename to src/smpi/colls/bcast-arrival-pattern-aware-wait.cpp
diff --git a/src/smpi/colls/bcast-arrival-pattern-aware.c b/src/smpi/colls/bcast-arrival-pattern-aware.cpp
similarity index 100%
rename from src/smpi/colls/bcast-arrival-pattern-aware.c
rename to src/smpi/colls/bcast-arrival-pattern-aware.cpp
diff --git a/src/smpi/colls/bcast-arrival-scatter.c b/src/smpi/colls/bcast-arrival-scatter.cpp
similarity index 100%
rename from src/smpi/colls/bcast-arrival-scatter.c
rename to src/smpi/colls/bcast-arrival-scatter.cpp
diff --git a/src/smpi/colls/bcast-binomial-tree.c b/src/smpi/colls/bcast-binomial-tree.cpp
similarity index 100%
rename from src/smpi/colls/bcast-binomial-tree.c
rename to src/smpi/colls/bcast-binomial-tree.cpp
diff --git a/src/smpi/colls/bcast-flattree-pipeline.c b/src/smpi/colls/bcast-flattree-pipeline.cpp
similarity index 100%
rename from src/smpi/colls/bcast-flattree-pipeline.c
rename to src/smpi/colls/bcast-flattree-pipeline.cpp
diff --git a/src/smpi/colls/bcast-flattree.c b/src/smpi/colls/bcast-flattree.cpp
similarity index 100%
rename from src/smpi/colls/bcast-flattree.c
rename to src/smpi/colls/bcast-flattree.cpp
diff --git a/src/smpi/colls/bcast-mvapich-smp.c b/src/smpi/colls/bcast-mvapich-smp.cpp
similarity index 100%
rename from src/smpi/colls/bcast-mvapich-smp.c
rename to src/smpi/colls/bcast-mvapich-smp.cpp
diff --git a/src/smpi/colls/bcast-ompi-pipeline.c b/src/smpi/colls/bcast-ompi-pipeline.cpp
similarity index 98%
rename from src/smpi/colls/bcast-ompi-pipeline.c
rename to src/smpi/colls/bcast-ompi-pipeline.cpp
index 3aebd8cb50..33c43443aa 100644
--- a/src/smpi/colls/bcast-ompi-pipeline.c
+++ b/src/smpi/colls/bcast-ompi-pipeline.cpp
@@ -18,7 +18,7 @@ int smpi_coll_tuned_bcast_ompi_pipeline( void* buffer,
 {
     int count_by_segment = original_count;
     size_t type_size;
-    int segsize =1024  << 7;
+    size_t segsize =1024  << 7;
     //mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module;
     //mca_coll_tuned_comm_t *data = tuned_module->tuned_data;
     
@@ -71,7 +71,7 @@ int smpi_coll_tuned_bcast_ompi_pipeline( void* buffer,
 
     COLL_TUNED_COMPUTED_SEGCOUNT( segsize, type_size, count_by_segment );
 
-    XBT_DEBUG("coll:tuned:bcast_intra_pipeline rank %d ss %5d type_size %lu count_by_segment %d",
+    XBT_DEBUG("coll:tuned:bcast_intra_pipeline rank %d ss %5zu type_size %lu count_by_segment %d",
                  smpi_comm_rank(comm), segsize, (unsigned long)type_size, count_by_segment);
 
 
diff --git a/src/smpi/colls/bcast-ompi-split-bintree.c b/src/smpi/colls/bcast-ompi-split-bintree.cpp
similarity index 99%
rename from src/smpi/colls/bcast-ompi-split-bintree.c
rename to src/smpi/colls/bcast-ompi-split-bintree.cpp
index dae4d27926..c49d2dbdcf 100644
--- a/src/smpi/colls/bcast-ompi-split-bintree.c
+++ b/src/smpi/colls/bcast-ompi-split-bintree.cpp
@@ -66,7 +66,7 @@ smpi_coll_tuned_bcast_ompi_split_bintree ( void* buffer,
                                             int root,
                                             MPI_Comm comm)
 {
-    int segsize ;
+    unsigned int segsize ;
     int rank, size;
     int segindex, i, lr, pair;
     int segcount[2];       /* Number ompi_request_wait_allof elements sent with each segment */
diff --git a/src/smpi/colls/bcast-scatter-LR-allgather.c b/src/smpi/colls/bcast-scatter-LR-allgather.cpp
similarity index 100%
rename from src/smpi/colls/bcast-scatter-LR-allgather.c
rename to src/smpi/colls/bcast-scatter-LR-allgather.cpp
diff --git a/src/smpi/colls/bcast-scatter-rdb-allgather.c b/src/smpi/colls/bcast-scatter-rdb-allgather.cpp
similarity index 100%
rename from src/smpi/colls/bcast-scatter-rdb-allgather.c
rename to src/smpi/colls/bcast-scatter-rdb-allgather.cpp
diff --git a/src/smpi/colls/coll_tuned_topo.c b/src/smpi/colls/coll_tuned_topo.cpp
similarity index 100%
rename from src/smpi/colls/coll_tuned_topo.c
rename to src/smpi/colls/coll_tuned_topo.cpp
diff --git a/src/smpi/colls/colls_global.c b/src/smpi/colls/colls_global.cpp
similarity index 100%
rename from src/smpi/colls/colls_global.c
rename to src/smpi/colls/colls_global.cpp
diff --git a/src/smpi/colls/gather-mvapich.c b/src/smpi/colls/gather-mvapich.cpp
similarity index 98%
rename from src/smpi/colls/gather-mvapich.c
rename to src/smpi/colls/gather-mvapich.cpp
index 033cdb6e92..d1447c17e5 100644
--- a/src/smpi/colls/gather-mvapich.c
+++ b/src/smpi/colls/gather-mvapich.cpp
@@ -305,8 +305,8 @@ int smpi_coll_tuned_gather_mvapich2_two_level(void *sendbuf,
             node_sizes = smpi_comm_get_non_uniform_map(comm);
 
             if (leader_comm_rank == leader_root) {
-                displs = xbt_malloc(sizeof (int) * leader_comm_size);
-                recvcnts = xbt_malloc(sizeof (int) * leader_comm_size);
+                displs =  static_cast<int *>(xbt_malloc(sizeof (int) * leader_comm_size));
+                recvcnts =  static_cast<int *>(xbt_malloc(sizeof (int) * leader_comm_size));
                 if (!displs || !recvcnts) {
                     mpi_errno = MPI_ERR_OTHER;
                     return mpi_errno;
diff --git a/src/smpi/colls/gather-ompi.c b/src/smpi/colls/gather-ompi.cpp
similarity index 100%
rename from src/smpi/colls/gather-ompi.c
rename to src/smpi/colls/gather-ompi.cpp
diff --git a/src/smpi/colls/reduce-NTSL.c b/src/smpi/colls/reduce-NTSL.cpp
similarity index 100%
rename from src/smpi/colls/reduce-NTSL.c
rename to src/smpi/colls/reduce-NTSL.cpp
diff --git a/src/smpi/colls/reduce-arrival-pattern-aware.c b/src/smpi/colls/reduce-arrival-pattern-aware.cpp
similarity index 100%
rename from src/smpi/colls/reduce-arrival-pattern-aware.c
rename to src/smpi/colls/reduce-arrival-pattern-aware.cpp
diff --git a/src/smpi/colls/reduce-binomial.c b/src/smpi/colls/reduce-binomial.cpp
similarity index 100%
rename from src/smpi/colls/reduce-binomial.c
rename to src/smpi/colls/reduce-binomial.cpp
diff --git a/src/smpi/colls/reduce-flat-tree.c b/src/smpi/colls/reduce-flat-tree.cpp
similarity index 97%
rename from src/smpi/colls/reduce-flat-tree.c
rename to src/smpi/colls/reduce-flat-tree.cpp
index 8a3140d5e0..685fc2ff04 100644
--- a/src/smpi/colls/reduce-flat-tree.c
+++ b/src/smpi/colls/reduce-flat-tree.cpp
@@ -49,7 +49,7 @@ smpi_coll_tuned_reduce_flat_tree(void *sbuf, void *rbuf, int count,
 
   for (i = size - 2; i >= 0; --i) {
     if (rank == i)
-      inbuf = sbuf;
+      inbuf = static_cast<char*>(sbuf);
     else {
       smpi_mpi_recv(origin, count, dtype, i, tag, comm, &status);
       inbuf = origin;
diff --git a/src/smpi/colls/reduce-mvapich-knomial.c b/src/smpi/colls/reduce-mvapich-knomial.cpp
similarity index 95%
rename from src/smpi/colls/reduce-mvapich-knomial.c
rename to src/smpi/colls/reduce-mvapich-knomial.cpp
index 7ec5c64797..45418ee33a 100644
--- a/src/smpi/colls/reduce-mvapich-knomial.c
+++ b/src/smpi/colls/reduce-mvapich-knomial.cpp
@@ -90,7 +90,7 @@ static int MPIR_Reduce_knomial_trace(int root, int reduce_knomial_factor,
 
     /* Finally, fill up the src array */ 
     if(recv_iter > 0) { 
-        knomial_reduce_src_array = smpi_get_tmp_sendbuffer(sizeof(int)*recv_iter);
+        knomial_reduce_src_array = static_cast<int*>(smpi_get_tmp_sendbuffer(sizeof(int)*recv_iter));
     } 
 
     mask = orig_mask; 
@@ -172,8 +172,8 @@ int smpi_coll_tuned_reduce_mvapich2_knomial (
            &dst, &expected_send_count, &expected_recv_count, &src_array);
 
     if(expected_recv_count > 0 ) {
-        tmp_buf  = xbt_malloc(sizeof(void *)*expected_recv_count);
-        requests = xbt_malloc(sizeof(MPI_Request)*expected_recv_count);
+        tmp_buf  = static_cast<void**>(xbt_malloc(sizeof(void *)*expected_recv_count));
+        requests = static_cast<MPI_Request*>(xbt_malloc(sizeof(MPI_Request)*expected_recv_count));
         for(k=0; k < expected_recv_count; k++ ) {
             tmp_buf[k] = smpi_get_tmp_sendbuffer(count*(MAX(extent,true_extent)));
             tmp_buf[k] = (void *)((char*)tmp_buf[k] - true_lb);
diff --git a/src/smpi/colls/reduce-mvapich-two-level.c b/src/smpi/colls/reduce-mvapich-two-level.cpp
similarity index 100%
rename from src/smpi/colls/reduce-mvapich-two-level.c
rename to src/smpi/colls/reduce-mvapich-two-level.cpp
diff --git a/src/smpi/colls/reduce-ompi.c b/src/smpi/colls/reduce-ompi.cpp
similarity index 100%
rename from src/smpi/colls/reduce-ompi.c
rename to src/smpi/colls/reduce-ompi.cpp
diff --git a/src/smpi/colls/reduce-rab.c b/src/smpi/colls/reduce-rab.cpp
similarity index 98%
rename from src/smpi/colls/reduce-rab.c
rename to src/smpi/colls/reduce-rab.cpp
index 61653b7b98..f529bd8364 100644
--- a/src/smpi/colls/reduce-rab.c
+++ b/src/smpi/colls/reduce-rab.cpp
@@ -594,14 +594,14 @@ static int MPI_I_anyReduce(void* Sendbuf, void* Recvbuf, int count, MPI_Datatype
     MPI_Type_extent(mpi_datatype, &typelng);
     scrlng  = typelng * count;
 #ifdef NO_CACHE_OPTIMIZATION
-    scr1buf = malloc(scrlng);
-    scr2buf = malloc(scrlng);
-    scr3buf = malloc(scrlng);
+    scr1buf = static_cast<char*>(xbt_malloc(scrlng));
+    scr2buf = static_cast<char*>(xbt_malloc(scrlng));
+    scr3buf = static_cast<char*>(xbt_malloc(scrlng));
 #else
 #  ifdef SCR_LNG_OPTIM
     scrlng = SCR_LNG_OPTIM(scrlng);
 #  endif
-    scr2buf = malloc(3*scrlng);   /* To test cache problems.     */
+    scr2buf = static_cast<char*>(xbt_malloc(3*scrlng));   /* To test cache problems.     */
     scr1buf = scr2buf + 1*scrlng; /* scr1buf and scr3buf must not*/
     scr3buf = scr2buf + 2*scrlng; /* be used for malloc because  */
                                   /* they are interchanged below.*/
@@ -913,9 +913,9 @@ static int MPI_I_anyReduce(void* Sendbuf, void* Recvbuf, int count, MPI_Datatype
     }
 
 #   ifdef NO_CACHE_TESTING
-     free(scr1buf); free(scr2buf); free(scr3buf);
+     xbt_free(scr1buf); xbt_free(scr2buf); xbt_free(scr3buf);
 #   else
-     free(scr2buf); /* scr1buf and scr3buf are part of scr2buf */
+     xbt_free(scr2buf); /* scr1buf and scr3buf are part of scr2buf */
 #   endif
     return(MPI_SUCCESS);
   } /* new_prot */
diff --git a/src/smpi/colls/reduce-scatter-gather.c b/src/smpi/colls/reduce-scatter-gather.cpp
similarity index 100%
rename from src/smpi/colls/reduce-scatter-gather.c
rename to src/smpi/colls/reduce-scatter-gather.cpp
diff --git a/src/smpi/colls/reduce_scatter-mpich.c b/src/smpi/colls/reduce_scatter-mpich.cpp
similarity index 99%
rename from src/smpi/colls/reduce_scatter-mpich.c
rename to src/smpi/colls/reduce_scatter-mpich.cpp
index 11adf04c5d..b01fbd0279 100644
--- a/src/smpi/colls/reduce_scatter-mpich.c
+++ b/src/smpi/colls/reduce_scatter-mpich.cpp
@@ -209,8 +209,8 @@ int smpi_coll_tuned_reduce_scatter_mpich_noncomm(void *sendbuf, void *recvbuf, i
     size = total_count;
     for (k = 0; k < log2_comm_size; ++k) {
         /* use a double-buffering scheme to avoid local copies */
-        char *incoming_data = (buf0_was_inout ? tmp_buf1 : tmp_buf0);
-        char *outgoing_data = (buf0_was_inout ? tmp_buf0 : tmp_buf1);
+        char *incoming_data = static_cast<char*>(buf0_was_inout ? tmp_buf1 : tmp_buf0);
+        char *outgoing_data = static_cast<char*>(buf0_was_inout ? tmp_buf0 : tmp_buf1);
         int peer = rank ^ (0x1 << k);
         size /= 2;
 
diff --git a/src/smpi/colls/reduce_scatter-ompi.c b/src/smpi/colls/reduce_scatter-ompi.cpp
similarity index 100%
rename from src/smpi/colls/reduce_scatter-ompi.c
rename to src/smpi/colls/reduce_scatter-ompi.cpp
diff --git a/src/smpi/colls/scatter-mvapich-two-level.c b/src/smpi/colls/scatter-mvapich-two-level.cpp
similarity index 95%
rename from src/smpi/colls/scatter-mvapich-two-level.c
rename to src/smpi/colls/scatter-mvapich-two-level.cpp
index 4cbc64a97c..695f08b1ea 100644
--- a/src/smpi/colls/scatter-mvapich-two-level.c
+++ b/src/smpi/colls/scatter-mvapich-two-level.cpp
@@ -147,8 +147,8 @@ int smpi_coll_tuned_scatter_mvapich2_two_level_direct(void *sendbuf,
 
                 if (root != leader_of_root) {
                     if (leader_comm_rank == leader_root) {
-                        displs = xbt_malloc(sizeof (int) * leader_comm_size);
-                        sendcnts = xbt_malloc(sizeof (int) * leader_comm_size);
+                        displs = static_cast<int*>(xbt_malloc(sizeof (int) * leader_comm_size));
+                        sendcnts = static_cast<int*>(xbt_malloc(sizeof (int) * leader_comm_size));
                         sendcnts[0] = node_sizes[0] * nbytes;
                         displs[0] = 0;
 
@@ -163,8 +163,8 @@ int smpi_coll_tuned_scatter_mvapich2_two_level_direct(void *sendbuf,
                                       MPI_BYTE, leader_root, leader_comm);
                 } else {
                     if (leader_comm_rank == leader_root) {
-                        displs = xbt_malloc(sizeof (int) * leader_comm_size);
-                        sendcnts = xbt_malloc(sizeof (int) * leader_comm_size);
+                        displs = static_cast<int*>(xbt_malloc(sizeof (int) * leader_comm_size));
+                        sendcnts = static_cast<int*>(xbt_malloc(sizeof (int) * leader_comm_size));
                         sendcnts[0] = node_sizes[0] * sendcnt;
                         displs[0] = 0;
 
@@ -328,8 +328,8 @@ int smpi_coll_tuned_scatter_mvapich2_two_level_binomial(void *sendbuf,
 
                 if (root != leader_of_root) {
                     if (leader_comm_rank == leader_root) {
-                        displs = xbt_malloc(sizeof (int) * leader_comm_size);
-                        sendcnts = xbt_malloc(sizeof (int) * leader_comm_size);
+                        displs = static_cast<int*>(xbt_malloc(sizeof (int) * leader_comm_size));
+                        sendcnts = static_cast<int*>(xbt_malloc(sizeof (int) * leader_comm_size));
                         sendcnts[0] = node_sizes[0] * nbytes;
                         displs[0] = 0;
 
@@ -344,8 +344,8 @@ int smpi_coll_tuned_scatter_mvapich2_two_level_binomial(void *sendbuf,
                                       MPI_BYTE, leader_root, leader_comm);
                 } else {
                     if (leader_comm_rank == leader_root) {
-                        displs = xbt_malloc(sizeof (int) * leader_comm_size);
-                        sendcnts = xbt_malloc(sizeof (int) * leader_comm_size);
+                        displs = static_cast<int*>(xbt_malloc(sizeof (int) * leader_comm_size));
+                        sendcnts = static_cast<int*>(xbt_malloc(sizeof (int) * leader_comm_size));
                         sendcnts[0] = node_sizes[0] * sendcnt;
                         displs[0] = 0;
 
diff --git a/src/smpi/colls/scatter-ompi.c b/src/smpi/colls/scatter-ompi.cpp
similarity index 100%
rename from src/smpi/colls/scatter-ompi.c
rename to src/smpi/colls/scatter-ompi.cpp
diff --git a/src/smpi/colls/smpi_intel_mpi_selector.c b/src/smpi/colls/smpi_intel_mpi_selector.cpp
similarity index 99%
rename from src/smpi/colls/smpi_intel_mpi_selector.c
rename to src/smpi/colls/smpi_intel_mpi_selector.cpp
index bdcb1b70cd..c8489238c3 100644
--- a/src/smpi/colls/smpi_intel_mpi_selector.c
+++ b/src/smpi/colls/smpi_intel_mpi_selector.cpp
@@ -15,7 +15,7 @@
 #define INTEL_MAX_NB_PPN  5  /* 1 2 4 8 16 ppn */
 
 typedef struct {
-  int max_size;
+  unsigned int max_size;
   int algo;
 } intel_tuning_table_size_element;
 
diff --git a/src/smpi/colls/smpi_mpich_selector.c b/src/smpi/colls/smpi_mpich_selector.cpp
similarity index 99%
rename from src/smpi/colls/smpi_mpich_selector.c
rename to src/smpi/colls/smpi_mpich_selector.cpp
index a43b6d8214..7ab6a1b66d 100644
--- a/src/smpi/colls/smpi_mpich_selector.c
+++ b/src/smpi/colls/smpi_mpich_selector.cpp
@@ -142,8 +142,8 @@ int smpi_coll_tuned_alltoall_mpich( void *sbuf, int scount,
     size_t dsize, block_dsize;
     communicator_size = smpi_comm_size(comm);
 
-    int short_size=256;
-    int medium_size=32768;
+    unsigned int short_size=256;
+    unsigned int medium_size=32768;
     //short size and comm_size >=8   -> bruck
     
 //     medium size messages and (short messages for comm_size < 8), we
diff --git a/src/smpi/colls/smpi_mvapich2_selector.c b/src/smpi/colls/smpi_mvapich2_selector.cpp
similarity index 99%
rename from src/smpi/colls/smpi_mvapich2_selector.c
rename to src/smpi/colls/smpi_mvapich2_selector.cpp
index 9e64ac3456..54d259dd4b 100644
--- a/src/smpi/colls/smpi_mvapich2_selector.c
+++ b/src/smpi/colls/smpi_mvapich2_selector.cpp
@@ -22,7 +22,7 @@ int smpi_coll_tuned_alltoall_mvapich2( void *sendbuf, int sendcount,
   if(mv2_alltoall_table_ppn_conf==NULL)
     init_mv2_alltoall_tables_stampede();
 
-  int sendtype_size, recvtype_size, nbytes, comm_size;
+  int sendtype_size, recvtype_size, comm_size;
   char * tmp_buf = NULL;
   int mpi_errno=MPI_SUCCESS;
   int range = 0;
@@ -32,7 +32,7 @@ int smpi_coll_tuned_alltoall_mvapich2( void *sendbuf, int sendcount,
 
   sendtype_size=smpi_datatype_size(sendtype);
   recvtype_size=smpi_datatype_size(recvtype);
-  nbytes = sendtype_size * sendcount;
+  long nbytes = sendtype_size * sendcount;
 
   /* check if safe to use partial subscription mode */
 
@@ -88,7 +88,7 @@ int smpi_coll_tuned_allgather_mvapich2(void *sendbuf, int sendcount, MPI_Datatyp
 {
 
   int mpi_errno = MPI_SUCCESS;
-  int nbytes = 0, comm_size, recvtype_size;
+  long nbytes = 0, comm_size, recvtype_size;
   int range = 0;
   int partial_sub_ok = 0;
   int conf_index = 0;
@@ -201,7 +201,7 @@ int smpi_coll_tuned_gather_mvapich2(void *sendbuf,
   int range = 0;
   int range_threshold = 0;
   int range_intra_threshold = 0;
-  int nbytes = 0;
+  long nbytes = 0;
   int comm_size = 0;
   int recvtype_size, sendtype_size;
   int rank = -1;
@@ -271,7 +271,7 @@ int smpi_coll_tuned_allgatherv_mvapich2(void *sendbuf, int sendcount, MPI_Dataty
   int mpi_errno = MPI_SUCCESS;
   int range = 0, comm_size, total_count, recvtype_size, i;
   int range_threshold = 0;
-  int nbytes = 0;
+  long nbytes = 0;
 
   if(mv2_allgatherv_thresholds_table==NULL)
     init_mv2_allgatherv_tables_stampede();
@@ -354,7 +354,7 @@ int smpi_coll_tuned_allreduce_mvapich2(void *sendbuf,
   /* check if multiple threads are calling this collective function */
 
   MPI_Aint sendtype_size = 0;
-  int nbytes = 0;
+  long nbytes = 0;
   int range = 0, range_threshold = 0, range_threshold_intra = 0;
   int is_two_level = 0;
   int is_commutative = 0;
@@ -484,7 +484,7 @@ int smpi_coll_tuned_bcast_mvapich2(void *buffer,
     int mpi_errno = MPI_SUCCESS;
     int comm_size/*, rank*/;
     int two_level_bcast = 1;
-    size_t nbytes = 0; 
+    long nbytes = 0; 
     int range = 0;
     int range_threshold = 0;
     int range_threshold_intra = 0;
@@ -528,7 +528,7 @@ int smpi_coll_tuned_bcast_mvapich2(void *buffer,
    /* } else {
         MPIR_Pack_size_impl(1, datatype, &type_size);
     }*/
-    nbytes = (size_t) (count) * (type_size);
+    nbytes =  (count) * (type_size);
 
     /* Search for the corresponding system size inside the tuning table */
     while ((range < (mv2_size_bcast_tuning_table - 1)) &&
@@ -693,7 +693,7 @@ int smpi_coll_tuned_reduce_mvapich2( void *sendbuf,
   int range_intra_threshold = 0;
   int is_commutative, pof2;
   int comm_size = 0;
-  int nbytes = 0;
+  long nbytes = 0;
   int sendtype_size;
   int is_two_level = 0;
 
@@ -806,7 +806,7 @@ int smpi_coll_tuned_reduce_scatter_mvapich2(void *sendbuf, void *recvbuf, int *r
   int range = 0;
   int range_threshold = 0;
   int is_commutative = 0;
-  int *disps = xbt_malloc(comm_size * sizeof (int));
+  int *disps = static_cast<int*>(xbt_malloc(comm_size * sizeof (int)));
 
   if(mv2_red_scat_thresholds_table==NULL)
     init_mv2_reduce_scatter_tables_stampede();
diff --git a/src/smpi/colls/smpi_mvapich2_selector_stampede.h b/src/smpi/colls/smpi_mvapich2_selector_stampede.h
index 6c5601e581..7245090080 100644
--- a/src/smpi/colls/smpi_mvapich2_selector_stampede.h
+++ b/src/smpi/colls/smpi_mvapich2_selector_stampede.h
@@ -51,13 +51,13 @@ static void init_mv2_alltoall_tables_stampede(){
   mv2_alltoall_num_ppn_conf = 3;
   if(smpi_coll_cleanup_callback==NULL)
     smpi_coll_cleanup_callback=&smpi_coll_cleanup_mvapich2;
-  mv2_alltoall_thresholds_table = xbt_malloc(sizeof(mv2_alltoall_tuning_table *)
-      * mv2_alltoall_num_ppn_conf);
-  table_ptrs = xbt_malloc(sizeof(mv2_alltoall_tuning_table *)
-      * mv2_alltoall_num_ppn_conf);
-  mv2_size_alltoall_tuning_table = xbt_malloc(sizeof(int) *
-      mv2_alltoall_num_ppn_conf);
-  mv2_alltoall_table_ppn_conf = xbt_malloc(mv2_alltoall_num_ppn_conf * sizeof(int));
+  mv2_alltoall_thresholds_table = static_cast<mv2_alltoall_tuning_table**>(xbt_malloc(sizeof(mv2_alltoall_tuning_table *)
+      * mv2_alltoall_num_ppn_conf));
+  table_ptrs = static_cast<mv2_alltoall_tuning_table**>(xbt_malloc(sizeof(mv2_alltoall_tuning_table *)
+      * mv2_alltoall_num_ppn_conf));
+  mv2_size_alltoall_tuning_table = static_cast<int*>(xbt_malloc(sizeof(int) *
+      mv2_alltoall_num_ppn_conf));
+  mv2_alltoall_table_ppn_conf = static_cast<int*>(xbt_malloc(mv2_alltoall_num_ppn_conf * sizeof(int)));
   mv2_alltoall_table_ppn_conf[0] = 1;
   mv2_size_alltoall_tuning_table[0] = 6;
   mv2_alltoall_tuning_table mv2_tmp_alltoall_thresholds_table_1ppn[] = {
@@ -272,7 +272,7 @@ static void init_mv2_alltoall_tables_stampede(){
       agg_table_sum += mv2_size_alltoall_tuning_table[i];
   }
   mv2_alltoall_thresholds_table[0] =
-      xbt_malloc(agg_table_sum * sizeof (mv2_alltoall_tuning_table));
+      static_cast<mv2_alltoall_tuning_table*>(xbt_malloc(agg_table_sum * sizeof (mv2_alltoall_tuning_table)));
   memcpy(mv2_alltoall_thresholds_table[0], table_ptrs[0],
       (sizeof(mv2_alltoall_tuning_table)
           * mv2_size_alltoall_tuning_table[0]));
@@ -346,14 +346,14 @@ static void init_mv2_allgather_tables_stampede(){
   mv2_allgather_tuning_table **table_ptrs = NULL;
   mv2_allgather_num_ppn_conf = 3;
   mv2_allgather_thresholds_table
-  = xbt_malloc(sizeof(mv2_allgather_tuning_table *)
-      * mv2_allgather_num_ppn_conf);
-  table_ptrs = xbt_malloc(sizeof(mv2_allgather_tuning_table *)
-      * mv2_allgather_num_ppn_conf);
-  mv2_size_allgather_tuning_table = xbt_malloc(sizeof(int) *
-      mv2_allgather_num_ppn_conf);
+  = static_cast<mv2_allgather_tuning_table**>(xbt_malloc(sizeof(mv2_allgather_tuning_table *)
+      * mv2_allgather_num_ppn_conf));
+  table_ptrs = static_cast<mv2_allgather_tuning_table**>(xbt_malloc(sizeof(mv2_allgather_tuning_table *)
+      * mv2_allgather_num_ppn_conf));
+  mv2_size_allgather_tuning_table = static_cast<int*>(xbt_malloc(sizeof(int) *
+      mv2_allgather_num_ppn_conf));
   mv2_allgather_table_ppn_conf
-  = xbt_malloc(mv2_allgather_num_ppn_conf * sizeof(int));
+  = static_cast<int*>(xbt_malloc(mv2_allgather_num_ppn_conf * sizeof(int)));
   mv2_allgather_table_ppn_conf[0] = 1;
   mv2_size_allgather_tuning_table[0] = 6;
   mv2_allgather_tuning_table mv2_tmp_allgather_thresholds_table_1ppn[] = {
@@ -541,7 +541,7 @@ static void init_mv2_allgather_tables_stampede(){
       agg_table_sum += mv2_size_allgather_tuning_table[i];
   }
   mv2_allgather_thresholds_table[0] =
-      xbt_malloc(agg_table_sum * sizeof (mv2_allgather_tuning_table));
+      static_cast<mv2_allgather_tuning_table*>(xbt_malloc(agg_table_sum * sizeof (mv2_allgather_tuning_table)));
   memcpy(mv2_allgather_thresholds_table[0], table_ptrs[0],
       (sizeof(mv2_allgather_tuning_table)
           * mv2_size_allgather_tuning_table[0]));
@@ -601,8 +601,8 @@ static void init_mv2_gather_tables_stampede(){
   if(smpi_coll_cleanup_callback==NULL)
     smpi_coll_cleanup_callback=&smpi_coll_cleanup_mvapich2;
   mv2_size_gather_tuning_table=7;
-  mv2_gather_thresholds_table = xbt_malloc(mv2_size_gather_tuning_table*
-      sizeof (mv2_gather_tuning_table));
+  mv2_gather_thresholds_table = static_cast<mv2_gather_tuning_table*>(xbt_malloc(mv2_size_gather_tuning_table*
+      sizeof (mv2_gather_tuning_table)));
   mv2_gather_tuning_table mv2_tmp_gather_thresholds_table[]={
       {16,
           2,{{0, 524288, &MPIR_Gather_MV2_Direct},
@@ -688,8 +688,8 @@ static void init_mv2_allgatherv_tables_stampede(){
   if(smpi_coll_cleanup_callback==NULL)
     smpi_coll_cleanup_callback=&smpi_coll_cleanup_mvapich2;
   mv2_size_allgatherv_tuning_table = 6;
-  mv2_allgatherv_thresholds_table = xbt_malloc(mv2_size_allgatherv_tuning_table *
-      sizeof (mv2_allgatherv_tuning_table));
+  mv2_allgatherv_thresholds_table = static_cast<mv2_allgatherv_tuning_table*>(xbt_malloc(mv2_size_allgatherv_tuning_table *
+      sizeof (mv2_allgatherv_tuning_table)));
   mv2_allgatherv_tuning_table mv2_tmp_allgatherv_thresholds_table[] = {
       {
           16,
@@ -836,8 +836,8 @@ static void init_mv2_allreduce_tables_stampede(){
   if(smpi_coll_cleanup_callback==NULL)
     smpi_coll_cleanup_callback=&smpi_coll_cleanup_mvapich2;
   mv2_size_allreduce_tuning_table = 8;
-  mv2_allreduce_thresholds_table = xbt_malloc(mv2_size_allreduce_tuning_table *
-      sizeof (mv2_allreduce_tuning_table));
+  mv2_allreduce_thresholds_table = static_cast<mv2_allreduce_tuning_table*>(xbt_malloc(mv2_size_allreduce_tuning_table *
+      sizeof (mv2_allreduce_tuning_table)));
   mv2_allreduce_tuning_table mv2_tmp_allreduce_thresholds_table[] = {
       {
           16,
@@ -1036,8 +1036,8 @@ static void init_mv2_bcast_tables_stampede(){
   if(smpi_coll_cleanup_callback==NULL)
     smpi_coll_cleanup_callback=&smpi_coll_cleanup_mvapich2;
   mv2_size_bcast_tuning_table=8;
-  mv2_bcast_thresholds_table = xbt_malloc(mv2_size_bcast_tuning_table *
-  sizeof (mv2_bcast_tuning_table));
+  mv2_bcast_thresholds_table = static_cast<mv2_bcast_tuning_table*>(xbt_malloc(mv2_size_bcast_tuning_table *
+  sizeof (mv2_bcast_tuning_table)));
 
   mv2_bcast_tuning_table mv2_tmp_bcast_thresholds_table[]={
     {
@@ -1305,8 +1305,8 @@ static void init_mv2_reduce_tables_stampede(){
     smpi_coll_cleanup_callback=&smpi_coll_cleanup_mvapich2;
   /*Stampede*/
   mv2_size_reduce_tuning_table = 8;
-  mv2_reduce_thresholds_table = xbt_malloc(mv2_size_reduce_tuning_table *
-      sizeof (mv2_reduce_tuning_table));
+  mv2_reduce_thresholds_table = static_cast<mv2_reduce_tuning_table*>(xbt_malloc(mv2_size_reduce_tuning_table *
+      sizeof (mv2_reduce_tuning_table)));
   mv2_reduce_tuning_table mv2_tmp_reduce_thresholds_table[] = {
       {
           16,
@@ -1548,8 +1548,8 @@ static void init_mv2_reduce_scatter_tables_stampede(){
   if(smpi_coll_cleanup_callback==NULL)
     smpi_coll_cleanup_callback=&smpi_coll_cleanup_mvapich2;
   mv2_size_red_scat_tuning_table = 6;
-  mv2_red_scat_thresholds_table = xbt_malloc(mv2_size_red_scat_tuning_table *
-      sizeof (mv2_red_scat_tuning_table));
+  mv2_red_scat_thresholds_table = static_cast<mv2_red_scat_tuning_table*>(xbt_malloc(mv2_size_red_scat_tuning_table *
+      sizeof (mv2_red_scat_tuning_table)));
   mv2_red_scat_tuning_table mv2_tmp_red_scat_thresholds_table[] = {
       {
           16,
@@ -1679,14 +1679,14 @@ static void init_mv2_scatter_tables_stampede(){
     mv2_scatter_tuning_table **table_ptrs = NULL;
     mv2_scatter_num_ppn_conf = 3;
     mv2_scatter_thresholds_table
-    = xbt_malloc(sizeof(mv2_scatter_tuning_table *)
-        * mv2_scatter_num_ppn_conf);
-    table_ptrs = xbt_malloc(sizeof(mv2_scatter_tuning_table *)
-        * mv2_scatter_num_ppn_conf);
-    mv2_size_scatter_tuning_table = xbt_malloc(sizeof(int) *
-        mv2_scatter_num_ppn_conf);
+    = static_cast<mv2_scatter_tuning_table**>(xbt_malloc(sizeof(mv2_scatter_tuning_table *)
+        * mv2_scatter_num_ppn_conf));
+    table_ptrs = static_cast<mv2_scatter_tuning_table**>(xbt_malloc(sizeof(mv2_scatter_tuning_table *)
+        * mv2_scatter_num_ppn_conf));
+    mv2_size_scatter_tuning_table = static_cast<int*>(xbt_malloc(sizeof(int) *
+        mv2_scatter_num_ppn_conf));
     mv2_scatter_table_ppn_conf
-    = xbt_malloc(mv2_scatter_num_ppn_conf * sizeof(int));
+    = static_cast<int*>(xbt_malloc(mv2_scatter_num_ppn_conf * sizeof(int)));
     mv2_scatter_table_ppn_conf[0] = 1;
     mv2_size_scatter_tuning_table[0] = 6;
     mv2_scatter_tuning_table mv2_tmp_scatter_thresholds_table_1ppn[] = {
@@ -1967,7 +1967,7 @@ static void init_mv2_scatter_tables_stampede(){
         agg_table_sum += mv2_size_scatter_tuning_table[i];
     }
     mv2_scatter_thresholds_table[0] =
-        xbt_malloc(agg_table_sum * sizeof (mv2_scatter_tuning_table));
+        static_cast<mv2_scatter_tuning_table*>(xbt_malloc(agg_table_sum * sizeof (mv2_scatter_tuning_table)));
     memcpy(mv2_scatter_thresholds_table[0], table_ptrs[0],
         (sizeof(mv2_scatter_tuning_table)
             * mv2_size_scatter_tuning_table[0]));
diff --git a/src/smpi/colls/smpi_openmpi_selector.c b/src/smpi/colls/smpi_openmpi_selector.cpp
similarity index 100%
rename from src/smpi/colls/smpi_openmpi_selector.c
rename to src/smpi/colls/smpi_openmpi_selector.cpp
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 4be1c2fabc..c0a45a9775 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -104,108 +104,108 @@ set(EXTRA_DIST
   )
 
 set(SMPI_SRC
-  src/smpi/colls/allgather-2dmesh.c
-  src/smpi/colls/allgather-3dmesh.c
-  src/smpi/colls/allgather-GB.c
-  src/smpi/colls/allgather-NTSLR-NB.c
-  src/smpi/colls/allgather-NTSLR.c
-  src/smpi/colls/allgather-SMP-NTS.c
-  src/smpi/colls/allgather-bruck.c
-  src/smpi/colls/allgather-loosely-lr.c
-  src/smpi/colls/allgather-ompi-neighborexchange.c
-  src/smpi/colls/allgather-pair.c
-  src/smpi/colls/allgather-mvapich-smp.c
-  src/smpi/colls/allgather-rdb.c
-  src/smpi/colls/allgather-rhv.c
-  src/smpi/colls/allgather-ring.c
-  src/smpi/colls/allgather-smp-simple.c
-  src/smpi/colls/allgather-spreading-simple.c
-  src/smpi/colls/allgatherv-GB.c
-  src/smpi/colls/allgatherv-mpich-rdb.c
-  src/smpi/colls/allgatherv-mpich-ring.c
-  src/smpi/colls/allgatherv-ompi-bruck.c
-  src/smpi/colls/allgatherv-ompi-neighborexchange.c
-  src/smpi/colls/allgatherv-pair.c
-  src/smpi/colls/allgatherv-ring.c
-  src/smpi/colls/allreduce-lr.c
-  src/smpi/colls/allreduce-ompi-ring-segmented.c
-  src/smpi/colls/allreduce-rab-rdb.c
-  src/smpi/colls/allreduce-rab1.c
-  src/smpi/colls/allreduce-rab2.c
-  src/smpi/colls/allreduce-rdb.c
-  src/smpi/colls/allreduce-redbcast.c
-  src/smpi/colls/allreduce-smp-binomial-pipeline.c
-  src/smpi/colls/allreduce-smp-binomial.c
-  src/smpi/colls/allreduce-smp-rdb.c
-  src/smpi/colls/allreduce-smp-rsag-lr.c
-  src/smpi/colls/allreduce-smp-rsag-rab.c
-  src/smpi/colls/allreduce-smp-rsag.c
-  src/smpi/colls/allreduce-mvapich-rs.c
-  src/smpi/colls/allreduce-mvapich-two-level.c
-  src/smpi/colls/alltoall-2dmesh.c
-  src/smpi/colls/alltoall-3dmesh.c
-#  src/smpi/colls/alltoall-bruck.c
-  src/smpi/colls/alltoall-pair-light-barrier.c
-  src/smpi/colls/alltoall-pair-mpi-barrier.c
-  src/smpi/colls/alltoall-pair-one-barrier.c
-  src/smpi/colls/alltoall-pair.c
-  src/smpi/colls/alltoall-rdb.c
-  src/smpi/colls/alltoall-ring-light-barrier.c
-  src/smpi/colls/alltoall-ring-mpi-barrier.c
-  src/smpi/colls/alltoall-ring-one-barrier.c
-  src/smpi/colls/alltoall-ring.c
-  src/smpi/colls/alltoall-mvapich-scatter-dest.c
-  src/smpi/colls/alltoallv-bruck.c
-  src/smpi/colls/alltoallv-ompi-basic-linear.c
-  src/smpi/colls/alltoallv-pair-light-barrier.c
-  src/smpi/colls/alltoallv-pair-mpi-barrier.c
-  src/smpi/colls/alltoallv-pair-one-barrier.c
-  src/smpi/colls/alltoallv-pair.c
-  src/smpi/colls/alltoallv-ring-light-barrier.c
-  src/smpi/colls/alltoallv-ring-mpi-barrier.c
-  src/smpi/colls/alltoallv-ring-one-barrier.c
-  src/smpi/colls/alltoallv-ring.c
-  src/smpi/colls/barrier-ompi.c
-  src/smpi/colls/barrier-mvapich2-pair.c
-  src/smpi/colls/bcast-NTSB.c
-  src/smpi/colls/bcast-NTSL-Isend.c
-  src/smpi/colls/bcast-NTSL.c
-  src/smpi/colls/bcast-SMP-binary.c
-  src/smpi/colls/bcast-SMP-binomial.c
-  src/smpi/colls/bcast-SMP-linear.c
-  src/smpi/colls/bcast-arrival-pattern-aware-wait.c
-  src/smpi/colls/bcast-arrival-pattern-aware.c
-  src/smpi/colls/bcast-arrival-scatter.c
-  src/smpi/colls/bcast-binomial-tree.c
-  src/smpi/colls/bcast-flattree-pipeline.c
-  src/smpi/colls/bcast-flattree.c
-  src/smpi/colls/bcast-ompi-pipeline.c
-  src/smpi/colls/bcast-ompi-split-bintree.c
-  src/smpi/colls/bcast-mvapich-smp.c
-  src/smpi/colls/bcast-scatter-LR-allgather.c
-  src/smpi/colls/bcast-scatter-rdb-allgather.c
-  src/smpi/colls/coll_tuned_topo.c
-  src/smpi/colls/colls_global.c
-  src/smpi/colls/gather-ompi.c
-  src/smpi/colls/gather-mvapich.c
-  src/smpi/colls/reduce-NTSL.c
-  src/smpi/colls/reduce-arrival-pattern-aware.c
-  src/smpi/colls/reduce-binomial.c
-  src/smpi/colls/reduce-flat-tree.c
-  src/smpi/colls/reduce-ompi.c
-  src/smpi/colls/reduce-scatter-gather.c
-  src/smpi/colls/reduce_scatter-mpich.c
-  src/smpi/colls/reduce_scatter-ompi.c
-  src/smpi/colls/reduce-mvapich-knomial.c
-  src/smpi/colls/reduce-mvapich-two-level.c
-  src/smpi/colls/reduce-rab.c
-  src/smpi/colls/scatter-ompi.c
-  src/smpi/colls/scatter-mvapich-two-level.c
+  src/smpi/colls/allgather-2dmesh.cpp
+  src/smpi/colls/allgather-3dmesh.cpp
+  src/smpi/colls/allgather-GB.cpp
+  src/smpi/colls/allgather-NTSLR-NB.cpp
+  src/smpi/colls/allgather-NTSLR.cpp
+  src/smpi/colls/allgather-SMP-NTS.cpp
+  src/smpi/colls/allgather-bruck.cpp
+  src/smpi/colls/allgather-loosely-lr.cpp
+  src/smpi/colls/allgather-ompi-neighborexchange.cpp
+  src/smpi/colls/allgather-pair.cpp
+  src/smpi/colls/allgather-mvapich-smp.cpp
+  src/smpi/colls/allgather-rdb.cpp
+  src/smpi/colls/allgather-rhv.cpp
+  src/smpi/colls/allgather-ring.cpp
+  src/smpi/colls/allgather-smp-simple.cpp
+  src/smpi/colls/allgather-spreading-simple.cpp
+  src/smpi/colls/allgatherv-GB.cpp
+  src/smpi/colls/allgatherv-mpich-rdb.cpp
+  src/smpi/colls/allgatherv-mpich-ring.cpp
+  src/smpi/colls/allgatherv-ompi-bruck.cpp
+  src/smpi/colls/allgatherv-ompi-neighborexchange.cpp
+  src/smpi/colls/allgatherv-pair.cpp
+  src/smpi/colls/allgatherv-ring.cpp
+  src/smpi/colls/allreduce-lr.cpp
+  src/smpi/colls/allreduce-ompi-ring-segmented.cpp
+  src/smpi/colls/allreduce-rab-rdb.cpp
+  src/smpi/colls/allreduce-rab1.cpp
+  src/smpi/colls/allreduce-rab2.cpp
+  src/smpi/colls/allreduce-rdb.cpp
+  src/smpi/colls/allreduce-redbcast.cpp
+  src/smpi/colls/allreduce-smp-binomial-pipeline.cpp
+  src/smpi/colls/allreduce-smp-binomial.cpp
+  src/smpi/colls/allreduce-smp-rdb.cpp
+  src/smpi/colls/allreduce-smp-rsag-lr.cpp
+  src/smpi/colls/allreduce-smp-rsag-rab.cpp
+  src/smpi/colls/allreduce-smp-rsag.cpp
+  src/smpi/colls/allreduce-mvapich-rs.cpp
+  src/smpi/colls/allreduce-mvapich-two-level.cpp
+  src/smpi/colls/alltoall-2dmesh.cpp
+  src/smpi/colls/alltoall-3dmesh.cpp
+#  src/smpi/colls/alltoall-bruck.cpp
+  src/smpi/colls/alltoall-pair-light-barrier.cpp
+  src/smpi/colls/alltoall-pair-mpi-barrier.cpp
+  src/smpi/colls/alltoall-pair-one-barrier.cpp
+  src/smpi/colls/alltoall-pair.cpp
+  src/smpi/colls/alltoall-rdb.cpp
+  src/smpi/colls/alltoall-ring-light-barrier.cpp
+  src/smpi/colls/alltoall-ring-mpi-barrier.cpp
+  src/smpi/colls/alltoall-ring-one-barrier.cpp
+  src/smpi/colls/alltoall-ring.cpp
+  src/smpi/colls/alltoall-mvapich-scatter-dest.cpp
+  src/smpi/colls/alltoallv-bruck.cpp
+  src/smpi/colls/alltoallv-ompi-basic-linear.cpp
+  src/smpi/colls/alltoallv-pair-light-barrier.cpp
+  src/smpi/colls/alltoallv-pair-mpi-barrier.cpp
+  src/smpi/colls/alltoallv-pair-one-barrier.cpp
+  src/smpi/colls/alltoallv-pair.cpp
+  src/smpi/colls/alltoallv-ring-light-barrier.cpp
+  src/smpi/colls/alltoallv-ring-mpi-barrier.cpp
+  src/smpi/colls/alltoallv-ring-one-barrier.cpp
+  src/smpi/colls/alltoallv-ring.cpp
+  src/smpi/colls/barrier-ompi.cpp
+  src/smpi/colls/barrier-mvapich2-pair.cpp
+  src/smpi/colls/bcast-NTSB.cpp
+  src/smpi/colls/bcast-NTSL-Isend.cpp
+  src/smpi/colls/bcast-NTSL.cpp
+  src/smpi/colls/bcast-SMP-binary.cpp
+  src/smpi/colls/bcast-SMP-binomial.cpp
+  src/smpi/colls/bcast-SMP-linear.cpp
+  src/smpi/colls/bcast-arrival-pattern-aware-wait.cpp
+  src/smpi/colls/bcast-arrival-pattern-aware.cpp
+  src/smpi/colls/bcast-arrival-scatter.cpp
+  src/smpi/colls/bcast-binomial-tree.cpp
+  src/smpi/colls/bcast-flattree-pipeline.cpp
+  src/smpi/colls/bcast-flattree.cpp
+  src/smpi/colls/bcast-ompi-pipeline.cpp
+  src/smpi/colls/bcast-ompi-split-bintree.cpp
+  src/smpi/colls/bcast-mvapich-smp.cpp
+  src/smpi/colls/bcast-scatter-LR-allgather.cpp
+  src/smpi/colls/bcast-scatter-rdb-allgather.cpp
+  src/smpi/colls/coll_tuned_topo.cpp
+  src/smpi/colls/colls_global.cpp
+  src/smpi/colls/gather-ompi.cpp
+  src/smpi/colls/gather-mvapich.cpp
+  src/smpi/colls/reduce-NTSL.cpp
+  src/smpi/colls/reduce-arrival-pattern-aware.cpp
+  src/smpi/colls/reduce-binomial.cpp
+  src/smpi/colls/reduce-flat-tree.cpp
+  src/smpi/colls/reduce-ompi.cpp
+  src/smpi/colls/reduce-scatter-gather.cpp
+  src/smpi/colls/reduce_scatter-mpich.cpp
+  src/smpi/colls/reduce_scatter-ompi.cpp
+  src/smpi/colls/reduce-mvapich-knomial.cpp
+  src/smpi/colls/reduce-mvapich-two-level.cpp
+  src/smpi/colls/reduce-rab.cpp
+  src/smpi/colls/scatter-ompi.cpp
+  src/smpi/colls/scatter-mvapich-two-level.cpp
   src/smpi/colls/smpi_automatic_selector.cpp
-  src/smpi/colls/smpi_mpich_selector.c
-  src/smpi/colls/smpi_intel_mpi_selector.c
-  src/smpi/colls/smpi_openmpi_selector.c
-  src/smpi/colls/smpi_mvapich2_selector.c
+  src/smpi/colls/smpi_mpich_selector.cpp
+  src/smpi/colls/smpi_intel_mpi_selector.cpp
+  src/smpi/colls/smpi_openmpi_selector.cpp
+  src/smpi/colls/smpi_mvapich2_selector.cpp
   src/smpi/instr_smpi.cpp
   src/smpi/smpi_base.cpp
   src/smpi/smpi_bench.cpp
-- 
2.20.1