50aa143ab6
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
166 строки
6.7 KiB
C
166 строки
6.7 KiB
C
/*
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. All rights
|
|
* reserved.
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
* University of Stuttgart. All rights reserved.
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* Copyright (c) 2013-2016 University of Houston. All rights reserved.
|
|
* Copyright (c) 2016 IBM Corp. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#ifndef MCA_SHAREDFP_ADDPROC_H
|
|
#define MCA_SHAREDFP_ADDPROC_H
|
|
|
|
#include "ompi_config.h"
|
|
#include "ompi/mca/mca.h"
|
|
#include "ompi/mca/sharedfp/sharedfp.h"
|
|
#include "ompi/mca/common/ompio/common_ompio.h"
|
|
#include <semaphore.h>
|
|
|
|
BEGIN_C_DECLS
|
|
|
|
int mca_sharedfp_addproc_component_init_query(bool enable_progress_threads,
|
|
bool enable_mpi_threads);
|
|
struct mca_sharedfp_base_module_1_0_0_t *
|
|
mca_sharedfp_addproc_component_file_query (mca_io_ompio_file_t *file, int *priority);
|
|
int mca_sharedfp_addproc_component_file_unquery (mca_io_ompio_file_t *file);
|
|
|
|
int mca_sharedfp_addproc_module_init (mca_io_ompio_file_t *file);
|
|
int mca_sharedfp_addproc_module_finalize (mca_io_ompio_file_t *file);
|
|
|
|
extern int mca_sharedfp_addproc_priority;
|
|
extern int mca_sharedfp_addproc_verbose;
|
|
#if 0
|
|
extern char[MPI_MAX_HOSTNAME_LEN] mca_sharedfp_addproc_control_host;
|
|
#endif
|
|
|
|
OMPI_MODULE_DECLSPEC extern mca_sharedfp_base_component_2_0_0_t mca_sharedfp_addproc_component;
|
|
/*
|
|
* ******************************************************************
|
|
* ********* functions which are implemented in this module *********
|
|
* ******************************************************************
|
|
*/
|
|
/*IMPORANT: Update here when implementing functions from sharedfp API*/
|
|
|
|
int mca_sharedfp_addproc_seek (mca_io_ompio_file_t *fh,
|
|
OMPI_MPI_OFFSET_TYPE offset, int whence);
|
|
int mca_sharedfp_addproc_get_position (mca_io_ompio_file_t *fh,
|
|
OMPI_MPI_OFFSET_TYPE * offset);
|
|
int mca_sharedfp_addproc_file_open (struct ompi_communicator_t *comm,
|
|
const char* filename,
|
|
int amode,
|
|
struct opal_info_t *info,
|
|
mca_io_ompio_file_t *fh);
|
|
int mca_sharedfp_addproc_file_close (mca_io_ompio_file_t *fh);
|
|
int mca_sharedfp_addproc_read (mca_io_ompio_file_t *fh,
|
|
void *buf, int count, MPI_Datatype datatype, MPI_Status *status);
|
|
int mca_sharedfp_addproc_read_ordered (mca_io_ompio_file_t *fh,
|
|
void *buf, int count, struct ompi_datatype_t *datatype,
|
|
ompi_status_public_t *status
|
|
);
|
|
int mca_sharedfp_addproc_read_ordered_begin (mca_io_ompio_file_t *fh,
|
|
void *buf,
|
|
int count,
|
|
struct ompi_datatype_t *datatype);
|
|
int mca_sharedfp_addproc_read_ordered_end (mca_io_ompio_file_t *fh,
|
|
void *buf,
|
|
ompi_status_public_t *status);
|
|
int mca_sharedfp_addproc_iread (mca_io_ompio_file_t *fh,
|
|
void *buf,
|
|
int count,
|
|
struct ompi_datatype_t *datatype,
|
|
ompi_request_t **request);
|
|
int mca_sharedfp_addproc_write (mca_io_ompio_file_t *fh,
|
|
const void *buf,
|
|
int count,
|
|
struct ompi_datatype_t *datatype,
|
|
ompi_status_public_t *status);
|
|
int mca_sharedfp_addproc_write_ordered (mca_io_ompio_file_t *fh,
|
|
const void *buf,
|
|
int count,
|
|
struct ompi_datatype_t *datatype,
|
|
ompi_status_public_t *status);
|
|
int mca_sharedfp_addproc_write_ordered_begin (mca_io_ompio_file_t *fh,
|
|
const void *buf,
|
|
int count,
|
|
struct ompi_datatype_t *datatype);
|
|
int mca_sharedfp_addproc_write_ordered_end (mca_io_ompio_file_t *fh,
|
|
const void *buf,
|
|
ompi_status_public_t *status);
|
|
int mca_sharedfp_addproc_iwrite (mca_io_ompio_file_t *fh,
|
|
const void *buf,
|
|
int count,
|
|
struct ompi_datatype_t *datatype,
|
|
ompi_request_t **request);
|
|
/****************************************************/
|
|
/*The following are structures and definitions *
|
|
* copied over directly from uhio codebase */
|
|
/****************************************************/
|
|
|
|
/*This structure will hang off of the mca_sharedfp_base_data_t's
|
|
*selected_module_data attribute
|
|
*/
|
|
struct mca_sharedfp_addproc_data
|
|
{
|
|
MPI_Comm intercom;
|
|
};
|
|
|
|
typedef struct mca_sharedfp_addproc_data addproc_data;
|
|
|
|
|
|
int mca_sharedfp_addproc_request_position (struct mca_sharedfp_base_data_t * sh,
|
|
int bytes_requested,
|
|
OMPI_MPI_OFFSET_TYPE * offset);
|
|
|
|
#define DO_ACK 0 /* To be set by the Environment Variable*/
|
|
#define REQUEST_TAG 99
|
|
#define ACK_TAG 1
|
|
#define OFFSET_TAG 98
|
|
#define END_TAG 97
|
|
|
|
#define SEEK_END_TAG 91
|
|
#define SEEK_SET_TAG 92
|
|
#define SEEK_CUR_TAG 93
|
|
#define GET_POSITION_TAG 94
|
|
|
|
#define NUM_OF_SPAWNS 1
|
|
|
|
struct list {
|
|
|
|
int procNo;
|
|
long numBytesArrAddr;
|
|
struct list *Next;
|
|
};
|
|
|
|
struct Stat {
|
|
int tag;
|
|
int source;
|
|
long* recvBuff;
|
|
};
|
|
|
|
|
|
double uhio_shared_gettime(void);
|
|
|
|
typedef struct list node;
|
|
typedef struct Stat statusStruct;
|
|
|
|
/*
|
|
* ******************************************************************
|
|
* ************ functions implemented in this module end ************
|
|
* ******************************************************************
|
|
*/
|
|
|
|
END_C_DECLS
|
|
|
|
#endif /* MCA_SHAREDFP_ADDPROC_H */
|