ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

romio314: adhere to the prefix rule

Просмотр исходного кода 
Rename all files and symbols from "io_romio" to "io_romio314".  This
fixes --disable-dlopen builds (because they were missing
the mca_io_romio314_component symbol).
Этот коммит содержится в:
Jeff Squyres 2015-05-05 06:09:05 -07:00
родитель f3ac913338
Коммит db257cdbc0
9 изменённых файлов: 416 добавлений и 415 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
ompi/mca/io/romio314/Makefile.am
Просмотреть файл

@ -22,7 +22,7 @@ EXTRA_DIST = autogen.subdirs
sources = sources =
include src/Makefile.extra include src/Makefile.extra
if MCA_io_romio_SHOULD_BUILD if MCA_io_romio314_SHOULD_BUILD
# Need to set both SUBDIRS and DIST_SUBDIRS due to oddities with AM # Need to set both SUBDIRS and DIST_SUBDIRS due to oddities with AM
SUBDIRS = romio SUBDIRS = romio
DIST_SUBDIRS = romio DIST_SUBDIRS = romio

52
ompi/mca/io/romio314/configure.m4
Просмотреть файл

@ -21,23 +21,23 @@
# #
AC_DEFUN([MCA_ompi_io_romio314_POST_CONFIG], [ AC_DEFUN([MCA_ompi_io_romio314_POST_CONFIG], [
AM_CONDITIONAL([MCA_io_romio_SHOULD_BUILD], [test $1 -eq 1]) AM_CONDITIONAL([MCA_io_romio314_SHOULD_BUILD], [test $1 -eq 1])
]) ])
# MCA_io_romio_CONFIG([action-if-found], [action-if-not-found]) # MCA_io_romio314_CONFIG([action-if-found], [action-if-not-found])
# ----------------------------------------------------------- # -----------------------------------------------------------
AC_DEFUN([MCA_ompi_io_romio314_CONFIG],[ AC_DEFUN([MCA_ompi_io_romio314_CONFIG],[
AC_CONFIG_FILES([ompi/mca/io/romio314/Makefile]) AC_CONFIG_FILES([ompi/mca/io/romio314/Makefile])
OPAL_VAR_SCOPE_PUSH([io_romio_flags io_romio_flags_define io_romio_happy io_romio_save_LIBS]) OPAL_VAR_SCOPE_PUSH([io_romio314_flags io_romio314_flags_define io_romio314_happy io_romio314_save_LIBS])
AC_ARG_ENABLE([io-romio], AC_ARG_ENABLE([io-romio],
[AC_HELP_STRING([--disable-io-romio], [AC_HELP_STRING([--disable-io-romio],
[Disable the ROMIO MPI-IO component])]) [Disable the ROMIO MPI-IO component])])
AC_ARG_WITH([io-romio-flags], AC_ARG_WITH([io-romio-flags],
[AC_HELP_STRING([--with-io-romio-flags=FLAGS], [AC_HELP_STRING([--with-io-romio-flags=FLAGS],
[Pass FLAGS to the ROMIO distribution configuration script])]) [Pass FLAGS to the ROMIO distribution configuration script])])
AC_DEFINE_UNQUOTED([MCA_io_romio_USER_CONFIGURE_FLAGS], ["$with_io_romio_flags"], [Set of user-defined configure flags given to ROMIOs configure script via --with-io-romio-flags]) AC_DEFINE_UNQUOTED([MCA_io_romio314_USER_CONFIGURE_FLAGS], ["$with_io_romio_flags"], [Set of user-defined configure flags given to ROMIOs configure script via --with-io-romio-flags])
AC_MSG_CHECKING([if want ROMIO component]) AC_MSG_CHECKING([if want ROMIO component])
AS_IF([test "$enable_io_romio" = "no"], AS_IF([test "$enable_io_romio" = "no"],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
@ -53,50 +53,50 @@ AC_DEFUN([MCA_ompi_io_romio314_CONFIG],[
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
AS_IF([test -n "$with_io_romio_flags" -a "$with_io_romio_flags" != "no"], AS_IF([test -n "$with_io_romio_flags" -a "$with_io_romio_flags" != "no"],
[io_romio_flags="$with_io_romio_flags $io_romio_flags"], [io_romio314_flags="$with_io_romio_flags $io_romio314_flags"],
[io_romio_flags=]) [io_romio314_flags=])
# If ROMIO is going to end up in a DSO, all we need is # If ROMIO is going to end up in a DSO, all we need is
# shared library-ized objects, as we're only building a # shared library-ized objects, as we're only building a
# DSO (which is always shared). Otherwise, build with # DSO (which is always shared). Otherwise, build with
# same flags as OMPI, as we might need any combination of # same flags as OMPI, as we might need any combination of
# shared and static-ized objects... # shared and static-ized objects...
AS_IF([test "$compile_mode" = "dso"], AS_IF([test "$compile_mode" = "dso"],
[io_romio_shared=enable [io_romio314_shared=enable
io_romio_static=disable], io_romio314_static=disable],
[AS_IF([test "$enable_shared" = "yes"], [AS_IF([test "$enable_shared" = "yes"],
[io_romio_shared=enable], [io_romio314_shared=enable],
[io_romio_shared=disable]) [io_romio314_shared=disable])
AS_IF([test "$enable_static" = "yes"], AS_IF([test "$enable_static" = "yes"],
[io_romio_static=enable], [io_romio314_static=enable],
[io_romio_static=disable])]) [io_romio314_static=disable])])
AS_IF([test -n "$prefix" -a "$prefix" != "NONE"], AS_IF([test -n "$prefix" -a "$prefix" != "NONE"],
[io_romio_prefix_arg="--prefix=$prefix"], [io_romio314_prefix_arg="--prefix=$prefix"],
[io_romio_prefix_arg=]) [io_romio314_prefix_arg=])
AS_IF([test "$cross_compiling" = "yes"], AS_IF([test "$cross_compiling" = "yes"],
[AS_IF([test ! -z $build], [io_romio_flags="$io_romio_flags --build=$build"]) [AS_IF([test ! -z $build], [io_romio314_flags="$io_romio314_flags --build=$build"])
AS_IF([test ! -z $host], [io_romio_flags="$io_romio_flags --host=$host"]) AS_IF([test ! -z $host], [io_romio314_flags="$io_romio314_flags --host=$host"])
AS_IF([test ! -z $target], [io_romio_flags="$io_romio_flags --target=$target"])]) AS_IF([test ! -z $target], [io_romio314_flags="$io_romio314_flags --target=$target"])])
io_romio_flags_define="$io_romio_flags FROM_OMPI=yes CC='$CC' CFLAGS='$CFLAGS -D__EXTENSIONS__' CPPFLAGS='$CPPFLAGS' FFLAGS='$FFLAGS' LDFLAGS='$LDFLAGS' --$io_romio_shared-shared --$io_romio_static-static $io_romio_flags $io_romio_prefix_arg --disable-aio --disable-weak-symbols --enable-strict" io_romio314_flags_define="$io_romio314_flags FROM_OMPI=yes CC='$CC' CFLAGS='$CFLAGS -D__EXTENSIONS__' CPPFLAGS='$CPPFLAGS' FFLAGS='$FFLAGS' LDFLAGS='$LDFLAGS' --$io_romio314_shared-shared --$io_romio314_static-static $io_romio314_flags $io_romio314_prefix_arg --disable-aio --disable-weak-symbols --enable-strict"
AC_DEFINE_UNQUOTED([MCA_io_romio_COMPLETE_CONFIGURE_FLAGS], ["$io_romio_flags_define"], [Complete set of command line arguments given to ROMIOs configure script]) AC_DEFINE_UNQUOTED([MCA_io_romio314_COMPLETE_CONFIGURE_FLAGS], ["$io_romio314_flags_define"], [Complete set of command line arguments given to ROMIOs configure script])
io_romio_flags="$io_romio_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS -D__EXTENSIONS__"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio_shared-shared --$io_romio_static-static $io_romio_flags $io_romio_prefix_arg --disable-aio --disable-weak-symbols --enable-strict" io_romio314_flags="$io_romio314_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS -D__EXTENSIONS__"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio314_shared-shared --$io_romio314_static-static $io_romio314_flags $io_romio314_prefix_arg --disable-aio --disable-weak-symbols --enable-strict"
opal_show_subtitle "Configuring ROMIO distribution" opal_show_subtitle "Configuring ROMIO distribution"
OPAL_CONFIG_SUBDIR([ompi/mca/io/romio314/romio], OPAL_CONFIG_SUBDIR([ompi/mca/io/romio314/romio],
[$io_romio_flags], [$io_romio314_flags],
[io_romio_happy=1], [io_romio_happy=0]) [io_romio314_happy=1], [io_romio314_happy=0])
AS_IF([test "$io_romio_happy" = "1"], AS_IF([test "$io_romio314_happy" = "1"],
[ # grab the libraries list from ROMIO. We don't [ # grab the libraries list from ROMIO. We don't
# need this for building the component, as libtool # need this for building the component, as libtool
# will figure that part out. But we do need it for # will figure that part out. But we do need it for
# the wrapper settings # the wrapper settings
io_romio_save_LIBS="$LIBS" io_romio314_save_LIBS="$LIBS"
LIBS= LIBS=
. ompi/mca/io/romio314/romio/localdefs . ompi/mca/io/romio314/romio/localdefs
io_romio_LIBS="$LIBS" io_romio314_LIBS="$LIBS"
LIBS="$io_romio_save_LIBS" LIBS="$io_romio314_save_LIBS"
echo "ROMIO distribution configured successfully" echo "ROMIO distribution configured successfully"
$1], $1],

13
ompi/mca/io/romio314/src/Makefile.extra
Просмотреть файл

@ -10,6 +10,7 @@
# 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$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -37,10 +38,10 @@ AM_CPPFLAGS = \
-I$(top_builddir) -I$(top_builddir)
sources += \ sources += \
src/io_romio.h \ src/io_romio314.h \
src/io_romio_component.c \ src/io_romio314_component.c \
src/io_romio_file_open.c \ src/io_romio314_file_open.c \
src/io_romio_file_read.c \ src/io_romio314_file_read.c \
src/io_romio_file_write.c \ src/io_romio314_file_write.c \
src/io_romio_module.c src/io_romio314_module.c

118
ompi/mca/io/romio314/src/io_romio.h → ompi/mca/io/romio314/src/io_romio314.h
Просмотреть файл

@ -17,8 +17,8 @@
* $HEADER$ * $HEADER$
*/ */
#ifndef MCA_IO_ROMIO_H #ifndef MCA_IO_ROMIO314_H
#define MCA_IO_ROMIO_H #define MCA_IO_ROMIO314_H
#include "ompi_config.h" #include "ompi_config.h"
#include "opal/threads/mutex.h" #include "opal/threads/mutex.h"
@ -31,22 +31,22 @@
BEGIN_C_DECLS BEGIN_C_DECLS
OMPI_DECLSPEC extern mca_io_base_component_2_0_0_t mca_io_romio_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_romio_mutex; extern opal_mutex_t mca_io_romio314_mutex;
extern mca_io_base_module_2_0_0_t mca_io_romio_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_romio_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_romio_data_t { struct mca_io_romio314_data_t {
ROMIO_PREFIX (MPI_File) romio_fh; ROMIO_PREFIX (MPI_File) romio_fh;
}; };
typedef struct mca_io_romio_data_t mca_io_romio_data_t; typedef struct mca_io_romio314_data_t mca_io_romio314_data_t;
/* /*
@ -61,72 +61,72 @@ typedef struct mca_io_romio_data_t mca_io_romio_data_t;
* ROMIO_PREFIX(MPI_File_XXX) * ROMIO_PREFIX(MPI_File_XXX)
*/ */
/* Section 9.2 */ /* Section 9.2 */
int mca_io_romio_file_open (struct ompi_communicator_t *comm, int mca_io_romio314_file_open (struct ompi_communicator_t *comm,
char *filename, char *filename,
int amode, int amode,
struct ompi_info_t *info, struct ompi_info_t *info,
ompi_file_t *fh); ompi_file_t *fh);
int mca_io_romio_file_close (struct ompi_file_t *fh); int mca_io_romio314_file_close (struct ompi_file_t *fh);
int mca_io_romio_file_delete (char *filename, int mca_io_romio314_file_delete (char *filename,
struct ompi_info_t *info); struct ompi_info_t *info);
int mca_io_romio_file_set_size (struct ompi_file_t *fh, int mca_io_romio314_file_set_size (struct ompi_file_t *fh,
MPI_Offset size); MPI_Offset size);
int mca_io_romio_file_preallocate (struct ompi_file_t *fh, int mca_io_romio314_file_preallocate (struct ompi_file_t *fh,
MPI_Offset size); MPI_Offset size);
int mca_io_romio_file_get_size (struct ompi_file_t *fh, int mca_io_romio314_file_get_size (struct ompi_file_t *fh,
MPI_Offset * size); MPI_Offset * size);
int mca_io_romio_file_get_amode (struct ompi_file_t *fh, int mca_io_romio314_file_get_amode (struct ompi_file_t *fh,
int *amode); int *amode);
int mca_io_romio_file_set_info (struct ompi_file_t *fh, int mca_io_romio314_file_set_info (struct ompi_file_t *fh,
struct ompi_info_t *info); struct ompi_info_t *info);
int mca_io_romio_file_get_info (struct ompi_file_t *fh, int mca_io_romio314_file_get_info (struct ompi_file_t *fh,
struct ompi_info_t ** info_used); struct ompi_info_t ** info_used);
/* Section 9.3 */ /* Section 9.3 */
int mca_io_romio_file_set_view (struct ompi_file_t *fh, int mca_io_romio314_file_set_view (struct ompi_file_t *fh,
MPI_Offset disp, MPI_Offset disp,
struct ompi_datatype_t *etype, struct ompi_datatype_t *etype,
struct ompi_datatype_t *filetype, struct ompi_datatype_t *filetype,
char *datarep, char *datarep,
struct ompi_info_t *info); struct ompi_info_t *info);
int mca_io_romio_file_get_view (struct ompi_file_t *fh, int mca_io_romio314_file_get_view (struct ompi_file_t *fh,
MPI_Offset * disp, MPI_Offset * disp,
struct ompi_datatype_t ** etype, struct ompi_datatype_t ** etype,
struct ompi_datatype_t ** filetype, struct ompi_datatype_t ** filetype,
char *datarep); char *datarep);
/* Section 9.4.2 */ /* Section 9.4.2 */
int mca_io_romio_file_read_at (struct ompi_file_t *fh, int mca_io_romio314_file_read_at (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_read_at_all (struct ompi_file_t *fh, int mca_io_romio314_file_read_at_all (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_write_at (struct ompi_file_t *fh, int mca_io_romio314_file_write_at (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_write_at_all (struct ompi_file_t *fh, int mca_io_romio314_file_write_at_all (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_iread_at (struct ompi_file_t *fh, int mca_io_romio314_file_iread_at (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_request_t **request); ompi_request_t **request);
int mca_io_romio_file_iwrite_at (struct ompi_file_t *fh, int mca_io_romio314_file_iwrite_at (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
@ -134,141 +134,141 @@ int mca_io_romio_file_iwrite_at (struct ompi_file_t *fh,
ompi_request_t **request); ompi_request_t **request);
/* Section 9.4.3 */ /* Section 9.4.3 */
int mca_io_romio_file_read (struct ompi_file_t *fh, int mca_io_romio314_file_read (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_read_all (struct ompi_file_t *fh, int mca_io_romio314_file_read_all (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_write (struct ompi_file_t *fh, int mca_io_romio314_file_write (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_write_all (struct ompi_file_t *fh, int mca_io_romio314_file_write_all (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_iread (struct ompi_file_t *fh, int mca_io_romio314_file_iread (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_request_t **request); ompi_request_t **request);
int mca_io_romio_file_iwrite (struct ompi_file_t *fh, int mca_io_romio314_file_iwrite (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_request_t **request); ompi_request_t **request);
int mca_io_romio_file_seek (struct ompi_file_t *fh, int mca_io_romio314_file_seek (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
int whence); int whence);
int mca_io_romio_file_get_position (struct ompi_file_t *fh, int mca_io_romio314_file_get_position (struct ompi_file_t *fh,
MPI_Offset * offset); MPI_Offset * offset);
int mca_io_romio_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_romio_file_read_shared (struct ompi_file_t *fh, int mca_io_romio314_file_read_shared (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_write_shared (struct ompi_file_t *fh, int mca_io_romio314_file_write_shared (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_iread_shared (struct ompi_file_t *fh, int mca_io_romio314_file_iread_shared (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_request_t **request); ompi_request_t **request);
int mca_io_romio_file_iwrite_shared (struct ompi_file_t *fh, int mca_io_romio314_file_iwrite_shared (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_request_t **request); ompi_request_t **request);
int mca_io_romio_file_read_ordered (struct ompi_file_t *fh, int mca_io_romio314_file_read_ordered (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_write_ordered (struct ompi_file_t *fh, int mca_io_romio314_file_write_ordered (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_seek_shared (struct ompi_file_t *fh, int mca_io_romio314_file_seek_shared (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
int whence); int whence);
int mca_io_romio_file_get_position_shared (struct ompi_file_t *fh, int mca_io_romio314_file_get_position_shared (struct ompi_file_t *fh,
MPI_Offset * offset); MPI_Offset * offset);
/* Section 9.4.5 */ /* Section 9.4.5 */
int mca_io_romio_file_read_at_all_begin (struct ompi_file_t *fh, int mca_io_romio314_file_read_at_all_begin (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype); struct ompi_datatype_t *datatype);
int mca_io_romio_file_read_at_all_end (struct ompi_file_t *fh, int mca_io_romio314_file_read_at_all_end (struct ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_write_at_all_begin (struct ompi_file_t *fh, int mca_io_romio314_file_write_at_all_begin (struct ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype); struct ompi_datatype_t *datatype);
int mca_io_romio_file_write_at_all_end (struct ompi_file_t *fh, int mca_io_romio314_file_write_at_all_end (struct ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_read_all_begin (struct ompi_file_t *fh, int mca_io_romio314_file_read_all_begin (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype); struct ompi_datatype_t *datatype);
int mca_io_romio_file_read_all_end (struct ompi_file_t *fh, int mca_io_romio314_file_read_all_end (struct ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_write_all_begin (struct ompi_file_t *fh, int mca_io_romio314_file_write_all_begin (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype); struct ompi_datatype_t *datatype);
int mca_io_romio_file_write_all_end (struct ompi_file_t *fh, int mca_io_romio314_file_write_all_end (struct ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_read_ordered_begin (struct ompi_file_t *fh, int mca_io_romio314_file_read_ordered_begin (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype); struct ompi_datatype_t *datatype);
int mca_io_romio_file_read_ordered_end (struct ompi_file_t *fh, int mca_io_romio314_file_read_ordered_end (struct ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status); ompi_status_public_t * status);
int mca_io_romio_file_write_ordered_begin (struct ompi_file_t *fh, int mca_io_romio314_file_write_ordered_begin (struct ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype); struct ompi_datatype_t *datatype);
int mca_io_romio_file_write_ordered_end (struct ompi_file_t *fh, int mca_io_romio314_file_write_ordered_end (struct ompi_file_t *fh,
void *buf, void *buf,
struct ompi_status_public_t * status); struct ompi_status_public_t * status);
/* Section 9.5.1 */ /* Section 9.5.1 */
int mca_io_romio_file_get_type_extent (struct ompi_file_t *fh, int mca_io_romio314_file_get_type_extent (struct ompi_file_t *fh,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
MPI_Aint * extent); MPI_Aint * extent);
/* Section 9.6.1 */ /* Section 9.6.1 */
int mca_io_romio_file_set_atomicity (struct ompi_file_t *fh, int mca_io_romio314_file_set_atomicity (struct ompi_file_t *fh,
int flag); int flag);
int mca_io_romio_file_get_atomicity (struct ompi_file_t *fh, int mca_io_romio314_file_get_atomicity (struct ompi_file_t *fh,
int *flag); int *flag);
int mca_io_romio_file_sync (struct ompi_file_t *fh); int mca_io_romio314_file_sync (struct ompi_file_t *fh);
/* End Prototypes */ /* End Prototypes */
END_C_DECLS END_C_DECLS
#endif /* MCA_IO_ROMIO_H */ #endif /* MCA_IO_ROMIO314_H */

48
ompi/mca/io/romio314/src/io_romio_component.c → ompi/mca/io/romio314/src/io_romio314_component.c
Просмотреть файл

@ -27,7 +27,7 @@
#include "opal/threads/mutex.h" #include "opal/threads/mutex.h"
#include "opal/mca/base/base.h" #include "opal/mca/base/base.h"
#include "ompi/mca/io/io.h" #include "ompi/mca/io/io.h"
#include "io_romio.h" #include "io_romio314.h"
#define ROMIO_VERSION_STRING "from MPICH v3.0.4" #define ROMIO_VERSION_STRING "from MPICH v3.0.4"
@ -68,17 +68,17 @@ static int delete_priority_param = 20;
/* /*
* Global, component-wide ROMIO mutex because ROMIO is not thread safe * Global, component-wide ROMIO mutex because ROMIO is not thread safe
*/ */
opal_mutex_t mca_io_romio_mutex; opal_mutex_t mca_io_romio314_mutex;
/* /*
* Public string showing this component's version number * Public string showing this component's version number
*/ */
const char *mca_io_romio_component_version_string = const char *mca_io_romio314_component_version_string =
"OMPI/MPI ROMIO io MCA component version " OMPI_VERSION ", " ROMIO_VERSION_STRING; "OMPI/MPI ROMIO io MCA component version " OMPI_VERSION ", " ROMIO_VERSION_STRING;
mca_io_base_component_2_0_0_t mca_io_romio_component = { mca_io_base_component_2_0_0_t mca_io_romio314_component = {
/* First, the mca_base_component_t struct containing meta information /* First, the mca_base_component_t struct containing meta information
about the component itself */ about the component itself */
@ -110,44 +110,44 @@ mca_io_base_component_2_0_0_t mca_io_romio_component = {
.io_register_datarep = register_datarep, .io_register_datarep = register_datarep,
}; };
static char *ompi_io_romio_version = ROMIO_VERSION_STRING; static char *ompi_io_romio314_version = ROMIO_VERSION_STRING;
static char *ompi_io_romio_user_configure_params = MCA_io_romio_USER_CONFIGURE_FLAGS; static char *ompi_io_romio314_user_configure_params = MCA_io_romio314_USER_CONFIGURE_FLAGS;
static char *ompi_io_romio_complete_configure_params = MCA_io_romio_COMPLETE_CONFIGURE_FLAGS; static char *ompi_io_romio314_complete_configure_params = MCA_io_romio314_COMPLETE_CONFIGURE_FLAGS;
static int register_component(void) static int register_component(void)
{ {
/* Use a low priority, but allow other components to be lower */ /* Use a low priority, but allow other components to be lower */
priority_param = 10; priority_param = 10;
(void) mca_base_component_var_register(&mca_io_romio_component.io_version, (void) mca_base_component_var_register(&mca_io_romio314_component.io_version,
"priority", "Priority of the io romio component", "priority", "Priority of the io romio component",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
OPAL_INFO_LVL_9, OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY, &priority_param); MCA_BASE_VAR_SCOPE_READONLY, &priority_param);
delete_priority_param = 10; delete_priority_param = 10;
(void) mca_base_component_var_register(&mca_io_romio_component.io_version, (void) mca_base_component_var_register(&mca_io_romio314_component.io_version,
"delete_priority", "Delete priority of the io romio component", "delete_priority", "Delete priority of the io romio component",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
OPAL_INFO_LVL_9, OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY, &delete_priority_param); MCA_BASE_VAR_SCOPE_READONLY, &delete_priority_param);
(void) mca_base_component_var_register(&mca_io_romio_component.io_version, (void) mca_base_component_var_register(&mca_io_romio314_component.io_version,
"version", "Version of ROMIO", MCA_BASE_VAR_TYPE_STRING, "version", "Version of ROMIO", MCA_BASE_VAR_TYPE_STRING,
NULL, 0, MCA_BASE_VAR_FLAG_DEFAULT_ONLY, NULL, 0, MCA_BASE_VAR_FLAG_DEFAULT_ONLY,
OPAL_INFO_LVL_9, OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY, &ompi_io_romio_version); MCA_BASE_VAR_SCOPE_READONLY, &ompi_io_romio314_version);
(void) mca_base_component_var_register(&mca_io_romio_component.io_version, (void) mca_base_component_var_register(&mca_io_romio314_component.io_version,
"user_configure_params", "user_configure_params",
"User-specified command line parameters passed to ROMIO's configure script", "User-specified command line parameters passed to ROMIO's configure script",
MCA_BASE_VAR_TYPE_STRING, NULL, 0, MCA_BASE_VAR_TYPE_STRING, NULL, 0,
MCA_BASE_VAR_FLAG_DEFAULT_ONLY, MCA_BASE_VAR_FLAG_DEFAULT_ONLY,
OPAL_INFO_LVL_9, OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY, &ompi_io_romio_user_configure_params); MCA_BASE_VAR_SCOPE_READONLY, &ompi_io_romio314_user_configure_params);
(void) mca_base_component_var_register(&mca_io_romio_component.io_version, (void) mca_base_component_var_register(&mca_io_romio314_component.io_version,
"complete_configure_params", "complete_configure_params",
"Complete set of command line parameters passed to ROMIO's configure script", "Complete set of command line parameters passed to ROMIO's configure script",
MCA_BASE_VAR_TYPE_STRING, NULL, 0, MCA_BASE_VAR_TYPE_STRING, NULL, 0,
MCA_BASE_VAR_FLAG_DEFAULT_ONLY, MCA_BASE_VAR_FLAG_DEFAULT_ONLY,
OPAL_INFO_LVL_9, OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY, &ompi_io_romio_complete_configure_params); MCA_BASE_VAR_SCOPE_READONLY, &ompi_io_romio314_complete_configure_params);
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
@ -155,7 +155,7 @@ static int register_component(void)
static int open_component(void) static int open_component(void)
{ {
/* Create the mutex */ /* Create the mutex */
OBJ_CONSTRUCT(&mca_io_romio_mutex, opal_mutex_t); OBJ_CONSTRUCT(&mca_io_romio314_mutex, opal_mutex_t);
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
@ -163,7 +163,7 @@ static int open_component(void)
static int close_component(void) static int close_component(void)
{ {
OBJ_DESTRUCT(&mca_io_romio_mutex); OBJ_DESTRUCT(&mca_io_romio314_mutex);
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
@ -186,14 +186,14 @@ 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)
{ {
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
*priority = priority_param; *priority = priority_param;
/* Allocate a space for this module to hang private data (e.g., /* Allocate a space for this module to hang private data (e.g.,
the ROMIO file handle) */ the ROMIO file handle) */
data = malloc(sizeof(mca_io_romio_data_t)); data = malloc(sizeof(mca_io_romio314_data_t));
if (NULL == data) { if (NULL == data) {
return NULL; return NULL;
} }
@ -202,7 +202,7 @@ file_query(struct ompi_file_t *file,
/* All done */ /* All done */
return &mca_io_romio_module; return &mca_io_romio314_module;
} }
@ -237,9 +237,9 @@ static int delete_select(char *filename, struct ompi_info_t *info,
{ {
int ret; int ret;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_delete)(filename, info); ret = ROMIO_PREFIX(MPI_File_delete)(filename, info);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
@ -254,10 +254,10 @@ register_datarep(char * datarep,
{ {
int ret; int ret;
OPAL_THREAD_LOCK(&mca_io_romio_mutex); OPAL_THREAD_LOCK(&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_Register_datarep(datarep, read_fn, write_fn, ret = ROMIO_PREFIX(MPI_Register_datarep(datarep, read_fn, write_fn,
extent_fn, state)); extent_fn, state));
OPAL_THREAD_UNLOCK(&mca_io_romio_mutex); OPAL_THREAD_UNLOCK(&mca_io_romio314_mutex);
return ret; return ret;
} }

192
ompi/mca/io/romio314/src/io_romio_file_open.c → ompi/mca/io/romio314/src/io_romio314_file_open.c
Просмотреть файл

@ -22,34 +22,34 @@
#include "ompi/info/info.h" #include "ompi/info/info.h"
#include "ompi/file/file.h" #include "ompi/file/file.h"
#include "io_romio.h" #include "io_romio314.h"
int int
mca_io_romio_file_open (ompi_communicator_t *comm, mca_io_romio314_file_open (ompi_communicator_t *comm,
char *filename, char *filename,
int amode, int amode,
ompi_info_t *info, ompi_info_t *info,
ompi_file_t *fh) ompi_file_t *fh)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_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_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_close (ompi_file_t *fh) mca_io_romio314_file_close (ompi_file_t *fh)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
/* If we've already started MPI_Finalize by this point, then just /* If we've already started MPI_Finalize by this point, then just
give up (because ROMIO's file close routine calls MPI_Barrier, give up (because ROMIO's file close routine calls MPI_Barrier,
@ -72,113 +72,113 @@ mca_io_romio_file_close (ompi_file_t *fh)
OBJ_RETAIN(fh->error_handler); OBJ_RETAIN(fh->error_handler);
} }
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_close) (&data->romio_fh); ret = ROMIO_PREFIX(MPI_File_close) (&data->romio_fh);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_set_size (ompi_file_t *fh, mca_io_romio314_file_set_size (ompi_file_t *fh,
MPI_Offset size) MPI_Offset size)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_set_size) (data->romio_fh, size); ret = ROMIO_PREFIX(MPI_File_set_size) (data->romio_fh, size);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_preallocate (ompi_file_t *fh, mca_io_romio314_file_preallocate (ompi_file_t *fh,
MPI_Offset size) MPI_Offset size)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_preallocate) (data->romio_fh, size); ret = ROMIO_PREFIX(MPI_File_preallocate) (data->romio_fh, size);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_get_size (ompi_file_t *fh, mca_io_romio314_file_get_size (ompi_file_t *fh,
MPI_Offset * size) MPI_Offset * size)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_get_size) (data->romio_fh, size); ret = ROMIO_PREFIX(MPI_File_get_size) (data->romio_fh, size);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_get_amode (ompi_file_t *fh, mca_io_romio314_file_get_amode (ompi_file_t *fh,
int *amode) int *amode)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_get_amode) (data->romio_fh, amode); ret = ROMIO_PREFIX(MPI_File_get_amode) (data->romio_fh, amode);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_set_info (ompi_file_t *fh, mca_io_romio314_file_set_info (ompi_file_t *fh,
ompi_info_t *info) ompi_info_t *info)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_set_info) (data->romio_fh, info); ret = ROMIO_PREFIX(MPI_File_set_info) (data->romio_fh, info);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_get_info (ompi_file_t *fh, mca_io_romio314_file_get_info (ompi_file_t *fh,
ompi_info_t ** info_used) ompi_info_t ** info_used)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_get_info) (data->romio_fh, info_used); ret = ROMIO_PREFIX(MPI_File_get_info) (data->romio_fh, info_used);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_set_view (ompi_file_t *fh, mca_io_romio314_file_set_view (ompi_file_t *fh,
MPI_Offset disp, MPI_Offset disp,
struct ompi_datatype_t *etype, struct ompi_datatype_t *etype,
struct ompi_datatype_t *filetype, struct ompi_datatype_t *filetype,
@ -186,35 +186,35 @@ mca_io_romio_file_set_view (ompi_file_t *fh,
ompi_info_t *info) ompi_info_t *info)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_set_view) (data->romio_fh, disp, etype, filetype, ROMIO_PREFIX(MPI_File_set_view) (data->romio_fh, disp, etype, filetype,
datarep, info); datarep, info);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_get_view (ompi_file_t *fh, mca_io_romio314_file_get_view (ompi_file_t *fh,
MPI_Offset * disp, MPI_Offset * disp,
struct ompi_datatype_t ** etype, struct ompi_datatype_t ** etype,
struct ompi_datatype_t ** filetype, struct ompi_datatype_t ** filetype,
char *datarep) char *datarep)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_get_view) (data->romio_fh, disp, etype, filetype, ROMIO_PREFIX(MPI_File_get_view) (data->romio_fh, disp, etype, filetype,
datarep); datarep);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
@ -222,146 +222,146 @@ mca_io_romio_file_get_view (ompi_file_t *fh,
int int
mca_io_romio_file_get_type_extent (ompi_file_t *fh, mca_io_romio314_file_get_type_extent (ompi_file_t *fh,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
MPI_Aint * extent) MPI_Aint * extent)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_get_type_extent) (data->romio_fh, datatype, extent); ROMIO_PREFIX(MPI_File_get_type_extent) (data->romio_fh, datatype, extent);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_set_atomicity (ompi_file_t *fh, mca_io_romio314_file_set_atomicity (ompi_file_t *fh,
int flag) int flag)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_set_atomicity) (data->romio_fh, flag); ret = ROMIO_PREFIX(MPI_File_set_atomicity) (data->romio_fh, flag);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_get_atomicity (ompi_file_t *fh, mca_io_romio314_file_get_atomicity (ompi_file_t *fh,
int *flag) int *flag)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_get_atomicity) (data->romio_fh, flag); ret = ROMIO_PREFIX(MPI_File_get_atomicity) (data->romio_fh, flag);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_sync (ompi_file_t *fh) mca_io_romio314_file_sync (ompi_file_t *fh)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_sync) (data->romio_fh); ret = ROMIO_PREFIX(MPI_File_sync) (data->romio_fh);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_seek_shared (ompi_file_t *fh, mca_io_romio314_file_seek_shared (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
int whence) int whence)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_seek_shared) (data->romio_fh, offset, whence); ret = ROMIO_PREFIX(MPI_File_seek_shared) (data->romio_fh, offset, whence);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_get_position_shared (ompi_file_t *fh, mca_io_romio314_file_get_position_shared (ompi_file_t *fh,
MPI_Offset * offset) MPI_Offset * offset)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_get_position_shared) (data->romio_fh, offset); ret = ROMIO_PREFIX(MPI_File_get_position_shared) (data->romio_fh, offset);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_seek (ompi_file_t *fh, mca_io_romio314_file_seek (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
int whence) int whence)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_seek) (data->romio_fh, offset, whence); ret = ROMIO_PREFIX(MPI_File_seek) (data->romio_fh, offset, whence);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_get_position (ompi_file_t *fh, mca_io_romio314_file_get_position (ompi_file_t *fh,
MPI_Offset * offset) MPI_Offset * offset)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_get_position) (data->romio_fh, offset); ret = ROMIO_PREFIX(MPI_File_get_position) (data->romio_fh, offset);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_get_byte_offset (ompi_file_t *fh, mca_io_romio314_file_get_byte_offset (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
MPI_Offset * disp) MPI_Offset * disp)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_get_byte_offset) (data->romio_fh, offset, disp); ret = ROMIO_PREFIX(MPI_File_get_byte_offset) (data->romio_fh, offset, disp);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }

152
ompi/mca/io/romio314/src/io_romio_file_read.c → ompi/mca/io/romio314/src/io_romio314_file_read.c
Просмотреть файл

@ -19,11 +19,11 @@
#include "ompi_config.h" #include "ompi_config.h"
#include "mpi.h" #include "mpi.h"
#include "ompi/file/file.h" #include "ompi/file/file.h"
#include "io_romio.h" #include "io_romio314.h"
int int
mca_io_romio_file_read_at (ompi_file_t *fh, mca_io_romio314_file_read_at (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
@ -31,21 +31,21 @@ mca_io_romio_file_read_at (ompi_file_t *fh,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_read_at) (data->romio_fh, offset, buf, count, ROMIO_PREFIX(MPI_File_read_at) (data->romio_fh, offset, buf, count,
datatype, status); datatype, status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read_at_all (ompi_file_t *fh, mca_io_romio314_file_read_at_all (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
@ -53,21 +53,21 @@ mca_io_romio_file_read_at_all (ompi_file_t *fh,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_read_at_all) (data->romio_fh, offset, buf, count, ROMIO_PREFIX(MPI_File_read_at_all) (data->romio_fh, offset, buf, count,
datatype, status); datatype, status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_iread_at (ompi_file_t *fh, mca_io_romio314_file_iread_at (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
@ -75,253 +75,253 @@ mca_io_romio_file_iread_at (ompi_file_t *fh,
ompi_request_t **request) ompi_request_t **request)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_iread_at) (data->romio_fh, offset, buf, count, ROMIO_PREFIX(MPI_File_iread_at) (data->romio_fh, offset, buf, count,
datatype, request); datatype, request);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read (ompi_file_t *fh, mca_io_romio314_file_read (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_read) (data->romio_fh, buf, count, datatype, ROMIO_PREFIX(MPI_File_read) (data->romio_fh, buf, count, datatype,
status); status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read_all (ompi_file_t *fh, mca_io_romio314_file_read_all (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_read_all) (data->romio_fh, buf, count, datatype, ROMIO_PREFIX(MPI_File_read_all) (data->romio_fh, buf, count, datatype,
status); status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_iread (ompi_file_t *fh, mca_io_romio314_file_iread (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_request_t **request) ompi_request_t **request)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_iread) (data->romio_fh, buf, count, datatype, ROMIO_PREFIX(MPI_File_iread) (data->romio_fh, buf, count, datatype,
request); request);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read_shared (ompi_file_t *fh, mca_io_romio314_file_read_shared (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_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_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_iread_shared (ompi_file_t *fh, mca_io_romio314_file_iread_shared (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_request_t **request) ompi_request_t **request)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_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_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read_ordered (ompi_file_t *fh, mca_io_romio314_file_read_ordered (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_read_ordered) (data->romio_fh, buf, count, ROMIO_PREFIX(MPI_File_read_ordered) (data->romio_fh, buf, count,
datatype, status); datatype, status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read_at_all_begin (ompi_file_t *fh, mca_io_romio314_file_read_at_all_begin (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype) struct ompi_datatype_t *datatype)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_read_at_all_begin) (data->romio_fh, offset, buf, ROMIO_PREFIX(MPI_File_read_at_all_begin) (data->romio_fh, offset, buf,
count, datatype); count, datatype);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read_at_all_end (ompi_file_t *fh, mca_io_romio314_file_read_at_all_end (ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_read_at_all_end) (data->romio_fh, buf, status); ret = ROMIO_PREFIX(MPI_File_read_at_all_end) (data->romio_fh, buf, status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read_all_begin (ompi_file_t *fh, mca_io_romio314_file_read_all_begin (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype) struct ompi_datatype_t *datatype)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_read_all_begin) (data->romio_fh, buf, count, ROMIO_PREFIX(MPI_File_read_all_begin) (data->romio_fh, buf, count,
datatype); datatype);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read_all_end (ompi_file_t *fh, mca_io_romio314_file_read_all_end (ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_read_all_end) (data->romio_fh, buf, status); ret = ROMIO_PREFIX(MPI_File_read_all_end) (data->romio_fh, buf, status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read_ordered_begin (ompi_file_t *fh, mca_io_romio314_file_read_ordered_begin (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype) struct ompi_datatype_t *datatype)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_read_ordered_begin) (data->romio_fh, buf, count, ROMIO_PREFIX(MPI_File_read_ordered_begin) (data->romio_fh, buf, count,
datatype); datatype);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_read_ordered_end (ompi_file_t *fh, mca_io_romio314_file_read_ordered_end (ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_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_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }

152
ompi/mca/io/romio314/src/io_romio_file_write.c → ompi/mca/io/romio314/src/io_romio314_file_write.c
Просмотреть файл

@ -19,11 +19,11 @@
#include "ompi_config.h" #include "ompi_config.h"
#include "mpi.h" #include "mpi.h"
#include "ompi/file/file.h" #include "ompi/file/file.h"
#include "io_romio.h" #include "io_romio314.h"
int int
mca_io_romio_file_write_at (ompi_file_t *fh, mca_io_romio314_file_write_at (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
@ -31,14 +31,14 @@ mca_io_romio_file_write_at (ompi_file_t *fh,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_write_at) (data->romio_fh, offset, buf, count, ROMIO_PREFIX(MPI_File_write_at) (data->romio_fh, offset, buf, count,
datatype, status); datatype, status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
@ -46,7 +46,7 @@ mca_io_romio_file_write_at (ompi_file_t *fh,
int int
mca_io_romio_file_write_at_all (ompi_file_t *fh, mca_io_romio314_file_write_at_all (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
@ -54,14 +54,14 @@ mca_io_romio_file_write_at_all (ompi_file_t *fh,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_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_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
@ -69,7 +69,7 @@ mca_io_romio_file_write_at_all (ompi_file_t *fh,
int int
mca_io_romio_file_iwrite_at (ompi_file_t *fh, mca_io_romio314_file_iwrite_at (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
@ -77,14 +77,14 @@ mca_io_romio_file_iwrite_at (ompi_file_t *fh,
ompi_request_t **request) ompi_request_t **request)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_iwrite_at) (data->romio_fh, offset, buf, count, ROMIO_PREFIX(MPI_File_iwrite_at) (data->romio_fh, offset, buf, count,
datatype, request); datatype, request);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
@ -94,227 +94,227 @@ mca_io_romio_file_iwrite_at (ompi_file_t *fh,
int int
mca_io_romio_file_write (ompi_file_t *fh, mca_io_romio314_file_write (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_write) (data->romio_fh, buf, count, datatype, ROMIO_PREFIX(MPI_File_write) (data->romio_fh, buf, count, datatype,
status); status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_write_all (ompi_file_t *fh, mca_io_romio314_file_write_all (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_write_all) (data->romio_fh, buf, count, datatype, ROMIO_PREFIX(MPI_File_write_all) (data->romio_fh, buf, count, datatype,
status); status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_iwrite (ompi_file_t *fh, mca_io_romio314_file_iwrite (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_request_t **request) ompi_request_t **request)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_iwrite) (data->romio_fh, buf, count, datatype, ROMIO_PREFIX(MPI_File_iwrite) (data->romio_fh, buf, count, datatype,
request); request);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_write_shared (ompi_file_t *fh, mca_io_romio314_file_write_shared (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_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_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_iwrite_shared (ompi_file_t *fh, mca_io_romio314_file_iwrite_shared (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_request_t **request) ompi_request_t **request)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_iwrite_shared) (data->romio_fh, buf, count, ROMIO_PREFIX(MPI_File_iwrite_shared) (data->romio_fh, buf, count,
datatype, request); datatype, request);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_write_ordered (ompi_file_t *fh, mca_io_romio314_file_write_ordered (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype, struct ompi_datatype_t *datatype,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ret =
ROMIO_PREFIX(MPI_File_write_ordered) (data->romio_fh, buf, count, ROMIO_PREFIX(MPI_File_write_ordered) (data->romio_fh, buf, count,
datatype, status); datatype, status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_write_at_all_begin (ompi_file_t *fh, mca_io_romio314_file_write_at_all_begin (ompi_file_t *fh,
MPI_Offset offset, MPI_Offset offset,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype) struct ompi_datatype_t *datatype)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_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_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_write_at_all_end (ompi_file_t *fh, mca_io_romio314_file_write_at_all_end (ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_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_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_write_all_begin (ompi_file_t *fh, mca_io_romio314_file_write_all_begin (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype) struct ompi_datatype_t *datatype)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_write_all_begin) (data->romio_fh, buf, count, ret = ROMIO_PREFIX(MPI_File_write_all_begin) (data->romio_fh, buf, count,
datatype); datatype);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_write_all_end (ompi_file_t *fh, mca_io_romio314_file_write_all_end (ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_write_all_end) (data->romio_fh, buf, status); ret = ROMIO_PREFIX(MPI_File_write_all_end) (data->romio_fh, buf, status);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_write_ordered_begin (ompi_file_t *fh, mca_io_romio314_file_write_ordered_begin (ompi_file_t *fh,
void *buf, void *buf,
int count, int count,
struct ompi_datatype_t *datatype) struct ompi_datatype_t *datatype)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_mutex); OPAL_THREAD_LOCK (&mca_io_romio314_mutex);
ret = ROMIO_PREFIX(MPI_File_write_ordered_begin) (data->romio_fh, buf, ret = ROMIO_PREFIX(MPI_File_write_ordered_begin) (data->romio_fh, buf,
count, datatype); count, datatype);
OPAL_THREAD_UNLOCK (&mca_io_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }
int int
mca_io_romio_file_write_ordered_end (ompi_file_t *fh, mca_io_romio314_file_write_ordered_end (ompi_file_t *fh,
void *buf, void *buf,
ompi_status_public_t * status) ompi_status_public_t * status)
{ {
int ret; int ret;
mca_io_romio_data_t *data; mca_io_romio314_data_t *data;
data = (mca_io_romio_data_t *) fh->f_io_selected_data; data = (mca_io_romio314_data_t *) fh->f_io_selected_data;
OPAL_THREAD_LOCK (&mca_io_romio_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_romio_mutex); OPAL_THREAD_UNLOCK (&mca_io_romio314_mutex);
return ret; return ret;
} }

102
ompi/mca/io/romio314/src/io_romio_module.c → ompi/mca/io/romio314/src/io_romio314_module.c
Просмотреть файл

@ -22,7 +22,7 @@
#include "mpi.h" #include "mpi.h"
#include "ompi/datatype/ompi_datatype.h" #include "ompi/datatype/ompi_datatype.h"
#include "ompi/mca/io/io.h" #include "ompi/mca/io/io.h"
#include "io_romio.h" #include "io_romio314.h"
/* /*
@ -37,70 +37,70 @@ void ADIOI_Datatype_iscontig(MPI_Datatype datatype, int *flag);
/* /*
* The ROMIO module operations * The ROMIO module operations
*/ */
mca_io_base_module_2_0_0_t mca_io_romio_module = { mca_io_base_module_2_0_0_t mca_io_romio314_module = {
/* Back end to MPI API calls (pretty much a 1-to-1 mapping) */ /* Back end to MPI API calls (pretty much a 1-to-1 mapping) */
mca_io_romio_file_open, mca_io_romio314_file_open,
mca_io_romio_file_close, mca_io_romio314_file_close,
mca_io_romio_file_set_size, mca_io_romio314_file_set_size,
mca_io_romio_file_preallocate, mca_io_romio314_file_preallocate,
mca_io_romio_file_get_size, mca_io_romio314_file_get_size,
mca_io_romio_file_get_amode, mca_io_romio314_file_get_amode,
mca_io_romio_file_set_info, mca_io_romio314_file_set_info,
mca_io_romio_file_get_info, mca_io_romio314_file_get_info,
mca_io_romio_file_set_view, mca_io_romio314_file_set_view,
mca_io_romio_file_get_view, mca_io_romio314_file_get_view,
/* Index IO operations */ /* Index IO operations */
mca_io_romio_file_read_at, mca_io_romio314_file_read_at,
mca_io_romio_file_read_at_all, mca_io_romio314_file_read_at_all,
mca_io_romio_file_write_at, mca_io_romio314_file_write_at,
mca_io_romio_file_write_at_all, mca_io_romio314_file_write_at_all,
mca_io_romio_file_iread_at, mca_io_romio314_file_iread_at,
mca_io_romio_file_iwrite_at, mca_io_romio314_file_iwrite_at,
/* non-indexed IO operations */ /* non-indexed IO operations */
mca_io_romio_file_read, mca_io_romio314_file_read,
mca_io_romio_file_read_all, mca_io_romio314_file_read_all,
mca_io_romio_file_write, mca_io_romio314_file_write,
mca_io_romio_file_write_all, mca_io_romio314_file_write_all,
mca_io_romio_file_iread, mca_io_romio314_file_iread,
mca_io_romio_file_iwrite, mca_io_romio314_file_iwrite,
mca_io_romio_file_seek, mca_io_romio314_file_seek,
mca_io_romio_file_get_position, mca_io_romio314_file_get_position,
mca_io_romio_file_get_byte_offset, mca_io_romio314_file_get_byte_offset,
mca_io_romio_file_read_shared, mca_io_romio314_file_read_shared,
mca_io_romio_file_write_shared, mca_io_romio314_file_write_shared,
mca_io_romio_file_iread_shared, mca_io_romio314_file_iread_shared,
mca_io_romio_file_iwrite_shared, mca_io_romio314_file_iwrite_shared,
mca_io_romio_file_read_ordered, mca_io_romio314_file_read_ordered,
mca_io_romio_file_write_ordered, mca_io_romio314_file_write_ordered,
mca_io_romio_file_seek_shared, mca_io_romio314_file_seek_shared,
mca_io_romio_file_get_position_shared, mca_io_romio314_file_get_position_shared,
/* Split IO operations */ /* Split IO operations */
mca_io_romio_file_read_at_all_begin, mca_io_romio314_file_read_at_all_begin,
mca_io_romio_file_read_at_all_end, mca_io_romio314_file_read_at_all_end,
mca_io_romio_file_write_at_all_begin, mca_io_romio314_file_write_at_all_begin,
mca_io_romio_file_write_at_all_end, mca_io_romio314_file_write_at_all_end,
mca_io_romio_file_read_all_begin, mca_io_romio314_file_read_all_begin,
mca_io_romio_file_read_all_end, mca_io_romio314_file_read_all_end,
mca_io_romio_file_write_all_begin, mca_io_romio314_file_write_all_begin,
mca_io_romio_file_write_all_end, mca_io_romio314_file_write_all_end,
mca_io_romio_file_read_ordered_begin, mca_io_romio314_file_read_ordered_begin,
mca_io_romio_file_read_ordered_end, mca_io_romio314_file_read_ordered_end,
mca_io_romio_file_write_ordered_begin, mca_io_romio314_file_write_ordered_begin,
mca_io_romio_file_write_ordered_end, mca_io_romio314_file_write_ordered_end,
mca_io_romio_file_get_type_extent, mca_io_romio314_file_get_type_extent,
/* Sync/atomic IO operations */ /* Sync/atomic IO operations */
mca_io_romio_file_set_atomicity, mca_io_romio314_file_set_atomicity,
mca_io_romio_file_get_atomicity, mca_io_romio314_file_get_atomicity,
mca_io_romio_file_sync mca_io_romio314_file_sync
}; };