diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2022-04-21 05:24:35 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-21 05:24:35 (GMT) |
commit | ec14985c8555bda02021568ea20295384a2cef7e (patch) | |
tree | 491c1f08a68d92e400d939d96fefdc7bfef57ddc /src/H5FDhdfs.c | |
parent | bc62da7eb911727497475d1cc90991230f33fa3d (diff) | |
download | hdf5-ec14985c8555bda02021568ea20295384a2cef7e.zip hdf5-ec14985c8555bda02021568ea20295384a2cef7e.tar.gz hdf5-ec14985c8555bda02021568ea20295384a2cef7e.tar.bz2 |
VFD SWMR: Merges from develop (#1670)
* Cleans up SWMR test scripts (both legacy and VFD)
* Brings over format source changes for Java
* Normalization of HL, Fortran, C++, Java w/ develop
* Removes the STATIC flavor of FUNC_ENTER macros (#1622)
* Removes the STATIC flavor of FUNC_ENTER macros
* Remove H5_NO_ALIGNMENT_RESTRICTIONS (#1426)
* Do not conditionally compile code that uses a pointer dereference
and assignment to copy a potentially unaligned variable to aligned
automatic storage, or vice versa. Instead, always use naked `memcpy(3)`s.
Disassembling the generated code reveals that the `memcpy(3)`s optimize
(`-O3`) to a single `mov` instruction for x86_64, which is not strict
about alignment.
This change reduces the size of code and scripts by 143 lines, eases
our way to cross-compilation, and avoids invoking undefined behavior.
* Committing clang-format changes
* Per discussion, use HD and add comments.
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Removes unused definitions from module headers (#1624)
* Misc stuff from develop (includes some parallel things)
* Brings over SWMR test quiet mode changes from develop
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/H5FDhdfs.c')
-rw-r--r-- | src/H5FDhdfs.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c index 4927a40..4e3ee9e 100644 --- a/src/H5FDhdfs.c +++ b/src/H5FDhdfs.c @@ -380,7 +380,7 @@ done: static herr_t H5FD__hdfs_term(void) { - FUNC_ENTER_STATIC_NOERR + FUNC_ENTER_PACKAGE_NOERR #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -414,7 +414,7 @@ H5FD__hdfs_handle_open(const char *path, const char *namenode_name, const int32_ hdfs_t * handle = NULL; hdfs_t * ret_value = NULL; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -499,7 +499,7 @@ H5FD__hdfs_handle_close(hdfs_t *handle) { herr_t ret_value = SUCCEED; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -551,7 +551,7 @@ H5FD__hdfs_validate_config(const H5FD_hdfs_fapl_t *fa) { herr_t ret_value = SUCCEED; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE HDassert(fa != NULL); @@ -679,7 +679,7 @@ H5FD__hdfs_fapl_get(H5FD_t *_file) H5FD_hdfs_fapl_t *fa = NULL; void * ret_value = NULL; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE fa = (H5FD_hdfs_fapl_t *)H5MM_calloc(sizeof(H5FD_hdfs_fapl_t)); if (fa == NULL) @@ -718,7 +718,7 @@ H5FD__hdfs_fapl_copy(const void *_old_fa) H5FD_hdfs_fapl_t * new_fa = NULL; void * ret_value = NULL; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE new_fa = (H5FD_hdfs_fapl_t *)H5MM_malloc(sizeof(H5FD_hdfs_fapl_t)); if (new_fa == NULL) @@ -751,7 +751,7 @@ H5FD__hdfs_fapl_free(void *_fa) { H5FD_hdfs_fapl_t *fa = (H5FD_hdfs_fapl_t *)_fa; - FUNC_ENTER_STATIC_NOERR + FUNC_ENTER_PACKAGE_NOERR HDassert(fa != NULL); /* sanity check */ @@ -788,7 +788,7 @@ hdfs__reset_stats(H5FD_hdfs_t *file) unsigned i = 0; herr_t ret_value = SUCCEED; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -846,7 +846,7 @@ H5FD__hdfs_open(const char *path, unsigned flags, hid_t fapl_id, haddr_t maxaddr hdfs_t * handle = NULL; H5FD_hdfs_fapl_t fa; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -978,7 +978,7 @@ hdfs__fprint_stats(FILE *stream, const H5FD_hdfs_t *file) unsigned suffix_i = 0; const char suffixes[] = {' ', 'K', 'M', 'G', 'T', 'P'}; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE if (stream == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file stream cannot be null") @@ -1184,7 +1184,7 @@ H5FD__hdfs_close(H5FD_t *_file) H5FD_hdfs_t *file = (H5FD_hdfs_t *)_file; herr_t ret_value = SUCCEED; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -1240,7 +1240,7 @@ H5FD__hdfs_cmp(const H5FD_t *_f1, const H5FD_t *_f2) hdfsFileInfo * finfo1 = NULL; hdfsFileInfo * finfo2 = NULL; - FUNC_ENTER_STATIC_NOERR + FUNC_ENTER_PACKAGE_NOERR #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -1313,7 +1313,7 @@ done: static herr_t H5FD__hdfs_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags) { - FUNC_ENTER_STATIC_NOERR + FUNC_ENTER_PACKAGE_NOERR #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -1351,7 +1351,7 @@ H5FD__hdfs_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type) { const H5FD_hdfs_t *file = (const H5FD_hdfs_t *)_file; - FUNC_ENTER_STATIC_NOERR + FUNC_ENTER_PACKAGE_NOERR #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -1382,7 +1382,7 @@ H5FD__hdfs_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr) { H5FD_hdfs_t *file = (H5FD_hdfs_t *)_file; - FUNC_ENTER_STATIC_NOERR + FUNC_ENTER_PACKAGE_NOERR #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -1416,7 +1416,7 @@ H5FD__hdfs_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type) { const H5FD_hdfs_t *file = (const H5FD_hdfs_t *)_file; - FUNC_ENTER_STATIC_NOERR + FUNC_ENTER_PACKAGE_NOERR #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -1451,7 +1451,7 @@ H5FD__hdfs_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_hand H5FD_hdfs_t *file = (H5FD_hdfs_t *)_file; herr_t ret_value = SUCCEED; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -1501,7 +1501,7 @@ H5FD__hdfs_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU unsigned bin_i = 0; #endif /* HDFS_STATS */ - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -1573,7 +1573,7 @@ H5FD__hdfs_write(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, h { herr_t ret_value = FAIL; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); @@ -1611,7 +1611,7 @@ H5FD__hdfs_truncate(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED dxpl_id, { herr_t ret_value = SUCCEED; - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", __func__); |