A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
smpi_comm.c
diff --git
a/src/smpi/smpi_comm.c
b/src/smpi/smpi_comm.c
index
1c36589
..
d462877
100644
(file)
--- a/
src/smpi/smpi_comm.c
+++ b/
src/smpi/smpi_comm.c
@@
-12,8
+12,16
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi,
"Logging specific to SMPI (comm)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi,
"Logging specific to SMPI (comm)");
+
+
+/* Support for cartesian topology was added, but there are 2 other types of
+ * topology, graph et dist graph. In order to support them, we have to add a
+ * field MPIR_Topo_type, and replace the MPI_Topology field by an union. */
+
typedef struct s_smpi_mpi_communicator {
MPI_Group group;
typedef struct s_smpi_mpi_communicator {
MPI_Group group;
+ MPIR_Topo_type topoType;
+ MPI_Topology topo; // to be replaced by an union
int refcount;
} s_smpi_mpi_communicator_t;
int refcount;
} s_smpi_mpi_communicator_t;
@@
-37,7
+45,7
@@
static int smpi_compare_rankmap(const void *a, const void *b)
return 1;
}
return 1;
}
-MPI_Comm smpi_comm_new(MPI_Group group)
+MPI_Comm smpi_comm_new(MPI_Group group
, MPI_Topology topo
)
{
MPI_Comm comm;
{
MPI_Comm comm;
@@
-45,32
+53,52
@@
MPI_Comm smpi_comm_new(MPI_Group group)
comm->group = group;
smpi_group_use(comm->group);
comm->refcount=1;
comm->group = group;
smpi_group_use(comm->group);
comm->refcount=1;
+ comm->topo = topo;
return comm;
}
void smpi_comm_destroy(MPI_Comm comm)
{
return comm;
}
void smpi_comm_destroy(MPI_Comm comm)
{
+ if (comm == MPI_COMM_UNINITIALIZED)
+ comm = smpi_process_comm_world();
smpi_group_unuse(comm->group);
smpi_group_unuse(comm->group);
+ smpi_topo_destroy(comm->topo); // there's no use count on topos
smpi_comm_unuse(comm);
}
MPI_Group smpi_comm_group(MPI_Comm comm)
{
smpi_comm_unuse(comm);
}
MPI_Group smpi_comm_group(MPI_Comm comm)
{
+ if (comm == MPI_COMM_UNINITIALIZED)
+ comm = smpi_process_comm_world();
+
return comm->group;
}
return comm->group;
}
+MPI_Topology smpi_comm_topo(MPI_Comm comm) {
+ if (comm != MPI_COMM_NULL)
+ return comm->topo;
+ return NULL;
+}
+
int smpi_comm_size(MPI_Comm comm)
{
int smpi_comm_size(MPI_Comm comm)
{
+ if (comm == MPI_COMM_UNINITIALIZED)
+ comm = smpi_process_comm_world();
+
return smpi_group_size(smpi_comm_group(comm));
}
int smpi_comm_rank(MPI_Comm comm)
{
return smpi_group_size(smpi_comm_group(comm));
}
int smpi_comm_rank(MPI_Comm comm)
{
+ if (comm == MPI_COMM_UNINITIALIZED)
+ comm = smpi_process_comm_world();
return smpi_group_rank(smpi_comm_group(comm), smpi_process_index());
}
void smpi_comm_get_name (MPI_Comm comm, char* name, int* len)
{
return smpi_group_rank(smpi_comm_group(comm), smpi_process_index());
}
void smpi_comm_get_name (MPI_Comm comm, char* name, int* len)
{
+ if (comm == MPI_COMM_UNINITIALIZED)
+ comm = smpi_process_comm_world();
if(comm == MPI_COMM_WORLD) {
strcpy(name, "WORLD");
*len = 5;
if(comm == MPI_COMM_WORLD) {
strcpy(name, "WORLD");
*len = 5;
@@
-81,6
+109,8
@@
void smpi_comm_get_name (MPI_Comm comm, char* name, int* len)
MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key)
{
MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key)
{
+ if (comm == MPI_COMM_UNINITIALIZED)
+ comm = smpi_process_comm_world();
int system_tag = 123;
int index, rank, size, i, j, count, reqs;
int* sendbuf;
int system_tag = 123;
int index, rank, size, i, j, count, reqs;
int* sendbuf;
@@
-157,15
+187,20
@@
MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key)
}
} /* otherwise, exit with group_out == NULL */
}
}
} /* otherwise, exit with group_out == NULL */
}
- return group_out ? smpi_comm_new(group_out) : MPI_COMM_NULL;
+ return group_out ? smpi_comm_new(group_out
, NULL
) : MPI_COMM_NULL;
}
void smpi_comm_use(MPI_Comm comm){
}
void smpi_comm_use(MPI_Comm comm){
+ if (comm == MPI_COMM_UNINITIALIZED)
+ comm = smpi_process_comm_world();
comm->refcount++;
}
void smpi_comm_unuse(MPI_Comm comm){
comm->refcount++;
}
void smpi_comm_unuse(MPI_Comm comm){
+ if (comm == MPI_COMM_UNINITIALIZED)
+ comm = smpi_process_comm_world();
comm->refcount--;
if(comm->refcount==0)
xbt_free(comm);
}
comm->refcount--;
if(comm->refcount==0)
xbt_free(comm);
}
+