Closed a wayward fapl ID in tools/test/misc/repart_test.c

and tidied.
This commit is contained in:
Dana Robinson 2017-07-19 15:26:34 -05:00
parent bee8bce551
commit ec7450c4b4

View File

@ -12,19 +12,16 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Raymond Lu <slu@ncsa.uiuc.edu>
* June 1, 2005
*
* Purpose: This program tests family files after being repartitioned
* by h5repart. It simply tries to reopen the files with
* correct family driver and member size.
*/
#include "hdf5.h"
#include "H5private.h"
#define KB 1024
#define FAMILY_H5REPART_SIZE1 20000
#define FAMILY_H5REPART_SIZE2 (5*KB)
#define MAX(a,b) (a>b ? a:b)
const char *FILENAME[] = {
"fst_family%05d.h5",
@ -42,52 +39,54 @@ herr_t test_sec2_h5repart_opens(void);
*
* Purpose: Tries to reopen family files.
*
* Return: Success: exit(0)
* Return: SUCCEED/FAIL
*
* Failure: exit(1)
*
* Programmer: Raymond Lu
* June 1, 2005
*
* Modifications:
*-------------------------------------------------------------------------
*/
herr_t
test_family_h5repart_opens(void)
{
hid_t file=(-1), fapl=(-1);
hid_t fid = -1;
hid_t fapl_id = -1;
/* open 1st file(single member file) with correct family size(20000 byte) */
if ((fapl=H5Pcreate(H5P_FILE_ACCESS))<0)
if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
goto error;
if(H5Pset_fapl_family(fapl, (hsize_t)FAMILY_H5REPART_SIZE1, H5P_DEFAULT)<0)
if (H5Pset_fapl_family(fapl_id, (hsize_t)FAMILY_H5REPART_SIZE1, H5P_DEFAULT) < 0)
goto error;
if((file=H5Fopen(FILENAME[0], H5F_ACC_RDWR, fapl))<0)
if ((fid = H5Fopen(FILENAME[0], H5F_ACC_RDWR, fapl_id))<0)
goto error;
if(H5Fclose(file)<0)
if (H5Fclose(fid) < 0)
goto error;
/* open 2nd file(multiple member files) with correct family size(5KB) */
if(H5Pset_fapl_family(fapl, (hsize_t)FAMILY_H5REPART_SIZE2, H5P_DEFAULT)<0)
if (H5Pset_fapl_family(fapl_id, (hsize_t)FAMILY_H5REPART_SIZE2, H5P_DEFAULT) < 0)
goto error;
if((file=H5Fopen(FILENAME[1], H5F_ACC_RDWR, fapl))<0)
if ((fid = H5Fopen(FILENAME[1], H5F_ACC_RDWR, fapl_id)) < 0)
goto error;
if(H5Fclose(file)<0)
if (H5Pclose(fapl_id) < 0)
goto error;
return 0;
if (H5Fclose(fid) < 0)
goto error;
return SUCCEED;
error:
H5E_BEGIN_TRY {
H5Fclose(file);
H5Pclose(fapl_id);
H5Fclose(fid);
} H5E_END_TRY;
return -1;
}
return FAIL;
} /* end test_family_h5repart_opens() */
/*-------------------------------------------------------------------------
@ -95,36 +94,32 @@ error:
*
* Purpose: Tries to reopen a sec2 file.
*
* Return: Success: exit(0)
* Return: SUCCEED/FAIL
*
* Failure: exit(1)
*
* Programmer: Raymond Lu
* June 21, 2005
*
* Modifications:
*-------------------------------------------------------------------------
*/
herr_t
test_sec2_h5repart_opens(void)
{
hid_t file=(-1);
hid_t fid = -1;
/* open the sec2 file */
if((file=H5Fopen(FILENAME[2], H5F_ACC_RDWR, H5P_DEFAULT))<0)
if ((fid = H5Fopen(FILENAME[2], H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
goto error;
if(H5Fclose(file)<0)
if (H5Fclose(fid) < 0)
goto error;
return 0;
return SUCCEED;
error:
H5E_BEGIN_TRY {
H5Fclose(file);
H5Fclose(fid);
} H5E_END_TRY;
return -1;
}
return FAIL;
} /* end test_sec2_h5repart_opens() */
/*-------------------------------------------------------------------------
@ -132,32 +127,26 @@ error:
*
* Purpose: Tests h5repart-ed family files
*
* Return: Success: exit(0)
*
* Failure: exit(1)
*
* Programmer: Raymond Lu
* June 1, 2005
*
* Modifications:
* Return: EXIT_SUCCESS/EXIT_FAILURE
*
*-------------------------------------------------------------------------
*/
int
main(void)
{
int nerrors=0;
int nerrors = 0;
nerrors += test_family_h5repart_opens()<0 ?1:0;
nerrors += test_sec2_h5repart_opens()<0 ?1:0;
nerrors += test_family_h5repart_opens() < 0 ? 1 : 0;
nerrors += test_sec2_h5repart_opens() < 0 ? 1 : 0;
if (nerrors) goto error;
if (nerrors)
goto error;
return 0;
HDexit(EXIT_SUCCESS);
error:
nerrors = MAX(1, nerrors);
printf("***** %d FAMILY FILE TEST%s FAILED! *****\n",
HDprintf("***** %d FAMILY FILE TEST%s FAILED! *****\n",
nerrors, 1 == nerrors ? "" : "S");
return 1;
}
HDexit(EXIT_FAILURE);
} /* end main() */