2016-11-23 02:03:20 +03:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2009 Sun Microsystems, Inc All rights reserved.
|
|
|
|
|
* Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
|
|
|
|
|
* Copyright (c) 2012-2013 The University of Tennessee and The University
|
|
|
|
|
* of Tennessee Research Foundation. All rights
|
|
|
|
|
* reserved.
|
|
|
|
|
* Copyright (c) 2012-2013 Inria. All rights reserved.
|
fixes for Dave's get/set info code
The expected sequence of events for processing info during object creation
is that if there's an incoming info arg, it is opal_info_dup()ed into the obj
at obj->s_info first. Then interested components register callbacks for
keys they want to know about using opal_infosubscribe_infosubscribe().
Inside info_subscribe_subscribe() the specified callback() is called with
whatever matching k/v is in the object's info, or with the default. The
return string from the callback goes into the new k/v stored in info, and
the input k/v is saved as __IN_<key>/<val>. It's saved the same way
whether the input came from info or whether it was a default. A null return
from the callback indicates an ignored key/val, and no k/v is stored for
it, but an __IN_<key>/<val> is still kept so we still have access to the
original.
At MPI_*_set_info() time, opal_infosubscribe_change_info() is used. That
function calls the registered callbacks for each item in the provided info.
If the callback returns non-null, the info is updated with that k/v, or if
the callback returns null, that key is deleted from info. An __IN_<key>/<val>
is saved either way, and overwrites any previously saved value.
When MPI_*_get_info() is called, opal_info_dup_mpistandard() is used, which
allows relatively easy changes in interpretation of the standard, by looking
at both the <key>/<val> and __IN_<key>/<val> in info. Right now it does
1. includes system extras, eg k/v defaults not expliclty set by the user
2. omits ignored keys
3. shows input values, not callback modifications, eg not the internal values
Currently the callbacks are doing things like
return some_condition ? "true" : "false"
that is, returning static strings that are not to be freed. If the return
strings start becoming more dynamic in the future I don't see how unallocated
strings could support that, so I'd propose a change for the future that
the callback()s registered with info_subscribe_subscribe() do a strdup on
their return, and we change the callers of callback() to free the strings
it returns (there are only two callers).
Rough outline of the smaller changes spread over the less central files:
comm.c
initialize comm->super.s_info to NULL
copy into comm->super.s_info in comm creation calls that provide info
OBJ_RELEASE comm->super.s_info at free time
comm_init.c
initialize comm->super.s_info to NULL
file.c
copy into file->super.s_info if file creation provides info
OBJ_RELEASE file->super.s_info at free time
win.c
copy into win->super.s_info if win creation provides info
OBJ_RELEASE win->super.s_info at free time
comm_get_info.c
file_get_info.c
win_get_info.c
change_info() if there's no info attached (shouldn't happen if callbacks
are registered)
copy the info for the user
The other category of change is generally addressing compiler warnings where
ompi_info_t and opal_info_t were being used a little too interchangably. An
ompi_info_t* contains an opal_info_t*, at &(ompi_info->super)
Also this commit updates the copyrights.
Signed-off-by: Mark Allen <markalle@us.ibm.com>
2017-01-31 04:29:50 +03:00
|
|
|
* Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
|
2016-11-23 02:03:20 +03:00
|
|
|
* $COPYRIGHT$
|
|
|
|
|
*
|
|
|
|
|
* Additional copyrights may follow
|
|
|
|
|
*
|
|
|
|
|
* $HEADER$
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "ompi_config.h"
|
|
|
|
|
#include "ompi/communicator/communicator.h"
|
|
|
|
|
#include "ompi/group/group.h"
|
|
|
|
|
#include "ompi/request/request.h"
|
|
|
|
|
#include "ompi/op/op.h"
|
|
|
|
|
#include "ompi/datatype/ompi_datatype.h"
|
|
|
|
|
#include "ompi/win/win.h"
|
|
|
|
|
#include "ompi/info/info.h"
|
|
|
|
|
#include "ompi/file/file.h"
|
|
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* See if there is a gap between two fields in a given struct
|
|
|
|
|
*/
|
|
|
|
|
#define GAP_CHECK(NAME, BASE, F1, F2, CGAP) \
|
|
|
|
|
{ \
|
|
|
|
|
offset = (size_t)&BASE.F1 - (size_t)&BASE; \
|
|
|
|
|
exp_offset = ((size_t)&BASE.F2 - (size_t)&BASE) + sizeof(BASE.F2); \
|
|
|
|
|
printf(NAME " offset from base = %lu, sizeof %lu ", offset, sizeof(BASE.F1)); \
|
|
|
|
|
if (CGAP && offset != exp_offset) { \
|
|
|
|
|
printf("(*** gap between " #F1 " and " #F2 " ***)"); \
|
|
|
|
|
} \
|
|
|
|
|
printf("\n"); \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int main(int argc, char **argv) {
|
|
|
|
|
ompi_communicator_t test_comm;
|
|
|
|
|
ompi_group_t test_group;
|
|
|
|
|
ompi_request_t test_req;
|
|
|
|
|
ompi_op_t test_op;
|
|
|
|
|
ompi_win_t test_win;
|
|
|
|
|
ompi_info_t test_info;
|
|
|
|
|
ompi_file_t test_file;
|
|
|
|
|
size_t exp_offset, offset;
|
|
|
|
|
|
|
|
|
|
/* Test Predefined communicator sizes */
|
|
|
|
|
printf("ompi_predefined_communicator_t = %lu bytes\n", sizeof(ompi_predefined_communicator_t));
|
|
|
|
|
printf("ompi_communicator_t = %lu bytes\n", sizeof(ompi_communicator_t));
|
Major structural changes to data types: .super infosubscriber
ompi_communicator_t, ompi_win_t, ompi_file_t all have a super class of type opal_infosubscriber_t instead of a base/super type of opal_object_t (in previous code comm used c_base, but file used super). It may be a bit bold to say that being a subscriber of MPI_Info is the foundational piece that ties these three things together, but if you object, then I would prefer to turn infosubscriber into a more general name that encompasses other common features rather than create a different super class. The key here is that we want to be able to pass comm, win and file objects as if they were opal_infosubscriber_t, so that one routine can heandle all 3 types of objects being passed to it.
MPI_INFO_NULL is still an ompi_predefined_info_t type since an MPI_Info is part of ompi but the internal details of the underlying information concept is part of opal.
An ompi_info_t type still exists for exposure to the user, but it is simply a wrapper for the opal object.
Routines such as ompi_info_dup, etc have all been moved to opal_info_dup and related to the opal directory.
Fortran to C translation tables are only used for MPI_Info that is exposed to the application and are therefore part of the ompi_info_t and not the opal_info_t
The data structure changes are primarily in the following files:
communicator/communicator.h
ompi/info/info.h
ompi/win/win.h
ompi/file/file.h
The following new files were created:
opal/util/info.h
opal/util/info.c
opal/util/info_subscriber.h
opal/util/info_subscriber.c
This infosubscriber concept is that communicators, files and windows can have subscribers that subscribe to any changes in the info associated with the comm/file/window. When xxx_set_info is called, the new info is presented to each subscriber who can modify the info in any way they want. The new value is presented to the next subscriber and so on until all subscribers have had a chance to modify the value. Therefore, the order of subscribers can make a difference but we hope that there is generally only one subscriber that cares or modifies any given key/value pair. The final info is then stored and returned by a call to xxx_get_info.
The new model can be seen in the following files:
ompi/mpi/c/comm_get_info.c
ompi/mpi/c/comm_set_info.c
ompi/mpi/c/file_get_info.c
ompi/mpi/c/file_set_info.c
ompi/mpi/c/win_get_info.c
ompi/mpi/c/win_set_info.c
The current subscribers where changed as follows:
mca/io/ompio/io_ompio_file_open.c
mca/io/ompio/io_ompio_module.c
mca/osc/rmda/osc_rdma_component.c (This one actually subscribes to "no_locks")
mca/osc/sm/osc_sm_component.c (This one actually subscribes to "blocking_fence" and "alloc_shared_contig")
Signed-off-by: Mark Allen <markalle@us.ibm.com>
Conflicts:
AUTHORS
ompi/communicator/comm.c
ompi/debuggers/ompi_mpihandles_dll.c
ompi/file/file.c
ompi/file/file.h
ompi/info/info.c
ompi/mca/io/ompio/io_ompio.h
ompi/mca/io/ompio/io_ompio_file_open.c
ompi/mca/io/ompio/io_ompio_file_set_view.c
ompi/mca/osc/pt2pt/osc_pt2pt.h
ompi/mca/sharedfp/addproc/sharedfp_addproc.h
ompi/mca/sharedfp/addproc/sharedfp_addproc_file_open.c
ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c
ompi/mpi/c/lookup_name.c
ompi/mpi/c/publish_name.c
ompi/mpi/c/unpublish_name.c
opal/mca/mpool/base/mpool_base_alloc.c
opal/util/Makefile.am
2016-01-22 20:02:01 +03:00
|
|
|
GAP_CHECK("c_base", test_comm, super, super, 0);
|
|
|
|
|
GAP_CHECK("c_lock", test_comm, c_lock, super, 1);
|
2016-11-23 02:03:20 +03:00
|
|
|
GAP_CHECK("c_name", test_comm, c_name, c_lock, 1);
|
|
|
|
|
GAP_CHECK("c_contextid", test_comm, c_contextid, c_name, 1);
|
|
|
|
|
GAP_CHECK("c_my_rank", test_comm, c_my_rank, c_contextid, 1);
|
|
|
|
|
GAP_CHECK("c_flags", test_comm, c_flags, c_my_rank, 1);
|
|
|
|
|
GAP_CHECK("c_id_available", test_comm, c_id_available, c_flags, 1);
|
|
|
|
|
GAP_CHECK("c_id_start_index", test_comm, c_id_start_index, c_id_available, 1);
|
|
|
|
|
GAP_CHECK("c_remote_group", test_comm, c_remote_group, c_local_group, 1);
|
|
|
|
|
GAP_CHECK("c_local_comm", test_comm, c_local_comm, c_remote_group, 1);
|
|
|
|
|
GAP_CHECK("c_keyhash", test_comm, c_keyhash, c_local_comm, 1);
|
|
|
|
|
GAP_CHECK("c_cube_dim", test_comm, c_cube_dim, c_keyhash, 1);
|
|
|
|
|
GAP_CHECK("c_topo", test_comm, c_topo, c_cube_dim, 1);
|
|
|
|
|
GAP_CHECK("c_f_to_c_index", test_comm, c_f_to_c_index, c_topo, 1);
|
|
|
|
|
#ifdef OMPI_WANT_PERUSE
|
|
|
|
|
GAP_CHECK("c_peruse_handles", test_comm, c_peruse_handles, c_f_to_c_index, 1);
|
|
|
|
|
GAP_CHECK("error_handler", test_comm, error_handler, c_peruse_handles, 1);
|
|
|
|
|
#else
|
|
|
|
|
GAP_CHECK("error_handler", test_comm, error_handler, c_f_to_c_index, 1);
|
|
|
|
|
#endif
|
|
|
|
|
GAP_CHECK("errhandler_type", test_comm, errhandler_type, error_handler, 1);
|
|
|
|
|
GAP_CHECK("c_pml_comm", test_comm, c_pml_comm, errhandler_type, 1);
|
|
|
|
|
GAP_CHECK("c_coll", test_comm, c_coll, c_pml_comm, 1);
|
|
|
|
|
|
|
|
|
|
/* Test Predefined group sizes */
|
|
|
|
|
printf("=============================================\n");
|
|
|
|
|
printf("ompi_predefined_group_t = %lu bytes\n", sizeof(ompi_predefined_group_t));
|
|
|
|
|
printf("ompi_group_t = %lu bytes\n", sizeof(ompi_group_t));
|
|
|
|
|
GAP_CHECK("grp_proc_count", test_group, grp_proc_count, grp_proc_count, 0);
|
|
|
|
|
GAP_CHECK("grp_my_rank", test_group, grp_my_rank, grp_proc_count, 1);
|
|
|
|
|
GAP_CHECK("grp_f_to_c_index", test_group, grp_f_to_c_index, grp_my_rank, 1);
|
|
|
|
|
GAP_CHECK("grp_proc_pointers", test_group, grp_proc_pointers, grp_f_to_c_index, 1);
|
|
|
|
|
GAP_CHECK("grp_flags", test_group, grp_flags, grp_proc_pointers, 1);
|
|
|
|
|
GAP_CHECK("grp_parent_group_ptr", test_group, grp_parent_group_ptr, grp_flags, 1);
|
|
|
|
|
|
|
|
|
|
/* Test Predefined request sizes */
|
|
|
|
|
printf("=============================================\n");
|
|
|
|
|
printf("ompi_predefined_request_t = %lu bytes\n", sizeof(ompi_predefined_request_t));
|
|
|
|
|
printf("ompi_request_t = %lu bytes\n", sizeof(ompi_request_t));
|
|
|
|
|
GAP_CHECK("super", test_req, super, super, 0);
|
|
|
|
|
GAP_CHECK("req_type", test_req, req_type, super, 1);
|
|
|
|
|
GAP_CHECK("req_status", test_req, req_status, req_type, 1);
|
|
|
|
|
GAP_CHECK("req_complete", test_req, req_complete, req_status, 1);
|
|
|
|
|
GAP_CHECK("req_state", test_req, req_state, req_complete, 1);
|
|
|
|
|
GAP_CHECK("req_persistent", test_req, req_persistent, req_state, 1);
|
|
|
|
|
GAP_CHECK("req_f_to_c_index", test_req, req_f_to_c_index, req_persistent, 1);
|
|
|
|
|
GAP_CHECK("req_free", test_req, req_free, req_f_to_c_index, 1);
|
|
|
|
|
|
|
|
|
|
/* Test Predefined op sizes */
|
|
|
|
|
printf("=============================================\n");
|
|
|
|
|
printf("ompi_predefined_op_t = %lu bytes\n", sizeof(ompi_predefined_op_t));
|
|
|
|
|
printf("ompi_op_t = %lu bytes\n", sizeof(ompi_op_t));
|
|
|
|
|
GAP_CHECK("super", test_op, super, super, 0)
|
|
|
|
|
GAP_CHECK("o_name", test_op, o_name, super, 1)
|
|
|
|
|
GAP_CHECK("o_flags", test_op, o_flags, o_name, 1)
|
|
|
|
|
GAP_CHECK("o_f_to_c_index", test_op, o_f_to_c_index, o_flags, 1)
|
|
|
|
|
GAP_CHECK("o_func", test_op, o_func, o_f_to_c_index, 1)
|
|
|
|
|
GAP_CHECK("o_3buff_instrinsic", test_op, o_3buff_intrinsic, o_func, 1)
|
|
|
|
|
|
|
|
|
|
/* Test Predefined datatype sizes */
|
|
|
|
|
printf("=============================================\n");
|
|
|
|
|
printf("ompi_predefined_datatype_t = %lu bytes\n", sizeof(ompi_predefined_datatype_t));
|
|
|
|
|
printf("ompi_datatype_t = %lu bytes\n", sizeof(ompi_datatype_t));
|
|
|
|
|
|
|
|
|
|
/* Test Predefined win sizes */
|
|
|
|
|
printf("=============================================\n");
|
|
|
|
|
printf("ompi_predefined_win_t = %lu bytes\n", sizeof(ompi_predefined_win_t));
|
|
|
|
|
printf("ompi_win_t = %lu bytes\n", sizeof(ompi_win_t));
|
Major structural changes to data types: .super infosubscriber
ompi_communicator_t, ompi_win_t, ompi_file_t all have a super class of type opal_infosubscriber_t instead of a base/super type of opal_object_t (in previous code comm used c_base, but file used super). It may be a bit bold to say that being a subscriber of MPI_Info is the foundational piece that ties these three things together, but if you object, then I would prefer to turn infosubscriber into a more general name that encompasses other common features rather than create a different super class. The key here is that we want to be able to pass comm, win and file objects as if they were opal_infosubscriber_t, so that one routine can heandle all 3 types of objects being passed to it.
MPI_INFO_NULL is still an ompi_predefined_info_t type since an MPI_Info is part of ompi but the internal details of the underlying information concept is part of opal.
An ompi_info_t type still exists for exposure to the user, but it is simply a wrapper for the opal object.
Routines such as ompi_info_dup, etc have all been moved to opal_info_dup and related to the opal directory.
Fortran to C translation tables are only used for MPI_Info that is exposed to the application and are therefore part of the ompi_info_t and not the opal_info_t
The data structure changes are primarily in the following files:
communicator/communicator.h
ompi/info/info.h
ompi/win/win.h
ompi/file/file.h
The following new files were created:
opal/util/info.h
opal/util/info.c
opal/util/info_subscriber.h
opal/util/info_subscriber.c
This infosubscriber concept is that communicators, files and windows can have subscribers that subscribe to any changes in the info associated with the comm/file/window. When xxx_set_info is called, the new info is presented to each subscriber who can modify the info in any way they want. The new value is presented to the next subscriber and so on until all subscribers have had a chance to modify the value. Therefore, the order of subscribers can make a difference but we hope that there is generally only one subscriber that cares or modifies any given key/value pair. The final info is then stored and returned by a call to xxx_get_info.
The new model can be seen in the following files:
ompi/mpi/c/comm_get_info.c
ompi/mpi/c/comm_set_info.c
ompi/mpi/c/file_get_info.c
ompi/mpi/c/file_set_info.c
ompi/mpi/c/win_get_info.c
ompi/mpi/c/win_set_info.c
The current subscribers where changed as follows:
mca/io/ompio/io_ompio_file_open.c
mca/io/ompio/io_ompio_module.c
mca/osc/rmda/osc_rdma_component.c (This one actually subscribes to "no_locks")
mca/osc/sm/osc_sm_component.c (This one actually subscribes to "blocking_fence" and "alloc_shared_contig")
Signed-off-by: Mark Allen <markalle@us.ibm.com>
Conflicts:
AUTHORS
ompi/communicator/comm.c
ompi/debuggers/ompi_mpihandles_dll.c
ompi/file/file.c
ompi/file/file.h
ompi/info/info.c
ompi/mca/io/ompio/io_ompio.h
ompi/mca/io/ompio/io_ompio_file_open.c
ompi/mca/io/ompio/io_ompio_file_set_view.c
ompi/mca/osc/pt2pt/osc_pt2pt.h
ompi/mca/sharedfp/addproc/sharedfp_addproc.h
ompi/mca/sharedfp/addproc/sharedfp_addproc_file_open.c
ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c
ompi/mpi/c/lookup_name.c
ompi/mpi/c/publish_name.c
ompi/mpi/c/unpublish_name.c
opal/mca/mpool/base/mpool_base_alloc.c
opal/util/Makefile.am
2016-01-22 20:02:01 +03:00
|
|
|
GAP_CHECK("super", test_win, super, super, 0);
|
|
|
|
|
GAP_CHECK("w_lock", test_win, w_lock, super, 1);
|
2016-11-23 02:03:20 +03:00
|
|
|
GAP_CHECK("w_name", test_win, w_name, w_lock, 1);
|
|
|
|
|
GAP_CHECK("w_group", test_win, w_group, w_name, 1);
|
|
|
|
|
GAP_CHECK("w_flags", test_win, w_flags, w_group, 1);
|
|
|
|
|
GAP_CHECK("w_keyhash", test_win, w_keyhash, w_flags, 1);
|
|
|
|
|
GAP_CHECK("w_f_to_c_index", test_win, w_f_to_c_index, w_keyhash, 1);
|
|
|
|
|
GAP_CHECK("error_handler", test_win, error_handler, w_f_to_c_index, 1);
|
|
|
|
|
GAP_CHECK("errhandler_type", test_win, errhandler_type, error_handler, 1);
|
|
|
|
|
GAP_CHECK("w_osc_module", test_win, w_osc_module, errhandler_type, 1);
|
|
|
|
|
|
|
|
|
|
/* Test Predefined info sizes */
|
|
|
|
|
printf("=============================================\n");
|
|
|
|
|
printf("ompi_predefined_info_t = %lu bytes\n", sizeof(ompi_predefined_info_t));
|
|
|
|
|
printf("ompi_info_t = %lu bytes\n", sizeof(ompi_info_t));
|
|
|
|
|
GAP_CHECK("super", test_info, super, super, 0);
|
|
|
|
|
GAP_CHECK("i_f_to_c_index", test_info, i_f_to_c_index, super, 1);
|
Major structural changes to data types: .super infosubscriber
ompi_communicator_t, ompi_win_t, ompi_file_t all have a super class of type opal_infosubscriber_t instead of a base/super type of opal_object_t (in previous code comm used c_base, but file used super). It may be a bit bold to say that being a subscriber of MPI_Info is the foundational piece that ties these three things together, but if you object, then I would prefer to turn infosubscriber into a more general name that encompasses other common features rather than create a different super class. The key here is that we want to be able to pass comm, win and file objects as if they were opal_infosubscriber_t, so that one routine can heandle all 3 types of objects being passed to it.
MPI_INFO_NULL is still an ompi_predefined_info_t type since an MPI_Info is part of ompi but the internal details of the underlying information concept is part of opal.
An ompi_info_t type still exists for exposure to the user, but it is simply a wrapper for the opal object.
Routines such as ompi_info_dup, etc have all been moved to opal_info_dup and related to the opal directory.
Fortran to C translation tables are only used for MPI_Info that is exposed to the application and are therefore part of the ompi_info_t and not the opal_info_t
The data structure changes are primarily in the following files:
communicator/communicator.h
ompi/info/info.h
ompi/win/win.h
ompi/file/file.h
The following new files were created:
opal/util/info.h
opal/util/info.c
opal/util/info_subscriber.h
opal/util/info_subscriber.c
This infosubscriber concept is that communicators, files and windows can have subscribers that subscribe to any changes in the info associated with the comm/file/window. When xxx_set_info is called, the new info is presented to each subscriber who can modify the info in any way they want. The new value is presented to the next subscriber and so on until all subscribers have had a chance to modify the value. Therefore, the order of subscribers can make a difference but we hope that there is generally only one subscriber that cares or modifies any given key/value pair. The final info is then stored and returned by a call to xxx_get_info.
The new model can be seen in the following files:
ompi/mpi/c/comm_get_info.c
ompi/mpi/c/comm_set_info.c
ompi/mpi/c/file_get_info.c
ompi/mpi/c/file_set_info.c
ompi/mpi/c/win_get_info.c
ompi/mpi/c/win_set_info.c
The current subscribers where changed as follows:
mca/io/ompio/io_ompio_file_open.c
mca/io/ompio/io_ompio_module.c
mca/osc/rmda/osc_rdma_component.c (This one actually subscribes to "no_locks")
mca/osc/sm/osc_sm_component.c (This one actually subscribes to "blocking_fence" and "alloc_shared_contig")
Signed-off-by: Mark Allen <markalle@us.ibm.com>
Conflicts:
AUTHORS
ompi/communicator/comm.c
ompi/debuggers/ompi_mpihandles_dll.c
ompi/file/file.c
ompi/file/file.h
ompi/info/info.c
ompi/mca/io/ompio/io_ompio.h
ompi/mca/io/ompio/io_ompio_file_open.c
ompi/mca/io/ompio/io_ompio_file_set_view.c
ompi/mca/osc/pt2pt/osc_pt2pt.h
ompi/mca/sharedfp/addproc/sharedfp_addproc.h
ompi/mca/sharedfp/addproc/sharedfp_addproc_file_open.c
ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c
ompi/mpi/c/lookup_name.c
ompi/mpi/c/publish_name.c
ompi/mpi/c/unpublish_name.c
opal/mca/mpool/base/mpool_base_alloc.c
opal/util/Makefile.am
2016-01-22 20:02:01 +03:00
|
|
|
GAP_CHECK("i_freed", test_info, i_freed, i_f_to_c_index, 1);
|
2016-11-23 02:03:20 +03:00
|
|
|
|
|
|
|
|
/* Test Predefined file sizes */
|
|
|
|
|
printf("=============================================\n");
|
|
|
|
|
printf("ompi_predefined_file_t = %lu bytes\n", sizeof(ompi_predefined_file_t));
|
|
|
|
|
printf("ompi_file_t = %lu bytes\n", sizeof(ompi_file_t));
|
|
|
|
|
GAP_CHECK("super", test_file, super, super, 0);
|
|
|
|
|
GAP_CHECK("f_comm", test_file, f_comm, super, 1);
|
|
|
|
|
GAP_CHECK("f_filename", test_file, f_filename, f_comm, 1);
|
|
|
|
|
GAP_CHECK("f_amode", test_file, f_amode, f_filename, 1);
|
Major structural changes to data types: .super infosubscriber
ompi_communicator_t, ompi_win_t, ompi_file_t all have a super class of type opal_infosubscriber_t instead of a base/super type of opal_object_t (in previous code comm used c_base, but file used super). It may be a bit bold to say that being a subscriber of MPI_Info is the foundational piece that ties these three things together, but if you object, then I would prefer to turn infosubscriber into a more general name that encompasses other common features rather than create a different super class. The key here is that we want to be able to pass comm, win and file objects as if they were opal_infosubscriber_t, so that one routine can heandle all 3 types of objects being passed to it.
MPI_INFO_NULL is still an ompi_predefined_info_t type since an MPI_Info is part of ompi but the internal details of the underlying information concept is part of opal.
An ompi_info_t type still exists for exposure to the user, but it is simply a wrapper for the opal object.
Routines such as ompi_info_dup, etc have all been moved to opal_info_dup and related to the opal directory.
Fortran to C translation tables are only used for MPI_Info that is exposed to the application and are therefore part of the ompi_info_t and not the opal_info_t
The data structure changes are primarily in the following files:
communicator/communicator.h
ompi/info/info.h
ompi/win/win.h
ompi/file/file.h
The following new files were created:
opal/util/info.h
opal/util/info.c
opal/util/info_subscriber.h
opal/util/info_subscriber.c
This infosubscriber concept is that communicators, files and windows can have subscribers that subscribe to any changes in the info associated with the comm/file/window. When xxx_set_info is called, the new info is presented to each subscriber who can modify the info in any way they want. The new value is presented to the next subscriber and so on until all subscribers have had a chance to modify the value. Therefore, the order of subscribers can make a difference but we hope that there is generally only one subscriber that cares or modifies any given key/value pair. The final info is then stored and returned by a call to xxx_get_info.
The new model can be seen in the following files:
ompi/mpi/c/comm_get_info.c
ompi/mpi/c/comm_set_info.c
ompi/mpi/c/file_get_info.c
ompi/mpi/c/file_set_info.c
ompi/mpi/c/win_get_info.c
ompi/mpi/c/win_set_info.c
The current subscribers where changed as follows:
mca/io/ompio/io_ompio_file_open.c
mca/io/ompio/io_ompio_module.c
mca/osc/rmda/osc_rdma_component.c (This one actually subscribes to "no_locks")
mca/osc/sm/osc_sm_component.c (This one actually subscribes to "blocking_fence" and "alloc_shared_contig")
Signed-off-by: Mark Allen <markalle@us.ibm.com>
Conflicts:
AUTHORS
ompi/communicator/comm.c
ompi/debuggers/ompi_mpihandles_dll.c
ompi/file/file.c
ompi/file/file.h
ompi/info/info.c
ompi/mca/io/ompio/io_ompio.h
ompi/mca/io/ompio/io_ompio_file_open.c
ompi/mca/io/ompio/io_ompio_file_set_view.c
ompi/mca/osc/pt2pt/osc_pt2pt.h
ompi/mca/sharedfp/addproc/sharedfp_addproc.h
ompi/mca/sharedfp/addproc/sharedfp_addproc_file_open.c
ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c
ompi/mpi/c/lookup_name.c
ompi/mpi/c/publish_name.c
ompi/mpi/c/unpublish_name.c
opal/mca/mpool/base/mpool_base_alloc.c
opal/util/Makefile.am
2016-01-22 20:02:01 +03:00
|
|
|
GAP_CHECK("f_flags", test_file, f_flags, f_amode, 1);
|
2016-11-23 02:03:20 +03:00
|
|
|
GAP_CHECK("f_f_to_c_index", test_file, f_f_to_c_index, f_flags, 1);
|
|
|
|
|
GAP_CHECK("error_handler", test_file, error_handler, f_f_to_c_index, 1);
|
|
|
|
|
GAP_CHECK("errhandler_type", test_file, errhandler_type, error_handler, 1);
|
|
|
|
|
GAP_CHECK("f_io_version", test_file, f_io_version, errhandler_type, 1);
|
|
|
|
|
GAP_CHECK("f_io_selected_component", test_file, f_io_selected_component, f_io_version, 1);
|
|
|
|
|
GAP_CHECK("f_io_selected_module", test_file, f_io_selected_module, f_io_selected_component, 1);
|
|
|
|
|
GAP_CHECK("f_io_selected_data", test_file, f_io_selected_data, f_io_selected_module, 1);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|