Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / colls / allgather-rdb.c

diff --git a/src/smpi/colls/allgather-rdb.c b/src/smpi/colls/allgather-rdb.c
index 520819a..84acf3d 100644 (file)
--- a/src/smpi/colls/allgather-rdb.c
+++ b/src/smpi/colls/allgather-rdb.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2013-2014. 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. */
+
 #include "colls_private.h"
 
 int
@@ -11,10 +17,10 @@ smpi_coll_tuned_allgather_rdb(void *sbuf, int send_count,
   MPI_Aint send_chunk, recv_chunk;
 
   // local int variables
-  int i, j, k, dst, rank, num_procs, send_offset, recv_offset, tree_root;
+  unsigned int i, j, k, dst, send_offset, recv_offset, tree_root;
   int dst_tree_root, rank_tree_root, last_recv_count = 0, num_procs_completed;
   int offset, tmp_mask;
-  int tag = 1;
+  int tag = COLL_TAG_ALLGATHER;
   int mask = 1;
   int success = 0;
   int curr_count = recv_count;
@@ -24,8 +30,8 @@ smpi_coll_tuned_allgather_rdb(void *sbuf, int send_count,
   char *recv_ptr = (char *) rbuf;
 
   // get size of the communicator, followed by rank 
-  num_procs = smpi_comm_size(comm);
-  rank = smpi_comm_rank(comm);
+  unsigned int num_procs = smpi_comm_size(comm);
+  unsigned int rank = smpi_comm_rank(comm);
 
   // get size of single element's type for send buffer and recv buffer
   send_chunk = smpi_datatype_get_extent(send_type);