diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-21 18:57:55 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-21 18:57:55 (GMT) |
| commit | a24e3e5c8669fd205b75d264ca44e23fc1bfc651 (patch) | |
| tree | 1f6a540706b4b7325a0d9cdeb895153fd7f0665b /src | |
| parent | de47d219c9be71e36d305994a48ede78b50e4a62 (diff) | |
| download | hdf5-a24e3e5c8669fd205b75d264ca44e23fc1bfc651.zip hdf5-a24e3e5c8669fd205b75d264ca44e23fc1bfc651.tar.gz hdf5-a24e3e5c8669fd205b75d264ca44e23fc1bfc651.tar.bz2 | |
[svn-r25994] revert adding the has_mpi_atomicity feature flag and use the has_mpi
flag instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5FDmpio.c | 1 | ||||
| -rw-r--r-- | src/H5FDpublic.h | 10 | ||||
| -rw-r--r-- | src/H5Fmpi.c | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 04ae5da..70cf49a 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -1224,7 +1224,6 @@ H5FD_mpio_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */) *flags|=H5FD_FEAT_AGGREGATE_METADATA; /* OK to aggregate metadata allocations */ *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */ *flags|=H5FD_FEAT_HAS_MPI; /* This driver uses MPI */ - *flags|=H5FD_FEAT_HAS_MPI_ATOMICITY; /* This driver has MPI atomicity mode */ *flags|=H5FD_FEAT_ALLOCATE_EARLY; /* Allocate space early instead of late */ } /* end if */ diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h index 452de02..df5d5cf 100644 --- a/src/H5FDpublic.h +++ b/src/H5FDpublic.h @@ -217,8 +217,8 @@ typedef enum H5F_mem_t H5FD_mem_t; */ #define H5FD_FEAT_HAS_MPI 0x00000100 /* - * Defining the H5FD_FEAT_ALLOCATE_EARLY for a VFL driver means that - * the library will use the H5D_ALLOC_TIME_EARLY on dataset create + * Defining the H5FD_FEAT_ALLOCATE_EARLY for a VFL driver will force + * the library to use the H5D_ALLOC_TIME_EARLY on dataset create * instead of the default H5D_ALLOC_TIME_LATE */ #define H5FD_FEAT_ALLOCATE_EARLY 0x00000200 @@ -234,12 +234,6 @@ typedef enum H5F_mem_t H5FD_mem_t; * image to store in memory. */ #define H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS 0x00000800 - /* - * Defining the H5FD_FEAT_HAS_MPI_ATOMICITY for a VFL driver means - * that the driver is able to do atomic read/write operations as - * defined by MPI atomicity semantics. - */ -#define H5FD_FEAT_HAS_MPI_ATOMICITY 0x00001000 /* Forward declaration */ typedef struct H5FD_t H5FD_t; diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c index cfb6f3c..39b8dfa 100644 --- a/src/H5Fmpi.c +++ b/src/H5Fmpi.c @@ -208,7 +208,7 @@ H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID") /* Check VFD */ - if(!H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI_ATOMICITY)) + if(!H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI)) HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "incorrect VFL driver, does not support MPI atomicity mode") /* set atomicity value */ @@ -248,7 +248,7 @@ H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID") /* Check VFD */ - if(!H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI_ATOMICITY)) + if(!H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI)) HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "incorrect VFL driver, does not support MPI atomicity mode") /* get atomicity value */ |