diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2023-09-22 13:41:57 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-22 13:41:57 (GMT) |
| commit | dece6256bff8ee8b04ed63376233c03568e4edb1 (patch) | |
| tree | 6aa4b07c66a1294ef067041a71b93538ec0ab045 /src | |
| parent | 16ac8f74d4fa72c9092b6701bca1328770aa9dbe (diff) | |
| download | hdf5-dece6256bff8ee8b04ed63376233c03568e4edb1.zip hdf5-dece6256bff8ee8b04ed63376233c03568e4edb1.tar.gz hdf5-dece6256bff8ee8b04ed63376233c03568e4edb1.tar.bz2 | |
Adds link to h5fuse.sh in testpar for autotools (#3557)
* Make the h5fuse.sh utility available to parallel subfiling tests so h5fuse testing is not skipped.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5FDsubfiling/H5FDioc.c | 3 | ||||
| -rw-r--r-- | src/H5FDsubfiling/H5FDsubfile_int.c | 1 | ||||
| -rw-r--r-- | src/H5FDsubfiling/H5FDsubfiling_priv.h | 2 | ||||
| -rw-r--r-- | src/H5FDsubfiling/H5subfiling_common.c | 3 |
4 files changed, 8 insertions, 1 deletions
diff --git a/src/H5FDsubfiling/H5FDioc.c b/src/H5FDsubfiling/H5FDioc.c index 0dfcc36..cff80c7 100644 --- a/src/H5FDsubfiling/H5FDioc.c +++ b/src/H5FDsubfiling/H5FDioc.c @@ -32,6 +32,8 @@ #include "H5MMprivate.h" /* Memory management */ #include "H5Pprivate.h" /* Property lists */ +#define CANBE_UNUSED(X) (void)(X) + /* The driver identification number, initialized at runtime */ static hid_t H5FD_IOC_g = H5I_INVALID_HID; @@ -1223,6 +1225,7 @@ H5FD__ioc_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS H5FD_IOC_LOG_CALL(__func__); assert(file && file->pub.cls); + CANBE_UNUSED(file); assert(buf); /* Check for overflow conditions */ diff --git a/src/H5FDsubfiling/H5FDsubfile_int.c b/src/H5FDsubfiling/H5FDsubfile_int.c index 68deb83..cb210b6 100644 --- a/src/H5FDsubfiling/H5FDsubfile_int.c +++ b/src/H5FDsubfiling/H5FDsubfile_int.c @@ -347,6 +347,7 @@ H5FD__subfiling__get_real_eof(hid_t context_id, int64_t *logical_eof_ptr) assert(ioc_rank >= 0); assert(ioc_rank < n_io_concentrators); + CANBE_UNUSED(ioc_rank); assert(sf_eofs[i] == -1); sf_eofs[i] = recv_msg[(3 * i) + 1]; diff --git a/src/H5FDsubfiling/H5FDsubfiling_priv.h b/src/H5FDsubfiling/H5FDsubfiling_priv.h index 08fef7d..9cc32f1 100644 --- a/src/H5FDsubfiling/H5FDsubfiling_priv.h +++ b/src/H5FDsubfiling/H5FDsubfiling_priv.h @@ -63,4 +63,6 @@ H5_DLL herr_t H5FD__subfiling__get_real_eof(hid_t context_id, int64_t *logical_e } #endif +#define CANBE_UNUSED(X) (void)(X) + #endif /* H5FDsubfiling_priv_H */ diff --git a/src/H5FDsubfiling/H5subfiling_common.c b/src/H5FDsubfiling/H5subfiling_common.c index 50ca6af..0362ab4 100644 --- a/src/H5FDsubfiling/H5subfiling_common.c +++ b/src/H5FDsubfiling/H5subfiling_common.c @@ -1365,7 +1365,8 @@ init_app_layout(sf_topology_t *app_topology, MPI_Comm comm, MPI_Comm node_comm) if (app_layout->layout[i].node_local_rank == 0) app_layout->node_count++; - assert(app_layout->node_count > 0); + if (app_layout->node_count <= 0) + H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "node count less than or equal to zero"); if (NULL == (app_layout->node_ranks = malloc((size_t)app_layout->node_count * sizeof(*app_layout->node_ranks)))) |