diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-08-11 02:26:34 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-08-11 02:26:34 (GMT) |
| commit | 3552beb08b10a9037691905b5dec644428a9ac35 (patch) | |
| tree | f86885d94be4de02831c1cf3a0fb68633c837ee3 /src/H5FDmpiposix.c | |
| parent | 60c9d88951866b4f8c9d0b8b7a04ac5a31d00edb (diff) | |
| download | hdf5-3552beb08b10a9037691905b5dec644428a9ac35.zip hdf5-3552beb08b10a9037691905b5dec644428a9ac35.tar.gz hdf5-3552beb08b10a9037691905b5dec644428a9ac35.tar.bz2 | |
[svn-r22666] Description:
Merge "flush me last" & "flush me collectively" feature from the
avoid_truncate branch back to the trunk. (To help enable allowing the
free space section info to reside in temporary address space)
Tested on:
Mac OSX/64 10.7.4 (amazon) w/debug, gcc 4.7.x, C++, FORTRAN & threadsafe
(h5committest forthcoming)
Diffstat (limited to 'src/H5FDmpiposix.c')
| -rw-r--r-- | src/H5FDmpiposix.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c index e6c23f0..0ad39a9 100644 --- a/src/H5FDmpiposix.c +++ b/src/H5FDmpiposix.c @@ -89,12 +89,12 @@ typedef struct H5FD_mpiposix_t { MPI_Comm comm; /*communicator */ int mpi_rank; /* This process's rank */ int mpi_size; /* Total number of processes */ - haddr_t eof; /*end-of-file marker */ - haddr_t eoa; /*end-of-address marker */ - haddr_t last_eoa; /* Last known end-of-address marker */ - haddr_t pos; /* Current file I/O position */ - int op; /* Last file I/O operation */ - hsize_t naccess; /* Number of (write) accesses to file */ + haddr_t eof; /*end-of-file marker */ + haddr_t eoa; /*end-of-address marker */ + haddr_t last_eoa; /* Last known end-of-address marker */ + haddr_t pos; /* Current file I/O position */ + int op; /* Last file I/O operation */ + hsize_t naccess; /* Number of (write) accesses to file */ #ifdef H5_HAVE_GPFS size_t blksize; /* Block size of file system */ #endif @@ -230,13 +230,13 @@ static const H5FD_class_mpi_t H5FD_mpiposix_g = { H5FD_mpiposix_set_eoa, /*set_eoa */ H5FD_mpiposix_get_eof, /*get_eof */ H5FD_mpiposix_get_handle, /*get_handle */ - H5FD_mpiposix_read, /*read */ - H5FD_mpiposix_write, /*write */ + H5FD_mpiposix_read, /*read */ + H5FD_mpiposix_write, /*write */ NULL, /*flush */ - H5FD_mpiposix_truncate, /*truncate */ + H5FD_mpiposix_truncate, /*truncate */ NULL, /*lock */ NULL, /*unlock */ - H5FD_FLMAP_SINGLE /*fl_map */ + H5FD_FLMAP_SINGLE /*fl_map */ }, /* End of superclass information */ H5FD_mpiposix_mpi_rank, /*get_rank */ H5FD_mpiposix_mpi_size, /*get_size */ |