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
Remove duplicated initialization (rank).
[simgrid.git]
/
src
/
smpi
/
smpi_comm.c
diff --git
a/src/smpi/smpi_comm.c
b/src/smpi/smpi_comm.c
index
70267cd
..
8f02e2e
100644
(file)
--- a/
src/smpi/smpi_comm.c
+++ b/
src/smpi/smpi_comm.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010
-2013
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-14,6
+14,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi,
typedef struct s_smpi_mpi_communicator {
MPI_Group group;
typedef struct s_smpi_mpi_communicator {
MPI_Group group;
+ int refcount;
} s_smpi_mpi_communicator_t;
static int smpi_compare_rankmap(const void *a, const void *b)
} s_smpi_mpi_communicator_t;
static int smpi_compare_rankmap(const void *a, const void *b)
@@
-43,13
+44,14
@@
MPI_Comm smpi_comm_new(MPI_Group group)
comm = xbt_new(s_smpi_mpi_communicator_t, 1);
comm->group = group;
smpi_group_use(comm->group);
comm = xbt_new(s_smpi_mpi_communicator_t, 1);
comm->group = group;
smpi_group_use(comm->group);
+ comm->refcount=1;
return comm;
}
void smpi_comm_destroy(MPI_Comm comm)
{
return comm;
}
void smpi_comm_destroy(MPI_Comm comm)
{
- smpi_group_
destroy
(comm->group);
-
xbt_fre
e(comm);
+ smpi_group_
unuse
(comm->group);
+
smpi_comm_unus
e(comm);
}
MPI_Group smpi_comm_group(MPI_Comm comm)
}
MPI_Group smpi_comm_group(MPI_Comm comm)
@@
-67,9
+69,19
@@
int smpi_comm_rank(MPI_Comm comm)
return smpi_group_rank(smpi_comm_group(comm), smpi_process_index());
}
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_WORLD) {
+ strcpy(name, "WORLD");
+ *len = 5;
+ } else {
+ *len = snprintf(name, MPI_MAX_NAME_STRING, "%p", comm);
+ }
+}
+
MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key)
{
MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key)
{
- int system_tag =
666
;
+ int system_tag =
123
;
int index, rank, size, i, j, count, reqs;
int* sendbuf;
int* recvbuf;
int index, rank, size, i, j, count, reqs;
int* sendbuf;
int* recvbuf;
@@
-119,6
+131,7
@@
MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key)
group_root = group_out; /* Save root's group */
}
for(j = 0; j < count; j++) {
group_root = group_out; /* Save root's group */
}
for(j = 0; j < count; j++) {
+ //increment refcounter in order to avoid freeing the group too quick before copy
index = smpi_group_index(group, rankmap[2 * j]);
smpi_group_set_mapping(group_out, index, j);
}
index = smpi_group_index(group, rankmap[2 * j]);
smpi_group_set_mapping(group_out, index, j);
}
@@
-139,7
+152,20
@@
MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key)
} else {
if(color != MPI_UNDEFINED) {
smpi_mpi_recv(&group_out, 1, MPI_PTR, 0, system_tag, comm, MPI_STATUS_IGNORE);
} else {
if(color != MPI_UNDEFINED) {
smpi_mpi_recv(&group_out, 1, MPI_PTR, 0, system_tag, comm, MPI_STATUS_IGNORE);
+ if(group_out){
+ group_out=smpi_group_copy(group_out);
+ }
} /* otherwise, exit with group_out == NULL */
}
return group_out ? smpi_comm_new(group_out) : MPI_COMM_NULL;
}
} /* otherwise, exit with group_out == NULL */
}
return group_out ? smpi_comm_new(group_out) : MPI_COMM_NULL;
}
+
+void smpi_comm_use(MPI_Comm comm){
+ comm->refcount++;
+}
+
+void smpi_comm_unuse(MPI_Comm comm){
+ comm->refcount--;
+ if(comm->refcount==0)
+ xbt_free(comm);
+}