diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-08-22 20:56:51 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-08-22 20:56:51 (GMT) |
| commit | 794a2df2684c58fa61943963369ffa72626d9111 (patch) | |
| tree | 8f2629916d0f7dab6076d95be081c2513b7f4e1d /src/H5FDmpiposix.c | |
| parent | 2051b4e03e8af8a08839a8674a5629a74c7954ae (diff) | |
| parent | 80a409e14dc85f8bdb0dff424f528d3a0bcf7891 (diff) | |
| download | hdf5-794a2df2684c58fa61943963369ffa72626d9111.zip hdf5-794a2df2684c58fa61943963369ffa72626d9111.tar.gz hdf5-794a2df2684c58fa61943963369ffa72626d9111.tar.bz2 | |
[svn-r21286] Merging r20545 through r21283 from trunk to avoid_truncate branch.
Tested:
h5committest
Diffstat (limited to 'src/H5FDmpiposix.c')
| -rw-r--r-- | src/H5FDmpiposix.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c index cacbe10..bf2bb34 100644 --- a/src/H5FDmpiposix.c +++ b/src/H5FDmpiposix.c @@ -175,6 +175,7 @@ typedef struct H5FD_mpiposix_t { (file_offset_t)((A)+(Z))<(file_offset_t)(A)) /* Callbacks */ +static herr_t H5FD_mpiposix_term(void); static void *H5FD_mpiposix_fapl_get(H5FD_t *_file); static void *H5FD_mpiposix_fapl_copy(const void *_old_fa); static herr_t H5FD_mpiposix_fapl_free(void *_fa); @@ -210,6 +211,7 @@ static const H5FD_class_mpi_t H5FD_mpiposix_g = { "mpiposix", /*name */ MAXADDR, /*maxaddr */ H5F_CLOSE_SEMI, /* fc_degree */ + H5FD_mpiposix_term, /*terminate */ NULL, /*sb_size */ NULL, /*sb_encode */ NULL, /*sb_decode */ @@ -308,16 +310,14 @@ done: * * Purpose: Shut down the VFD * - * Return: <none> + * Returns: Non-negative on success or negative on failure * * Programmer: Quincey Koziol * Friday, Jan 30, 2004 * - * Modification: - * *--------------------------------------------------------------------------- */ -void +static herr_t H5FD_mpiposix_term(void) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpiposix_term) @@ -325,7 +325,7 @@ H5FD_mpiposix_term(void) /* Reset VFL ID */ H5FD_MPIPOSIX_g=0; - FUNC_LEAVE_NOAPI_VOID + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5FD_mpiposix_term() */ @@ -873,7 +873,7 @@ H5FD_mpiposix_cmp(const H5FD_t *_f1, const H5FD_t *_f2) const H5FD_mpiposix_t *f2 = (const H5FD_mpiposix_t*)_f2; int ret_value=0; - FUNC_ENTER_NOAPI(H5FD_mpiposix_cmp, H5FD_VFD_DEFAULT) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpiposix_cmp) #ifdef _WIN32 if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1) @@ -936,8 +936,10 @@ H5FD_mpiposix_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */) /* Set the VFL feature flags that this driver supports */ if(flags) { *flags=0; - *flags|=H5FD_FEAT_AGGREGATE_METADATA; /* OK to aggregate metadata allocations */ + *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_ALLOCATE_EARLY; /* Allocate space early instead of late */ } /* end if */ done: |