Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

H5fget_name_f len_trim fix #826

Closed
wants to merge 8 commits into from
Closed

H5fget_name_f len_trim fix #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0f07e8b
Use LEN() rather than LEN_TRIM() to determine buffer length (prevents…
jhaiduce Jul 7, 2021
4b5838b
Update reopentest to populate the buffer passed to h5fget_name_f with…
jhaiduce Jul 9, 2021
d7a9c29
Correct variable name (filename=>file_name)
jhaiduce Jul 9, 2021
8c4bf97
Check length of returned filename
jhaiduce Jul 9, 2021
bae6643
Add calls to check() so that that reopentest fails if the wrong filen…
jhaiduce Jul 9, 2021
fcafa75
Revert changes to reopentest, and add a new test that focuses on h5fg…
jhaiduce Jul 20, 2021
4ed79b8
Removed operations and variables copied from reopentest that are not …
jhaiduce Jul 20, 2021
bc27305
Change "dataset id" to "object id" since we also call this subroutine…
jhaiduce Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fortran/src/H5Fff.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ INTEGER FUNCTION h5fget_name_c(obj_id, size, buf, buflen) &
CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buf
END FUNCTION h5fget_name_c
END INTERFACE
buflen = LEN_TRIM(buf)
buflen = LEN(buf)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, change the declaration (line 827):

CHARACTER(LEN=*), INTENT(OUT) :: buf

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in new PR.

hdferr = h5fget_name_c(obj_id, size, buf, buflen)
END SUBROUTINE h5fget_name_f
!****s* H5F/h5fget_filesize_f
Expand Down
4 changes: 4 additions & 0 deletions fortran/test/fortranlib_test.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ PROGRAM fortranlibtest
CALL reopentest(cleanup, ret_total_error)
CALL write_test_status(ret_total_error, ' Reopen test', total_error)

ret_total_error = 0
CALL get_name_test(cleanup, ret_total_error)
CALL write_test_status(ret_total_error, ' Get name test', total_error)

ret_total_error = 0
CALL file_close(cleanup, ret_total_error)
CALL write_test_status(ret_total_error, ' File open/close test', total_error)
Expand Down
149 changes: 149 additions & 0 deletions fortran/test/tH5F.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,155 @@ SUBROUTINE reopentest(cleanup, total_error)

END SUBROUTINE reopentest

! The following subroutine checks that h5fget_name_f produces
! correct output for a given obj_id and filename.
!

SUBROUTINE check_get_name(obj_id, fix_filename, total_error)
USE HDF5 ! This module contains all necessary modules
USE TH5_MISC
IMPLICIT NONE
INTEGER(HID_T) :: obj_id ! Object identifier
CHARACTER(LEN=80), INTENT(IN) :: fix_filename ! Expected filename
INTEGER, INTENT(INOUT) :: total_error ! Error count

CHARACTER(LEN=80) ::file_name ! Filename buffer
INTEGER::error ! HDF5 error code
INTEGER(SIZE_T)::name_size ! Filename length
!
!Get file name from the dataset identifier
!

! Use an uninitialized buffer
CALL h5fget_name_f(obj_id, file_name, name_size, error)
CALL check("h5fget_name_f",error,total_error)
IF(name_size .NE. LEN_TRIM(fix_filename))THEN
WRITE(*,*) " file name size obtained from the dataset id is incorrect"
total_error = total_error + 1
ENDIF
IF(file_name(1:name_size) .NE. TRIM(fix_filename)) THEN
WRITE(*,*) " file name obtained from the object id is incorrect"
total_error = total_error + 1
END IF

! Use a buffer initialized with spaces
file_name(:) = " "
CALL h5fget_name_f(obj_id, file_name, name_size, error)
CALL check("h5fget_name_f",error,total_error)
IF(name_size .NE. LEN_TRIM(fix_filename))THEN
WRITE(*,*) " file name size obtained from the object id is incorrect"
total_error = total_error + 1
ENDIF
IF(file_name(1:name_size) .NE. TRIM(fix_filename)) THEN
WRITE(*,*) " file name obtained from the dataset id is incorrect"
total_error = total_error + 1
END IF

! Use a buffer initialized with non-whitespace characters
file_name(:) = "a"
CALL h5fget_name_f(obj_id, file_name, name_size, error)
CALL check("h5fget_name_f",error,total_error)
IF(name_size .NE. LEN_TRIM(fix_filename))THEN
WRITE(*,*) " file name size obtained from the object id is incorrect"
total_error = total_error + 1
ENDIF
IF(file_name(1:name_size) .NE. TRIM(fix_filename)) THEN
WRITE(*,*) " file name obtained from the object id is incorrect"
total_error = total_error + 1
END IF

END SUBROUTINE check_get_name

! The following subroutine tests h5fget_name_f.
! It creates the file which has name "filename.h5" and
! tests that h5fget_name_f also returns the name "filename.h5"
!

SUBROUTINE get_name_test(cleanup, total_error)
USE HDF5 ! This module contains all necessary modules
USE TH5_MISC
IMPLICIT NONE
LOGICAL, INTENT(IN) :: cleanup
INTEGER, INTENT(INOUT) :: total_error

!
CHARACTER(LEN=*), PARAMETER :: filename = "filename"
CHARACTER(LEN=80) :: fix_filename

INTEGER(HID_T) :: file_id ! File identifier
INTEGER(HID_T) :: dset_id ! Dataset identifier

!
!dataset name is "dset"
!
CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"

!
!data space rank and dimensions
!
INTEGER, PARAMETER :: RANK = 2
INTEGER, PARAMETER :: NX = 4
INTEGER, PARAMETER :: NY = 6

!
! data space identifier
!
INTEGER(HID_T) :: dataspace

!
!The dimensions for the dataset.
!
INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)

!
!flag to check operation success
!
INTEGER :: error

!
!Create file "filename.h5" using default properties.
!
CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
if (error .ne. 0) then
write(*,*) "Cannot modify filename"
stop
endif
CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
CALL check("h5fcreate_f",error,total_error)

!
!Create data space for the dataset.
!
CALL h5screate_simple_f(RANK, dims, dataspace, error)
CALL check("h5screate_simple_f",error,total_error)

!
!Create dataset "/dset" inside the file .
!
CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, &
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest simplifying this by just opening the root group "/" and using the group id instead of going through the trouble of creating a dataset.
call h5gopen_f(file_id,"/",g_id,ierr)

dset_id, error)
CALL check("h5dcreate_f",error,total_error)

CALL check_get_name(file_id, fix_filename, total_error)
CALL check_get_name(dset_id, fix_filename, total_error)

!Close the dataset.
!
CALL h5dclose_f(dset_id, error)
CALL check("h5dclose_f",error,total_error)

!
!Close the file identifiers.
!
CALL h5fclose_f(file_id, error)
CALL check("h5fclose_f",error,total_error)

if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
CALL check("h5_cleanup_f", error, total_error)
RETURN

END SUBROUTINE get_name_test

!
! The following example demonstrates how to get creation property list,
! and access property list.
Expand Down