diff options
author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-03-20 17:39:06 (GMT) |
---|---|---|
committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-03-20 17:39:06 (GMT) |
commit | a90774e8cc0028b9935c6dfadb2a316337e4eea4 (patch) | |
tree | 2a922d79ef410a3f80e9cf4d905c29aaaf76f7c4 /src/H5FDfphdf5.c | |
parent | 9f7ef95fcd3eebe2f8edea204052c4f93776649b (diff) | |
download | hdf5-a90774e8cc0028b9935c6dfadb2a316337e4eea4.zip hdf5-a90774e8cc0028b9935c6dfadb2a316337e4eea4.tar.gz hdf5-a90774e8cc0028b9935c6dfadb2a316337e4eea4.tar.bz2 |
[svn-r6514] Purpose:
Bug fix and Update
Description:
From Quincey's comments on the code I checked in last night:
- In H5F_close call, the "private" processes should call the
H5F_flush with the "CLEAR_ONLY" flag.
- There's no need for a special case for FPHDF5 in the
FD_real_alloc function since FPHDF5 doesn't define an alloc
function.
- The return type of H5Pset_fapl_fphdf5 should be herr_t instead
of hid_t. I don't know how it got that way in the first place.
- The variable names for MPI types and the structure typedefs
should be switched: H5FP_request/H5FP_request_t to
H5FP_request_t/H5FP_request and so on.
- In the H5FP.c module, I was commiting the H5FP_request MPI
datatype but using the wrong offset field...
Platforms tested:
Linux...will test on others, but these are mostly FPHDF5 changes.
Misc. update:
Diffstat (limited to 'src/H5FDfphdf5.c')
-rw-r--r-- | src/H5FDfphdf5.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5FDfphdf5.c b/src/H5FDfphdf5.c index 365325c..ce293bb 100644 --- a/src/H5FDfphdf5.c +++ b/src/H5FDfphdf5.c @@ -197,7 +197,7 @@ done: * Modifications: *------------------------------------------------------------------------- */ -hid_t +herr_t H5Pset_fapl_fphdf5(hid_t fapl_id, MPI_Comm comm, MPI_Comm barrier_comm, MPI_Info info, unsigned sap_rank) { @@ -207,7 +207,7 @@ H5Pset_fapl_fphdf5(hid_t fapl_id, MPI_Comm comm, MPI_Comm barrier_comm, herr_t ret_value; FUNC_ENTER_API(H5Pset_fapl_fphdf5, FAIL); - H5TRACE5("i","iMcMcMiIu",fapl_id,comm,barrier_comm,info,sap_rank); + H5TRACE5("e","iMcMcMiIu",fapl_id,comm,barrier_comm,info,sap_rank); if (fapl_id == H5P_DEFAULT) HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, @@ -1402,7 +1402,7 @@ H5FD_fphdf5_write(H5FD_t *_file, H5FD_mem_t mem_type, hid_t dxpl_id, FUNC_ENTER_NOAPI(H5FD_fphdf5_write, FAIL); -HDfprintf(stderr, "%s: Entering: rank==%d, addr==%Hd, size==%d\n", +HDfprintf(stderr, "%s: Entering: rank==%d, addr==%a, size==%Zu\n", FUNC, file->mpi_rank, addr, size); /* check args */ @@ -1536,7 +1536,7 @@ H5FD_fphdf5_write_real(H5FD_t *_file, hid_t dxpl_id, MPI_Offset mpi_off, int siz FUNC_ENTER_NOAPI(H5FD_fphdf5_write_real, FAIL); -HDfprintf(stderr, "%s: %d: Entering: addr=%Hd, size=%d\n", FUNC, +HDfprintf(stderr, "%s: %d: Entering: addr=%a, size=%Zu\n", FUNC, H5FD_fphdf5_mpi_rank(_file), (haddr_t)mpi_off, size); /* check args */ @@ -1607,7 +1607,7 @@ HDfprintf(stderr, "%s: %d: Entering: addr=%Hd, size=%d\n", FUNC, int i; sleep(3); - HDfprintf(stderr, "%s: writing at %Hd\n", FUNC, (haddr_t)mpi_off); + HDfprintf(stderr, "%s: writing at %a\n", FUNC, (haddr_t)mpi_off); for (i = 0; i < size; ++i) { if (i % 7 == 0) |