part 2 of the cleaning up of info handling in ompio. The set_info interface
in the fs modules does not make sense and was not used. Remove them.
Этот коммит содержится в:
Edgar Gabriel
родитель
6af4f1896c
Коммит
03c2adf3b1
@ -9,7 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2008-2011 University of Houston. All rights reserved.
|
||||
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -114,8 +114,6 @@ typedef int (*mca_fs_base_module_file_set_size_fn_t)
|
||||
(struct mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE size);
|
||||
typedef int (*mca_fs_base_module_file_get_size_fn_t)
|
||||
(struct mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE *size);
|
||||
typedef int (*mca_fs_base_module_file_set_info_fn_t)
|
||||
(struct mca_io_ompio_file_t *fh, struct ompi_info_t *info);
|
||||
typedef int (*mca_fs_base_module_file_sync_fn_t)
|
||||
(struct mca_io_ompio_file_t *fh);
|
||||
|
||||
@ -139,7 +137,6 @@ struct mca_fs_base_module_1_0_0_t {
|
||||
mca_fs_base_module_file_delete_fn_t fs_file_delete;
|
||||
mca_fs_base_module_file_set_size_fn_t fs_file_set_size;
|
||||
mca_fs_base_module_file_get_size_fn_t fs_file_get_size;
|
||||
mca_fs_base_module_file_set_info_fn_t fs_file_set_info;
|
||||
mca_fs_base_module_file_sync_fn_t fs_file_sync;
|
||||
};
|
||||
typedef struct mca_fs_base_module_1_0_0_t mca_fs_base_module_1_0_0_t;
|
||||
|
||||
@ -40,8 +40,7 @@ fs_lustre_sources = \
|
||||
fs_lustre_file_delete.c \
|
||||
fs_lustre_file_sync.c \
|
||||
fs_lustre_file_set_size.c \
|
||||
fs_lustre_file_get_size.c \
|
||||
fs_lustre_file_set_info.c
|
||||
fs_lustre_file_get_size.c
|
||||
|
||||
AM_CPPFLAGS = $(fs_lustre_CPPFLAGS)
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2008-2014 University of Houston. All rights reserved.
|
||||
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -59,7 +59,6 @@ static mca_fs_base_module_1_0_0_t lustre = {
|
||||
mca_fs_lustre_file_delete,
|
||||
mca_fs_lustre_file_set_size,
|
||||
mca_fs_lustre_file_get_size,
|
||||
mca_fs_lustre_file_set_info,
|
||||
mca_fs_lustre_file_sync
|
||||
};
|
||||
/*
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2008-2011 University of Houston. All rights reserved.
|
||||
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -64,9 +64,6 @@ int mca_fs_lustre_file_set_size (mca_io_ompio_file_t *fh,
|
||||
int mca_fs_lustre_file_get_size (mca_io_ompio_file_t *fh,
|
||||
OMPI_MPI_OFFSET_TYPE *size);
|
||||
|
||||
int mca_fs_lustre_file_set_info (mca_io_ompio_file_t *fh,
|
||||
struct ompi_info_t *info);
|
||||
|
||||
int mca_fs_lustre_file_sync (mca_io_ompio_file_t *fh);
|
||||
|
||||
int mca_fs_lustre_file_seek (mca_io_ompio_file_t *fh,
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2011 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) 2008-2011 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
*
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "fs_lustre.h"
|
||||
|
||||
#include "mpi.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/mca/fs/fs.h"
|
||||
|
||||
/*
|
||||
* file_set_info_lustre
|
||||
*
|
||||
* Function: - set_info of a file
|
||||
* Accepts: - same arguments as MPI_File_set_info()
|
||||
* Returns: - Success if info is set
|
||||
*/
|
||||
int
|
||||
mca_fs_lustre_file_set_info (mca_io_ompio_file_t *file_handle,
|
||||
struct ompi_info_t *info)
|
||||
{
|
||||
printf ("LUSTRE SET INFO\n");
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
@ -40,8 +40,7 @@ fs_plfs_sources = \
|
||||
fs_plfs_file_delete.c \
|
||||
fs_plfs_file_sync.c \
|
||||
fs_plfs_file_set_size.c \
|
||||
fs_plfs_file_get_size.c \
|
||||
fs_plfs_file_set_info.c
|
||||
fs_plfs_file_get_size.c
|
||||
|
||||
AM_CPPFLAGS = $(fs_plfs_CPPFLAGS)
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2008-2014 University of Houston. All rights reserved.
|
||||
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -58,7 +58,6 @@ static mca_fs_base_module_1_0_0_t plfs = {
|
||||
mca_fs_plfs_file_delete,
|
||||
mca_fs_plfs_file_set_size,
|
||||
mca_fs_plfs_file_get_size,
|
||||
mca_fs_plfs_file_set_info,
|
||||
mca_fs_plfs_file_sync
|
||||
};
|
||||
/*
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2008-2014 University of Houston. All rights reserved.
|
||||
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -65,9 +65,6 @@ int mca_fs_plfs_file_set_size (mca_io_ompio_file_t *fh,
|
||||
int mca_fs_plfs_file_get_size (mca_io_ompio_file_t *fh,
|
||||
OMPI_MPI_OFFSET_TYPE *size);
|
||||
|
||||
int mca_fs_plfs_file_set_info (mca_io_ompio_file_t *fh,
|
||||
struct ompi_info_t *info);
|
||||
|
||||
int mca_fs_plfs_file_sync (mca_io_ompio_file_t *fh);
|
||||
|
||||
int mca_fs_plfs_file_seek (mca_io_ompio_file_t *fh,
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2011 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) 2008-2014 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
*
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "fs_plfs.h"
|
||||
|
||||
#include "mpi.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/mca/fs/fs.h"
|
||||
|
||||
/*
|
||||
* file_set_info_plfs
|
||||
*
|
||||
* Function: - set_info of a file
|
||||
* Accepts: - same arguments as MPI_File_set_info()
|
||||
* Returns: - Success if info is set
|
||||
*/
|
||||
int
|
||||
mca_fs_plfs_file_set_info (mca_io_ompio_file_t *file_handle,
|
||||
struct ompi_info_t *info)
|
||||
{
|
||||
printf ("PLFS SET INFO\n");
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
@ -40,8 +40,7 @@ fs_pvfs2_sources = \
|
||||
fs_pvfs2_file_delete.c \
|
||||
fs_pvfs2_file_sync.c \
|
||||
fs_pvfs2_file_set_size.c \
|
||||
fs_pvfs2_file_get_size.c \
|
||||
fs_pvfs2_file_set_info.c
|
||||
fs_pvfs2_file_get_size.c
|
||||
|
||||
AM_CPPFLAGS = $(fs_pvfs2_CPPFLAGS)
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2008-2014 University of Houston. All rights reserved.
|
||||
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -56,7 +56,6 @@ static mca_fs_base_module_1_0_0_t pvfs2 = {
|
||||
mca_fs_pvfs2_file_delete,
|
||||
mca_fs_pvfs2_file_set_size,
|
||||
mca_fs_pvfs2_file_get_size,
|
||||
mca_fs_pvfs2_file_set_info,
|
||||
mca_fs_pvfs2_file_sync
|
||||
};
|
||||
/*
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2008-2011 University of Houston. All rights reserved.
|
||||
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -82,9 +82,6 @@ int mca_fs_pvfs2_file_set_size (mca_io_ompio_file_t *fh,
|
||||
int mca_fs_pvfs2_file_get_size (mca_io_ompio_file_t *fh,
|
||||
OMPI_MPI_OFFSET_TYPE *size);
|
||||
|
||||
int mca_fs_pvfs2_file_set_info (mca_io_ompio_file_t *fh,
|
||||
struct ompi_info_t *info);
|
||||
|
||||
int mca_fs_pvfs2_file_sync (mca_io_ompio_file_t *fh);
|
||||
|
||||
int mca_fs_pvfs2_file_seek (mca_io_ompio_file_t *fh,
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2011 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) 2008-2011 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
*
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
/* This code is based on the PVFS2 ADIO module in ROMIO
|
||||
* Copyright (C) 1997 University of Chicago.
|
||||
* See COPYRIGHT notice in top-level directory.
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "fs_pvfs2.h"
|
||||
|
||||
#include "mpi.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/mca/fs/fs.h"
|
||||
|
||||
/*
|
||||
* file_set_info_pvfs2
|
||||
*
|
||||
* Function: - set_info of a file
|
||||
* Accepts: - same arguments as MPI_File_set_info()
|
||||
* Returns: - Success if info is set
|
||||
*/
|
||||
int
|
||||
mca_fs_pvfs2_file_set_info (mca_io_ompio_file_t *file_handle,
|
||||
struct ompi_info_t *info)
|
||||
{
|
||||
printf ("PVFS2 SET INFO\n");
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
@ -49,5 +49,4 @@ sources = \
|
||||
fs_ufs_file_delete.c \
|
||||
fs_ufs_file_sync.c \
|
||||
fs_ufs_file_set_size.c \
|
||||
fs_ufs_file_get_size.c \
|
||||
fs_ufs_file_set_info.c
|
||||
fs_ufs_file_get_size.c
|
||||
|
||||
@ -42,7 +42,6 @@ static mca_fs_base_module_1_0_0_t ufs = {
|
||||
mca_fs_ufs_file_delete,
|
||||
mca_fs_ufs_file_set_size,
|
||||
mca_fs_ufs_file_get_size,
|
||||
mca_fs_ufs_file_set_info,
|
||||
mca_fs_ufs_file_sync
|
||||
};
|
||||
/*
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2008-2011 University of Houston. All rights reserved.
|
||||
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -62,9 +62,6 @@ int mca_fs_ufs_file_set_size (mca_io_ompio_file_t *fh,
|
||||
int mca_fs_ufs_file_get_size (mca_io_ompio_file_t *fh,
|
||||
OMPI_MPI_OFFSET_TYPE *size);
|
||||
|
||||
int mca_fs_ufs_file_set_info (mca_io_ompio_file_t *fh,
|
||||
struct ompi_info_t *info);
|
||||
|
||||
int mca_fs_ufs_file_sync (mca_io_ompio_file_t *fh);
|
||||
|
||||
int mca_fs_ufs_file_seek (mca_io_ompio_file_t *fh,
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2011 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) 2008-2011 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
*
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
|
||||
#include "ompi_config.h"
|
||||
#include "fs_ufs.h"
|
||||
|
||||
#include "mpi.h"
|
||||
#include "ompi/constants.h"
|
||||
#include "ompi/mca/fs/fs.h"
|
||||
|
||||
/*
|
||||
* file_set_info_ufs
|
||||
*
|
||||
* Function: - set_info of a file
|
||||
* Accepts: - same arguments as MPI_File_set_info()
|
||||
* Returns: - Success if info is set
|
||||
*/
|
||||
int
|
||||
mca_fs_ufs_file_set_info (mca_io_ompio_file_t *file_handle,
|
||||
struct ompi_info_t *info)
|
||||
{
|
||||
printf ("UFS SET INFO\n");
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user