Skip to content

Commit 098036a

Browse files
committed
fix: use object API (h5orefresh/h5oflush) for cross-platform SWMR support
1 parent 59520a1 commit 098036a

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

src/read.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use hdf5, only : &
66
H5Aget_space_f, H5Aget_type_f, H5Aopen_by_name_f, H5Aclose_f, H5Aget_storage_size_f, &
77
h5pget_layout_f, h5pget_chunk_f, h5pclose_f, h5pget_nfilters_f, h5pget_filter_f, &
8-
H5Dget_create_plist_f, h5dget_type_f, h5dopen_f, h5dclose_f, H5Dget_space_f, H5Dget_storage_size_f, h5drefresh_f, &
8+
H5Dget_create_plist_f, h5dget_type_f, h5dopen_f, h5dclose_f, H5Dget_space_f, H5Dget_storage_size_f, &
99
H5Iget_type_f, &
1010
h5lexists_f, &
1111
H5Sget_simple_extent_ndims_f, H5Sget_simple_extent_dims_f, H5Sget_simple_extent_npoints_f, H5Sclose_f, &
@@ -149,8 +149,8 @@
149149
call H5Dopen_f(self%file_id, dname, dset_id, ier)
150150
call estop(ier, "refresh:H5Dopen", self%filename, dname)
151151

152-
call H5Drefresh_f(dset_id, ier)
153-
call estop(ier, "refresh:H5Drefresh", self%filename, dname)
152+
call H5Orefresh_f(dset_id, ier)
153+
call estop(ier, "refresh:H5Orefresh", self%filename, dname)
154154

155155
call H5Dclose_f(dset_id, ier)
156156
call estop(ier, "refresh:H5Dclose", self%filename, dname)

src/write.f90

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
submodule (h5fortran) write
22

33
use hdf5, only: &
4-
<<<<<<< HEAD
54
h5fflush_f, h5oflush_f, &
6-
=======
7-
h5fflush_f, h5dflush_f, &
8-
>>>>>>> origin/feature/swmr
95
h5screate_f, h5sclose_f, h5screate_simple_f, H5Sget_simple_extent_ndims_f, H5Sget_simple_extent_dims_f, &
106
h5dcreate_f, h5dopen_f, h5dclose_f, h5dget_space_f, &
11-
h5dcreate_f, h5dopen_f, h5dclose_f, h5dget_space_f, &
127
h5pset_chunk_f, h5pset_layout_f, h5pset_deflate_f, h5pset_shuffle_f, h5pset_fletcher32_f, &
138
h5pcreate_f, h5pclose_f, h5pset_fill_value_f, &
149
H5P_DATASET_CREATE_F, &

test_oref.f90

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
program test_oref
2+
use hdf5
3+
implicit none
4+
integer :: ier
5+
integer(HID_T) :: id = 0
6+
call h5orefresh_f(id, ier)
7+
call h5oflush_f(id, ier)
8+
end program test_oref

0 commit comments

Comments
 (0)