moving the constant objects MPI_GROUP_NULL and MPI_GROUP_EMPTY
to be generated by OBJ_CONSTRUCT. There are two good reasons: - it is now independent of the underlying 'super' object (e.g. if we later in the future decide to switch to a ompi_handle_t, it is basically transparent now). - we can use MPI_GROUP_NULL as the group of MPI_COMM_NULL This commit was SVN r1257.
Этот коммит содержится в:
Edgar Gabriel
родитель
ca30b00d18
Коммит
dc30128b8f
@ -11,35 +11,34 @@
|
||||
#ifndef OMPI_GROUP_H
|
||||
#define OMPI_GROUP_H
|
||||
|
||||
#include "util/output.h"
|
||||
#include "mpi.h"
|
||||
#include "proc/proc.h"
|
||||
#include "class/ompi_pointer_array.h"
|
||||
|
||||
/** This must correspond to the fortran MPI_GROUP_NULL index */
|
||||
#define OMPI_GROUP_NULL_FORTRAN 0
|
||||
|
||||
/** This must correspond to the fortran MPI_GROUP_EMPTY index */
|
||||
#define OMPI_GROUP_EMPTY_FORTRAN 1
|
||||
|
||||
|
||||
/**
|
||||
* Group structure
|
||||
*/
|
||||
struct ompi_group_t {
|
||||
ompi_object_t super; /**< base class */
|
||||
ompi_object_t super; /**< base class */
|
||||
int grp_proc_count; /**< number of processes in group */
|
||||
int grp_my_rank; /**< rank in group */
|
||||
int grp_f_to_c_index; /**< index in Fortran <-> C translation array */
|
||||
int grp_ok_to_free; /**< indicates if it is ok to call group_free()
|
||||
on this group */
|
||||
uint32_t grp_flags; /**< flags, e.g. freed, cannot be freed etc.*/
|
||||
ompi_proc_t **grp_proc_pointers;
|
||||
/**< list of pointers to ompi_proc_t structures
|
||||
for each process in the group */
|
||||
for each process in the group */
|
||||
};
|
||||
typedef struct ompi_group_t ompi_group_t;
|
||||
OBJ_CLASS_DECLARATION(ompi_group_t);
|
||||
|
||||
|
||||
/* Some definitions for the flags */
|
||||
#define OMPI_GROUP_ISFREED 0x00000001
|
||||
#define OMPI_GROUP_INTRINSIC 0x00000002
|
||||
|
||||
#define OMPI_GROUP_IS_INTRINSIC(_group) ((_group)->grp_flags&OMPI_GROUP_INTRINSIC)
|
||||
|
||||
/**
|
||||
* Table for Fortran <-> C group handle conversion
|
||||
*/
|
||||
@ -107,7 +106,7 @@ static inline int ompi_group_size(ompi_group_t *group)
|
||||
*/
|
||||
static inline int ompi_group_rank(ompi_group_t *group)
|
||||
{
|
||||
return group->grp_proc_count;
|
||||
return group->grp_my_rank;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -19,31 +19,13 @@ OBJ_CLASS_INSTANCE(ompi_group_t,
|
||||
* Table for Fortran <-> C group handle conversion
|
||||
*/
|
||||
ompi_pointer_array_t *ompi_group_f_to_c_table;
|
||||
ompi_pointer_array_t ompi_group_table;
|
||||
|
||||
/*
|
||||
* MPI_GROUP_EMPTY
|
||||
* Predefined group objects
|
||||
*/
|
||||
ompi_group_t ompi_mpi_group_empty = {
|
||||
{ NULL, 0 }, /* base class */
|
||||
0, /* number of processes in group */
|
||||
MPI_PROC_NULL, /* rank in group */
|
||||
OMPI_ERROR, /* index in Fortran <-> C translation array */
|
||||
false, /* can't free group */
|
||||
(ompi_proc_t **)NULL /* pointers to ompi_proc_t structures */
|
||||
};
|
||||
|
||||
/*
|
||||
* MPI_GROUP_NULL - defining this group makes it much easier to handle
|
||||
* this group with out special case code
|
||||
*/
|
||||
ompi_group_t ompi_mpi_group_null = {
|
||||
{ NULL, 0 }, /* base class */
|
||||
0, /* number of processes in group */
|
||||
MPI_PROC_NULL, /* rank in group */
|
||||
OMPI_ERROR, /* index in Fortran <-> C translation array */
|
||||
false, /* can't free group */
|
||||
(ompi_proc_t **)NULL /* pointers to ompi_proc_t structures */
|
||||
};
|
||||
ompi_group_t ompi_mpi_group_empty;
|
||||
ompi_group_t ompi_mpi_group_null;
|
||||
|
||||
|
||||
/*
|
||||
@ -111,7 +93,7 @@ static void ompi_group_construct(ompi_group_t *new_group)
|
||||
/* assign entry in fortran <-> c translation array */
|
||||
ret_val = ompi_pointer_array_add(ompi_group_f_to_c_table, new_group);
|
||||
new_group->grp_f_to_c_index = ret_val;
|
||||
new_group->grp_ok_to_free=true;
|
||||
new_group->grp_flags = 0;
|
||||
|
||||
/* return */
|
||||
return;
|
||||
@ -124,7 +106,7 @@ static void ompi_group_construct(ompi_group_t *new_group)
|
||||
static void ompi_group_destruct(ompi_group_t *group)
|
||||
{
|
||||
int proc;
|
||||
|
||||
|
||||
/* decrement proc reference count */
|
||||
for (proc = 0; proc < group->grp_proc_count; proc++) {
|
||||
OBJ_RELEASE(group->grp_proc_pointers[proc]);
|
||||
@ -151,44 +133,25 @@ static void ompi_group_destruct(ompi_group_t *group)
|
||||
*/
|
||||
int ompi_group_init(void)
|
||||
{
|
||||
/* local variables */
|
||||
int return_value, ret_val;
|
||||
|
||||
return_value = OMPI_SUCCESS;
|
||||
|
||||
/* initialize ompi_group_f_to_c_table */
|
||||
ompi_group_f_to_c_table = OBJ_NEW(ompi_pointer_array_t);
|
||||
if (NULL == ompi_group_f_to_c_table) {
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
|
||||
OBJ_CONSTRUCT(&ompi_group_table, ompi_pointer_array_t);
|
||||
ompi_group_f_to_c_table = &ompi_group_table;
|
||||
|
||||
/* add MPI_GROUP_NULL to table */
|
||||
ret_val =
|
||||
ompi_pointer_array_add(ompi_group_f_to_c_table, &ompi_mpi_group_null);
|
||||
if (OMPI_ERROR == ret_val) {
|
||||
return OMPI_ERROR;
|
||||
};
|
||||
/* make sure that MPI_GROUP_NULL is in location in the table */
|
||||
if (OMPI_GROUP_NULL_FORTRAN != ret_val) {
|
||||
return OMPI_ERROR;
|
||||
};
|
||||
ompi_mpi_group_null.grp_f_to_c_index = ret_val;
|
||||
OBJ_CONSTRUCT(&ompi_mpi_group_null, ompi_group_t);
|
||||
ompi_mpi_group_null.grp_proc_count = 0;
|
||||
ompi_mpi_group_null.grp_my_rank = MPI_PROC_NULL;
|
||||
ompi_mpi_group_null.grp_proc_pointers = NULL;
|
||||
ompi_mpi_group_null.grp_flags |= OMPI_GROUP_INTRINSIC;
|
||||
|
||||
/* add MPI_GROUP_EMPTY to table */
|
||||
ret_val =
|
||||
ompi_pointer_array_add(ompi_group_f_to_c_table,
|
||||
&ompi_mpi_group_empty);
|
||||
if (OMPI_ERROR == ret_val) {
|
||||
return OMPI_ERROR;
|
||||
};
|
||||
/* make sure that MPI_GROUP_NULL is in location in the table */
|
||||
if (OMPI_GROUP_EMPTY_FORTRAN != ret_val) {
|
||||
return OMPI_ERROR;
|
||||
};
|
||||
ompi_mpi_group_empty.grp_f_to_c_index = ret_val;
|
||||
/* add MPI_GROUP_EMPTRY to table */
|
||||
OBJ_CONSTRUCT(&ompi_mpi_group_empty, ompi_group_t);
|
||||
ompi_mpi_group_empty.grp_proc_count = 0;
|
||||
ompi_mpi_group_empty.grp_my_rank = MPI_PROC_NULL;
|
||||
ompi_mpi_group_empty.grp_proc_pointers = NULL;
|
||||
ompi_mpi_group_empty.grp_flags |= OMPI_GROUP_INTRINSIC;
|
||||
|
||||
/* return */
|
||||
return return_value;
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
@ -197,13 +160,13 @@ int ompi_group_init(void)
|
||||
*/
|
||||
int ompi_group_finalize(void)
|
||||
{
|
||||
/* local variables */
|
||||
int return_value = OMPI_SUCCESS;
|
||||
ompi_mpi_group_null.grp_flags = 0;
|
||||
OBJ_DESTRUCT(&ompi_mpi_group_null);
|
||||
|
||||
/* remove group for MPI_COMM_WORLD */
|
||||
ompi_mpi_group_null.grp_flags = 0;
|
||||
OBJ_DESTRUCT(&ompi_mpi_group_empty);
|
||||
|
||||
OBJ_RELEASE(ompi_group_f_to_c_table);
|
||||
|
||||
/* return */
|
||||
return return_value;
|
||||
OBJ_DESTRUCT(ompi_group_f_to_c_table);
|
||||
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
@ -13,10 +13,10 @@ void ompi_set_group_rank(ompi_group_t *group, ompi_proc_t *proc_pointer)
|
||||
/* local variables */
|
||||
int proc;
|
||||
|
||||
/* set the rank to proc_null, just in case this process is not
|
||||
/* set the rank to MPI_UNDEFINED, just in case this process is not
|
||||
* in this group
|
||||
*/
|
||||
group->grp_my_rank = MPI_PROC_NULL;
|
||||
group->grp_my_rank = MPI_UNDEFINED;
|
||||
if (NULL != proc_pointer) {
|
||||
/* loop over all procs in the group */
|
||||
for (proc = 0; proc < group->grp_proc_count; proc++) {
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user