1
1
No code changes
Этот коммит содержится в:
Jeff Squyres 2015-05-05 06:15:15 -07:00
родитель db257cdbc0
Коммит 691b4ec1e5
7 изменённых файлов: 43 добавлений и 43 удалений

Просмотреть файл

@ -6,15 +6,15 @@
# Copyright (c) 2004-2005 The University of Tennessee and The University # Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights # of Tennessee Research Foundation. All rights
# reserved. # reserved.
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, # Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved. # University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
# #
# $HEADER$ # $HEADER$
# #

Просмотреть файл

@ -5,15 +5,15 @@
* Copyright (c) 2004-2005 The University of Tennessee and The University * Copyright (c) 2004-2005 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
* *
* $HEADER$ * $HEADER$
*/ */
@ -34,13 +34,13 @@ BEGIN_C_DECLS
OMPI_DECLSPEC extern mca_io_base_component_2_0_0_t mca_io_romio314_component; OMPI_DECLSPEC extern mca_io_base_component_2_0_0_t mca_io_romio314_component;
/* /*
* global variables, instantiated in module.c * global variables, instantiated in module.c
*/ */
extern opal_mutex_t mca_io_romio314_mutex; extern opal_mutex_t mca_io_romio314_mutex;
extern mca_io_base_module_2_0_0_t mca_io_romio314_module; extern mca_io_base_module_2_0_0_t mca_io_romio314_module;
OMPI_DECLSPEC extern mca_io_base_component_2_0_0_t mca_io_romio314_component; OMPI_DECLSPEC extern mca_io_base_component_2_0_0_t mca_io_romio314_component;
/* /*
* Private data for ROMIO modules * Private data for ROMIO modules
*/ */
struct mca_io_romio314_data_t { struct mca_io_romio314_data_t {
@ -55,7 +55,7 @@ typedef struct mca_io_romio314_data_t mca_io_romio314_data_t;
/* /*
* mca->ROMIO module routines: * mca->ROMIO module routines:
* ROMIO_PREFIX(file_XXX) * ROMIO_PREFIX(file_XXX)
* ROMIO operations names: * ROMIO operations names:
* ROMIO_PREFIX(MPI_File_XXX) * ROMIO_PREFIX(MPI_File_XXX)
@ -172,7 +172,7 @@ int mca_io_romio314_file_get_position (struct ompi_file_t *fh,
int mca_io_romio314_file_get_byte_offset (struct ompi_file_t *fh, int mca_io_romio314_file_get_byte_offset (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
MPI_Offset * disp); MPI_Offset * disp);
/* Section 9.4.4 */ /* Section 9.4.4 */
int mca_io_romio314_file_read_shared (struct ompi_file_t *fh, int mca_io_romio314_file_read_shared (struct ompi_file_t *fh,
void *buf, void *buf,
@ -271,4 +271,4 @@ int mca_io_romio314_file_sync (struct ompi_file_t *fh);
/* End Prototypes */ /* End Prototypes */
END_C_DECLS END_C_DECLS
#endif /* MCA_IO_ROMIO314_H */ #endif /* MCA_IO_ROMIO314_H */

Просмотреть файл

@ -6,7 +6,7 @@
* Copyright (c) 2004-2005 The University of Tennessee and The University * Copyright (c) 2004-2005 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
@ -14,9 +14,9 @@
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
* *
* $HEADER$ * $HEADER$
*/ */
@ -40,13 +40,13 @@ static int close_component(void);
static int init_query(bool enable_progress_threads, static int init_query(bool enable_progress_threads,
bool enable_mpi_threads); bool enable_mpi_threads);
static const struct mca_io_base_module_2_0_0_t * static const struct mca_io_base_module_2_0_0_t *
file_query(struct ompi_file_t *file, file_query(struct ompi_file_t *file,
struct mca_io_base_file_t **private_data, struct mca_io_base_file_t **private_data,
int *priority); int *priority);
static int file_unquery(struct ompi_file_t *file, static int file_unquery(struct ompi_file_t *file,
struct mca_io_base_file_t *private_data); struct mca_io_base_file_t *private_data);
static int delete_query(char *filename, struct ompi_info_t *info, static int delete_query(char *filename, struct ompi_info_t *info,
struct mca_io_base_delete_t **private_data, struct mca_io_base_delete_t **private_data,
bool *usable, int *priorty); bool *usable, int *priorty);
static int delete_select(char *filename, struct ompi_info_t *info, static int delete_select(char *filename, struct ompi_info_t *info,
@ -182,7 +182,7 @@ static int init_query(bool enable_progress_threads,
static const struct mca_io_base_module_2_0_0_t * static const struct mca_io_base_module_2_0_0_t *
file_query(struct ompi_file_t *file, file_query(struct ompi_file_t *file,
struct mca_io_base_file_t **private_data, struct mca_io_base_file_t **private_data,
int *priority) int *priority)
{ {
@ -206,7 +206,7 @@ file_query(struct ompi_file_t *file,
} }
static int file_unquery(struct ompi_file_t *file, static int file_unquery(struct ompi_file_t *file,
struct mca_io_base_file_t *private_data) struct mca_io_base_file_t *private_data)
{ {
/* Free the romio module-specific data that was allocated in /* Free the romio module-specific data that was allocated in
@ -220,7 +220,7 @@ static int file_unquery(struct ompi_file_t *file,
} }
static int delete_query(char *filename, struct ompi_info_t *info, static int delete_query(char *filename, struct ompi_info_t *info,
struct mca_io_base_delete_t **private_data, struct mca_io_base_delete_t **private_data,
bool *usable, int *priority) bool *usable, int *priority)
{ {

Просмотреть файл

@ -5,14 +5,14 @@
* Copyright (c) 2004-2005 The University of Tennessee and The University * Copyright (c) 2004-2005 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
* *
* $HEADER$ * $HEADER$
*/ */
@ -37,7 +37,7 @@ mca_io_romio314_file_open (ompi_communicator_t *comm,
data = (mca_io_romio314_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio314_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_open)(comm, filename, amode, info, ret = ROMIO_PREFIX(MPI_File_open)(comm, filename, amode, info,
&data->romio_fh); &data->romio_fh);
OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);

Просмотреть файл

@ -5,14 +5,14 @@
* Copyright (c) 2004-2005 The University of Tennessee and The University * Copyright (c) 2004-2005 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
* *
* $HEADER$ * $HEADER$
*/ */
@ -164,7 +164,7 @@ mca_io_romio314_file_read_shared (ompi_file_t *fh,
data = (mca_io_romio314_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio314_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_read_shared) (data->romio_fh, buf, count, ROMIO_PREFIX(MPI_File_read_shared) (data->romio_fh, buf, count,
datatype, status); datatype, status);
OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
@ -185,7 +185,7 @@ mca_io_romio314_file_iread_shared (ompi_file_t *fh,
data = (mca_io_romio314_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio314_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_iread_shared) (data->romio_fh, buf, count, ROMIO_PREFIX(MPI_File_iread_shared) (data->romio_fh, buf, count,
datatype, request); datatype, request);
OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
@ -319,7 +319,7 @@ mca_io_romio314_file_read_ordered_end (ompi_file_t *fh,
data = (mca_io_romio314_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio314_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_read_ordered_end) (data->romio_fh, buf, ret = ROMIO_PREFIX(MPI_File_read_ordered_end) (data->romio_fh, buf,
status); status);
OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);

Просмотреть файл

@ -5,14 +5,14 @@
* Copyright (c) 2004-2005 The University of Tennessee and The University * Copyright (c) 2004-2005 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
* *
* $HEADER$ * $HEADER$
*/ */
@ -59,7 +59,7 @@ mca_io_romio314_file_write_at_all (ompi_file_t *fh,
data = (mca_io_romio314_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio314_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_write_at_all) (data->romio_fh, offset, buf, ROMIO_PREFIX(MPI_File_write_at_all) (data->romio_fh, offset, buf,
count, datatype, status); count, datatype, status);
OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
@ -167,7 +167,7 @@ mca_io_romio314_file_write_shared (ompi_file_t *fh,
data = (mca_io_romio314_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio314_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_write_shared) (data->romio_fh, buf, count, ROMIO_PREFIX(MPI_File_write_shared) (data->romio_fh, buf, count,
datatype, status); datatype, status);
OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
@ -226,7 +226,7 @@ mca_io_romio314_file_write_at_all_begin (ompi_file_t *fh,
data = (mca_io_romio314_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio314_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_write_at_all_begin) (data->romio_fh, offset, ret = ROMIO_PREFIX(MPI_File_write_at_all_begin) (data->romio_fh, offset,
buf, count, datatype); buf, count, datatype);
OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
@ -243,7 +243,7 @@ mca_io_romio314_file_write_at_all_end (ompi_file_t *fh,
data = (mca_io_romio314_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio314_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_write_at_all_end) (data->romio_fh, buf, ret = ROMIO_PREFIX(MPI_File_write_at_all_end) (data->romio_fh, buf,
status); status);
OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
@ -312,7 +312,7 @@ mca_io_romio314_file_write_ordered_end (ompi_file_t *fh,
data = (mca_io_romio314_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio314_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_write_ordered_end) (data->romio_fh, buf, ret = ROMIO_PREFIX(MPI_File_write_ordered_end) (data->romio_fh, buf,
status); status);
OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);

Просмотреть файл

@ -5,16 +5,16 @@
* Copyright (c) 2004-2008 The University of Tennessee and The University * Copyright (c) 2004-2008 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
* *
* $HEADER$ * $HEADER$
*/ */
#include "ompi_config.h" #include "ompi_config.h"
@ -29,7 +29,7 @@
* Global functions that do not need to be prototyped in a header * Global functions that do not need to be prototyped in a header
* because ROMIO just expects these functions to exist. * because ROMIO just expects these functions to exist.
*/ */
int MPIR_Status_set_bytes(ompi_status_public_t *status, int MPIR_Status_set_bytes(ompi_status_public_t *status,
struct ompi_datatype_t *datatype, int size); struct ompi_datatype_t *datatype, int size);
void ADIOI_Datatype_iscontig(MPI_Datatype datatype, int *flag); void ADIOI_Datatype_iscontig(MPI_Datatype datatype, int *flag);
@ -109,7 +109,7 @@ mca_io_base_module_2_0_0_t mca_io_romio314_module = {
* MPI status. Conveniently, it maps directly to * MPI status. Conveniently, it maps directly to
* MPI_Status_set_elements (almost like they planned that... hmmm...). * MPI_Status_set_elements (almost like they planned that... hmmm...).
*/ */
int MPIR_Status_set_bytes(ompi_status_public_t *status, int MPIR_Status_set_bytes(ompi_status_public_t *status,
struct ompi_datatype_t *datatype, int nbytes) struct ompi_datatype_t *datatype, int nbytes)
{ {
/* Note that ROMIO is going to give a number of *bytes* here, but /* Note that ROMIO is going to give a number of *bytes* here, but