philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1963 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

Browse Source 
* commit 'bbe81a2155bfa42545579761c4f064353d6f68de':
  fix for statement declare of type
This commit is contained in:
Allen Byrne
2019-09-30 15:14:02 -05:00
parent 35dc4b56d0 bbe81a2155
commit 69e31596ff
3 changed files with 61 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/H5FDhdfs.c
View File

@@ -64,7 +64,7 @@ static hid_t H5FD_HDFS_g = 0;
#define HDFS_STATS_START_POWER 10
#define HDFS_STATS_BIN_COUNT 16 /* MUST BE GREATER THAN 0 */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Calculate `BASE ^ (START_POWER + (INTERVAL * bin_i))`
* Stores result at `(unsigned long long *) out_ptr`.
@@ -87,7 +87,7 @@ static hid_t H5FD_HDFS_g = 0;
/* array to hold pre-computed boundaries for stats bins */
static unsigned long long hdfs_stats_boundaries[HDFS_STATS_BIN_COUNT];
/***************************************************************************
*
* Structure: hdfs_statsbin
@@ -137,7 +137,7 @@ typedef struct {
*/
#define HDFS_HDFST_MAGIC 0x1AD5DE84
/***************************************************************************
*
* Structure: hdfs_t
@@ -186,7 +186,7 @@ typedef struct {
hdfsFile file;
} hdfs_t;
/*--------------------------------------------------------------------------
* Function: H5FD_hdfs_handle_open
*
@@ -313,7 +313,7 @@ done:
} /* H5FD_hdfs_handle_open() */
/*--------------------------------------------------------------------------
* Function: H5FD_hdfs_handle_close
*
@@ -375,7 +375,7 @@ done:
#endif /* H5_HAVE_LIBHDFS */
/***************************************************************************
*
* Structure: H5FD_hdfs_t
@@ -529,7 +529,7 @@ static const H5FD_class_t H5FD_hdfs_g = {
H5FL_DEFINE_STATIC(H5FD_hdfs_t);
#endif /* H5_HAVE_LIBHDFS */
/*-------------------------------------------------------------------------
* Function: H5FD__init_package
*
@@ -559,7 +559,7 @@ done:
} /* H5FD__init_package() */
/*-------------------------------------------------------------------------
* Function: H5FD_hdfs_init
*
@@ -581,6 +581,7 @@ hid_t
H5FD_hdfs_init(void)
{
hid_t ret_value = H5I_INVALID_HID; /* Return value */
unsigned int bin_i;
FUNC_ENTER_NOAPI(FAIL)
@@ -598,7 +599,7 @@ H5FD_hdfs_init(void)
#if HDFS_STATS
/* pre-compute statsbin boundaries
*/
for (unsigned bin_i = 0; bin_i < HDFS_STATS_BIN_COUNT; bin_i++) {
for (bin_i = 0; bin_i < HDFS_STATS_BIN_COUNT; bin_i++) {
unsigned long long value = 0;
HDFS_STATS_POW(bin_i, &value)
hdfs_stats_boundaries[bin_i] = value;
@@ -612,7 +613,7 @@ done:
} /* end H5FD_hdfs_init() */
/*---------------------------------------------------------------------------
* Function: H5FD_hdfs_term
*
@@ -643,7 +644,7 @@ H5FD_hdfs_term(void)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_hdfs_term() */
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_hdfs
*
@@ -696,7 +697,7 @@ done:
} /* H5Pset_fapl_hdfs() */
/*-------------------------------------------------------------------------
* Function: H5FD_hdfs_validate_config()
*
@@ -747,7 +748,7 @@ done:
} /* H5FD_hdfs_validate_config() */
/*-------------------------------------------------------------------------
* Function: H5Pget_fapl_hdfs
*
@@ -808,7 +809,7 @@ done:
} /* H5Pget_fapl_hdfs() */
/*-------------------------------------------------------------------------
* Function: H5FD_hdfs_fapl_get
*
@@ -855,7 +856,7 @@ done:
} /* H5FD_hdfs_fapl_get() */
/*-------------------------------------------------------------------------
* Function: H5FD_hdfs_fapl_copy
*
@@ -899,7 +900,7 @@ done:
} /* H5FD_hdfs_fapl_copy() */
/*-------------------------------------------------------------------------
* Function: H5FD_hdfs_fapl_free
*
@@ -930,7 +931,7 @@ H5FD_hdfs_fapl_free(void *_fa)
} /* H5FD_hdfs_fapl_free() */
#if HDFS_STATS
/*----------------------------------------------------------------------------
*
* Function: hdfs_reset_stats()
@@ -989,7 +990,7 @@ done:
} /* hdfs_reset_stats */
#endif /* HDFS_STATS */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_open()
@@ -1138,7 +1139,7 @@ done:
#endif /* H5_HAVE_LIBHDFS */
#if HDFS_STATS
/*----------------------------------------------------------------------------
*
* Function: hdfs_fprint_stats()
@@ -1425,7 +1426,7 @@ done:
} /* hdfs_fprint_stats */
#endif /* HDFS_STATS */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_close()
@@ -1508,7 +1509,7 @@ done:
#endif /* H5_HAVE_LIBHDFS */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_cmp()
@@ -1592,7 +1593,7 @@ H5FD_hdfs_cmp(
#endif /* H5_HAVE_LIBHDFS */
/*-------------------------------------------------------------------------
* Function: H5FD_hdfs_query
*
@@ -1631,7 +1632,7 @@ H5FD_hdfs_query(
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5FD_hdfs_query() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_get_eoa()
@@ -1689,7 +1690,7 @@ H5FD_hdfs_get_eoa(
#endif /* H5_HAVE_LIBHDFS */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_set_eoa()
@@ -1749,7 +1750,7 @@ H5FD_hdfs_set_eoa(
#endif /* H5_HAVE_LIBHDFS */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_get_eof()
@@ -1807,7 +1808,7 @@ H5FD_hdfs_get_eof(
#endif /* H5_HAVE_LIBHDFS */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_get_handle()
@@ -1880,7 +1881,7 @@ done:
#endif /* H5_HAVE_LIBHDFS */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_read()
@@ -2014,7 +2015,7 @@ done:
#endif /* H5_HAVE_LIBHDFS */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_write()
@@ -2059,7 +2060,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5FD_hdfs_write() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_truncate()
@@ -2103,7 +2104,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_hdfs_truncate() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_lock()
@@ -2136,7 +2137,7 @@ H5FD_hdfs_lock(
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_hdfs_lock() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_hdfs_unlock()

53
src/H5FDros3.c
View File

@@ -68,7 +68,7 @@ static hid_t H5FD_ROS3_g = 0;
#define ROS3_STATS_START_POWER 10
#define ROS3_STATS_BIN_COUNT 16 /* MUST BE GREATER THAN 0 */
/*
* Calculate `BASE ^ (START_POWER + (INTERVAL * bin_i))`
* Stores result at `(unsigned long long *) out_ptr`.
@@ -278,7 +278,7 @@ static const H5FD_class_t H5FD_ros3_g = {
/* Declare a free list to manage the H5FD_ros3_t struct */
H5FL_DEFINE_STATIC(H5FD_ros3_t);
/*-------------------------------------------------------------------------
* Function: H5FD__init_package
*
@@ -307,7 +307,7 @@ done:
} /* end H5FD__init_package() */
/*-------------------------------------------------------------------------
* Function: H5FD_ros3_init
*
@@ -325,6 +325,7 @@ hid_t
H5FD_ros3_init(void)
{
hid_t ret_value = H5I_INVALID_HID;
unsigned int bin_i;
FUNC_ENTER_NOAPI(FAIL)
@@ -338,7 +339,7 @@ H5FD_ros3_init(void)
#if ROS3_STATS
/* pre-compute statsbin boundaries
*/
for (unsigned bin_i = 0; bin_i < ROS3_STATS_BIN_COUNT; bin_i++) {
for (bin_i = 0; bin_i < ROS3_STATS_BIN_COUNT; bin_i++) {
unsigned long long value = 0;
ROS3_STATS_POW(bin_i, &value)
ros3_stats_boundaries[bin_i] = value;
@@ -353,7 +354,7 @@ done:
} /* end H5FD_ros3_init() */
/*---------------------------------------------------------------------------
* Function: H5FD_ros3_term
*
@@ -381,7 +382,7 @@ H5FD_ros3_term(void)
} /* end H5FD_ros3_term() */
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_ros3
*
@@ -430,7 +431,7 @@ done:
} /* end H5Pset_fapl_ros3() */
/*-------------------------------------------------------------------------
* Function: H5FD_ros3_validate_config()
*
@@ -481,7 +482,7 @@ done:
} /* end H5FD_ros3_validate_config() */
/*-------------------------------------------------------------------------
* Function: H5Pget_fapl_ros3
*
@@ -540,7 +541,7 @@ done:
} /* end H5Pget_fapl_ros3() */
/*-------------------------------------------------------------------------
* Function: H5FD_ros3_fapl_get
*
@@ -589,7 +590,7 @@ done:
} /* end H5FD_ros3_fapl_get() */
/*-------------------------------------------------------------------------
* Function: H5FD_ros3_fapl_copy
*
@@ -634,7 +635,7 @@ done:
} /* end H5FD_ros3_fapl_copy() */
/*-------------------------------------------------------------------------
* Function: H5FD_ros3_fapl_free
*
@@ -665,7 +666,7 @@ H5FD_ros3_fapl_free(void *_fa)
} /* end H5FD_ros3_fapl_free() */
#if ROS3_STATS
/*----------------------------------------------------------------------------
*
* Function: ros3_reset_stats()
@@ -723,7 +724,7 @@ done:
#endif /* ROS3_STATS */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_open()
@@ -880,7 +881,7 @@ done:
} /* end H5FD_ros3_open() */
#if ROS3_STATS
/*----------------------------------------------------------------------------
*
* Function: ros3_fprint_stats()
@@ -1169,7 +1170,7 @@ done:
} /* ros3_fprint_stats */
#endif /* ROS3_STATS */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_close()
@@ -1230,7 +1231,7 @@ done:
} /* end H5FD_ros3_close() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_cmp()
@@ -1395,7 +1396,7 @@ done:
} /* H5FD_ros3_cmp() */
/*-------------------------------------------------------------------------
* Function: H5FD_ros3_query
*
@@ -1436,7 +1437,7 @@ H5FD_ros3_query(const H5FD_t H5_ATTR_UNUSED *_file,
} /* H5FD_ros3_query() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_get_eoa()
@@ -1472,7 +1473,7 @@ H5FD_ros3_get_eoa(const H5FD_t *_file,
} /* end H5FD_ros3_get_eoa() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_set_eoa()
@@ -1509,7 +1510,7 @@ H5FD_ros3_set_eoa(H5FD_t *_file,
} /* H5FD_ros3_set_eoa() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_get_eof()
@@ -1544,7 +1545,7 @@ H5FD_ros3_get_eof(const H5FD_t *_file,
} /* end H5FD_ros3_get_eof() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_get_handle()
@@ -1587,7 +1588,7 @@ done:
} /* end H5FD_ros3_get_handle() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_read()
@@ -1685,7 +1686,7 @@ done:
} /* end H5FD_ros3_read() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_write()
@@ -1728,7 +1729,7 @@ done:
} /* H5FD_ros3_write() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_truncate()
@@ -1770,7 +1771,7 @@ done:
} /* end H5FD_ros3_truncate() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_lock()
@@ -1801,7 +1802,7 @@ H5FD_ros3_lock(H5FD_t H5_ATTR_UNUSED *_file,
} /* end H5FD_ros3_lock() */
/*-------------------------------------------------------------------------
*
* Function: H5FD_ros3_unlock()

3
tools/libtest/h5tools_test_utils.c
View File

@@ -1134,6 +1134,7 @@ test_set_configured_fapl(void)
#endif /* H5_HAVE_LIBHDFS */
}; /* testcases `cases` array */
unsigned int i;
#ifdef H5_HAVE_ROS3_VFD
n_cases += 5;
@@ -1145,7 +1146,7 @@ test_set_configured_fapl(void)
TESTING("programmatic fapl set");
for (unsigned i = 0; i < n_cases; i++) {
for (i = 0; i < n_cases; i++) {
int result;
testcase C = cases[i];