diff options
Diffstat (limited to 'src/H5FDsubfiling/H5FDsubfiling.c')
| -rw-r--r-- | src/H5FDsubfiling/H5FDsubfiling.c | 236 |
1 files changed, 118 insertions, 118 deletions
diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c index 64c92ed..2371895 100644 --- a/src/H5FDsubfiling/H5FDsubfiling.c +++ b/src/H5FDsubfiling/H5FDsubfiling.c @@ -393,8 +393,8 @@ H5FD__subfiling_term(void) } #ifdef H5FD_SUBFILING_DEBUG else - HDprintf("** WARNING **: HDF5 is terminating the Subfiling VFD after MPI_Finalize() was " - "called - an HDF5 ID was probably left unclosed\n"); + printf("** WARNING **: HDF5 is terminating the Subfiling VFD after MPI_Finalize() was " + "called - an HDF5 ID was probably left unclosed\n"); #endif } @@ -468,7 +468,7 @@ H5Pset_fapl_subfiling(hid_t fapl_id, const H5FD_subfiling_config_t *vfd_config) H5_SUBFILING_GOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list"); if (vfd_config == NULL) { - if (NULL == (subfiling_conf = HDcalloc(1, sizeof(*subfiling_conf)))) + if (NULL == (subfiling_conf = calloc(1, sizeof(*subfiling_conf)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfiling VFD configuration"); subfiling_conf->ioc_fapl_id = H5I_INVALID_HID; @@ -516,7 +516,7 @@ done: if (subfiling_conf) { if (subfiling_conf->ioc_fapl_id >= 0 && H5I_dec_ref(subfiling_conf->ioc_fapl_id) < 0) H5_SUBFILING_DONE_ERROR(H5E_PLIST, H5E_CANTDEC, FAIL, "can't close IOC FAPL"); - HDfree(subfiling_conf); + free(subfiling_conf); } H5_SUBFILING_FUNC_LEAVE_API; @@ -566,7 +566,7 @@ H5Pget_fapl_subfiling(hid_t fapl_id, H5FD_subfiling_config_t *config_out) } else { /* Copy the subfiling fapl data out */ - HDmemcpy(config_out, config_ptr, sizeof(H5FD_subfiling_config_t)); + memcpy(config_out, config_ptr, sizeof(H5FD_subfiling_config_t)); /* Copy the driver info value */ if (H5FD__copy_plist(config_ptr->ioc_fapl_id, &(config_out->ioc_fapl_id)) < 0) @@ -585,9 +585,9 @@ H5FD__subfiling_get_default_config(hid_t fapl_id, H5FD_subfiling_config_t *confi char *h5_require_ioc; herr_t ret_value = SUCCEED; - HDassert(config_out); + assert(config_out); - HDmemset(config_out, 0, sizeof(*config_out)); + memset(config_out, 0, sizeof(*config_out)); config_out->magic = H5FD_SUBFILING_FAPL_MAGIC; config_out->version = H5FD_SUBFILING_CURR_FAPL_VERSION; @@ -599,7 +599,7 @@ H5FD__subfiling_get_default_config(hid_t fapl_id, H5FD_subfiling_config_t *confi config_out->shared_cfg.stripe_count = H5FD_SUBFILING_DEFAULT_STRIPE_COUNT; if ((h5_require_ioc = HDgetenv("H5_REQUIRE_IOC")) != NULL) { - int value_check = HDatoi(h5_require_ioc); + int value_check = atoi(h5_require_ioc); if (value_check == 0) config_out->require_ioc = FALSE; } @@ -668,7 +668,7 @@ H5FD__subfiling_validate_config(const H5FD_subfiling_config_t *fa) { herr_t ret_value = SUCCEED; - HDassert(fa != NULL); + assert(fa != NULL); if (fa->version != H5FD_SUBFILING_CURR_FAPL_VERSION) H5_SUBFILING_GOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unknown H5FD_subfiling_config_t version"); @@ -706,7 +706,7 @@ H5FD__subfiling_sb_size(H5FD_t *_file) H5FD_subfiling_t *file = (H5FD_subfiling_t *)_file; hsize_t ret_value = 0; - HDassert(file); + assert(file); /* Configuration structure magic number */ ret_value += sizeof(uint32_t); @@ -824,7 +824,7 @@ H5FD__subfiling_sb_encode(H5FD_t *_file, char *name, unsigned char *buf) /* Encode config file prefix string */ if (sf_context->config_file_prefix) { - HDmemcpy(p, sf_context->config_file_prefix, prefix_len); + memcpy(p, sf_context->config_file_prefix, prefix_len); p += prefix_len; } @@ -832,14 +832,14 @@ H5FD__subfiling_sb_encode(H5FD_t *_file, char *name, unsigned char *buf) if (file->sf_file) { char ioc_name[9]; - HDmemset(ioc_name, 0, sizeof(ioc_name)); + memset(ioc_name, 0, sizeof(ioc_name)); if (H5FD_sb_encode(file->sf_file, ioc_name, p + 9) < 0) H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTENCODE, FAIL, "unable to encode IOC VFD's superblock information"); /* Copy the IOC VFD's name into our buffer */ - HDmemcpy(p, ioc_name, 9); + memcpy(p, ioc_name, 9); } done: @@ -902,11 +902,11 @@ H5FD__subfiling_sb_decode(H5FD_t *_file, const char *name, const unsigned char * /* Decode config file prefix string */ if (tmpu64 > 0) { if (!sf_context->config_file_prefix) { - if (NULL == (sf_context->config_file_prefix = HDmalloc(tmpu64))) + if (NULL == (sf_context->config_file_prefix = malloc(tmpu64))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate space for config file prefix string"); - HDmemcpy(sf_context->config_file_prefix, p, tmpu64); + memcpy(sf_context->config_file_prefix, p, tmpu64); /* Just in case.. */ sf_context->config_file_prefix[tmpu64 - 1] = '\0'; @@ -918,7 +918,7 @@ H5FD__subfiling_sb_decode(H5FD_t *_file, const char *name, const unsigned char * if (file->sf_file) { char ioc_name[9]; - HDmemcpy(ioc_name, p, 9); + memcpy(ioc_name, p, 9); p += 9; if (H5FD_sb_load(file->sf_file, ioc_name, p) < 0) @@ -976,7 +976,7 @@ H5FD__subfiling_fapl_get(H5FD_t *_file) } /* Copy the fields of the structure */ - HDmemcpy(fa, &(file->fa), sizeof(H5FD_subfiling_config_t)); + memcpy(fa, &(file->fa), sizeof(H5FD_subfiling_config_t)); /* Copy the driver info value */ if (H5FD__copy_plist(file->fa.ioc_fapl_id, &(fa->ioc_fapl_id)) < 0) @@ -1012,7 +1012,7 @@ H5FD__copy_plist(hid_t fapl_id, hid_t *id_out_ptr) int ret_value = 0; H5P_genplist_t *plist_ptr = NULL; - HDassert(id_out_ptr != NULL); + assert(id_out_ptr != NULL); if (FALSE == H5P_isa_class(fapl_id, H5P_FILE_ACCESS)) H5_SUBFILING_GOTO_ERROR(H5E_ARGS, H5E_BADTYPE, -1, "not a file access property list"); @@ -1055,7 +1055,7 @@ H5FD__subfiling_fapl_copy(const void *_old_fa) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); } - HDmemcpy(new_fa, old_fa, sizeof(H5FD_subfiling_config_t)); + memcpy(new_fa, old_fa, sizeof(H5FD_subfiling_config_t)); if (H5FD__copy_plist(old_fa->ioc_fapl_id, &(new_fa->ioc_fapl_id)) < 0) H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_BADVALUE, NULL, "can't copy the IOC FAPL"); @@ -1091,7 +1091,7 @@ H5FD__subfiling_fapl_free(void *_fa) H5FD_subfiling_config_t *fa = (H5FD_subfiling_config_t *)_fa; herr_t ret_value = SUCCEED; - HDassert(fa != NULL); /* sanity check */ + assert(fa != NULL); /* sanity check */ if (fa->ioc_fapl_id >= 0 && H5I_dec_ref(fa->ioc_fapl_id) < 0) H5_SUBFILING_DONE_ERROR(H5E_PLIST, H5E_CANTDEC, FAIL, "can't close IOC FAPL"); @@ -1193,7 +1193,7 @@ H5FD__subfiling_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t ma config_ptr = &default_config; } - HDmemcpy(&file_ptr->fa, config_ptr, sizeof(H5FD_subfiling_config_t)); + memcpy(&file_ptr->fa, config_ptr, sizeof(H5FD_subfiling_config_t)); if (H5FD__copy_plist(config_ptr->ioc_fapl_id, &(file_ptr->fa.ioc_fapl_id)) < 0) { file_ptr->fa.ioc_fapl_id = H5I_INVALID_HID; H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_BADVALUE, NULL, "can't copy FAPL"); @@ -1318,7 +1318,7 @@ H5FD__subfiling_close_int(H5FD_subfiling_t *file_ptr) int mpi_code; herr_t ret_value = SUCCEED; - HDassert(file_ptr); + assert(file_ptr); if (MPI_SUCCESS != (mpi_code = MPI_Finalized(&mpi_finalized))) H5_SUBFILING_MPI_GOTO_ERROR(FAIL, "MPI_Finalized failed", mpi_code); @@ -1346,7 +1346,7 @@ H5FD__subfiling_close_int(H5FD_subfiling_t *file_ptr) file_ptr->fail_to_encode = FALSE; done: - HDfree(file_ptr->file_path); + free(file_ptr->file_path); file_ptr->file_path = NULL; H5MM_free(file_ptr->file_dir); @@ -1404,8 +1404,8 @@ H5FD__subfiling_cmp(const H5FD_t *_f1, const H5FD_t *_f2) const H5FD_subfiling_t *f2 = (const H5FD_subfiling_t *)_f2; int ret_value = 0; - HDassert(f1); - HDassert(f2); + assert(f1); + assert(f2); ret_value = H5FD_cmp(f1->sf_file, f2->sf_file); @@ -1585,8 +1585,8 @@ H5FD__subfiling_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_i int num_subfiles; herr_t ret_value = SUCCEED; - HDassert(file_ptr && file_ptr->pub.cls); - HDassert(buf); + assert(file_ptr && file_ptr->pub.cls); + assert(buf); /* Check for overflow conditions */ if (!H5F_addr_defined(addr)) @@ -1636,8 +1636,8 @@ H5FD__subfiling_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_i * underlying I/O operations. */ sf_context = (subfiling_context_t *)H5_get_subfiling_object(file_ptr->context_id); - HDassert(sf_context); - HDassert(sf_context->topology); + assert(sf_context); + assert(sf_context->topology); num_subfiles = sf_context->sf_num_subfiles; @@ -1675,14 +1675,14 @@ H5FD__subfiling_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_i * to contain the translation of the I/O request into a collection of * I/O requests. */ - if (NULL == (source_data_offset = - HDcalloc(1, (size_t)num_subfiles * max_depth * sizeof(*source_data_offset)))) + if (NULL == + (source_data_offset = calloc(1, (size_t)num_subfiles * max_depth * sizeof(*source_data_offset)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate source data offset I/O vector"); - if (NULL == (sf_data_size = HDcalloc(1, (size_t)num_subfiles * max_depth * sizeof(*sf_data_size)))) + if (NULL == (sf_data_size = calloc(1, (size_t)num_subfiles * max_depth * sizeof(*sf_data_size)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile data size I/O vector"); - if (NULL == (sf_offset = HDcalloc(1, (size_t)num_subfiles * max_depth * sizeof(*sf_offset)))) + if (NULL == (sf_offset = calloc(1, (size_t)num_subfiles * max_depth * sizeof(*sf_offset)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile offset I/O vector"); @@ -1713,16 +1713,16 @@ H5FD__subfiling_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_i H5_CHECKED_ASSIGN(vector_len, uint32_t, num_subfiles_used, int); /* Allocate I/O vectors */ - if (NULL == (io_types = HDmalloc(vector_len * sizeof(*io_types)))) + if (NULL == (io_types = malloc(vector_len * sizeof(*io_types)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile I/O types vector"); - if (NULL == (io_addrs = HDmalloc(vector_len * sizeof(*io_addrs)))) + if (NULL == (io_addrs = malloc(vector_len * sizeof(*io_addrs)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile I/O addresses vector"); - if (NULL == (io_sizes = HDmalloc(vector_len * sizeof(*io_sizes)))) + if (NULL == (io_sizes = malloc(vector_len * sizeof(*io_sizes)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile I/O sizes vector"); - if (NULL == (io_bufs = HDmalloc(vector_len * sizeof(*io_bufs)))) + if (NULL == (io_bufs = malloc(vector_len * sizeof(*io_bufs)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile I/O buffers vector"); @@ -1774,13 +1774,13 @@ H5FD__subfiling_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_i file_ptr->op = OP_READ; done: - HDfree(io_bufs); - HDfree(io_sizes); - HDfree(io_addrs); - HDfree(io_types); - HDfree(sf_offset); - HDfree(sf_data_size); - HDfree(source_data_offset); + free(io_bufs); + free(io_sizes); + free(io_addrs); + free(io_types); + free(sf_offset); + free(sf_data_size); + free(source_data_offset); if (ret_value < 0) { /* Reset last file I/O information */ @@ -1820,8 +1820,8 @@ H5FD__subfiling_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_ int num_subfiles; herr_t ret_value = SUCCEED; - HDassert(file_ptr && file_ptr->pub.cls); - HDassert(buf); + assert(file_ptr && file_ptr->pub.cls); + assert(buf); /* Check for overflow conditions */ if (!H5F_addr_defined(addr)) @@ -1868,8 +1868,8 @@ H5FD__subfiling_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_ * underlying I/O operations. */ sf_context = (subfiling_context_t *)H5_get_subfiling_object(file_ptr->context_id); - HDassert(sf_context); - HDassert(sf_context->topology); + assert(sf_context); + assert(sf_context->topology); num_subfiles = sf_context->sf_num_subfiles; @@ -1918,14 +1918,14 @@ H5FD__subfiling_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_ * to contain the translation of the I/O request into a collection of * I/O requests. */ - if (NULL == (source_data_offset = - HDcalloc(1, (size_t)num_subfiles * max_depth * sizeof(*source_data_offset)))) + if (NULL == + (source_data_offset = calloc(1, (size_t)num_subfiles * max_depth * sizeof(*source_data_offset)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate source data offset I/O vector"); - if (NULL == (sf_data_size = HDcalloc(1, (size_t)num_subfiles * max_depth * sizeof(*sf_data_size)))) + if (NULL == (sf_data_size = calloc(1, (size_t)num_subfiles * max_depth * sizeof(*sf_data_size)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile data size I/O vector"); - if (NULL == (sf_offset = HDcalloc(1, (size_t)num_subfiles * max_depth * sizeof(*sf_offset)))) + if (NULL == (sf_offset = calloc(1, (size_t)num_subfiles * max_depth * sizeof(*sf_offset)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile offset I/O vector"); @@ -1956,16 +1956,16 @@ H5FD__subfiling_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_ H5_CHECKED_ASSIGN(vector_len, uint32_t, num_subfiles_used, int); /* Allocate I/O vectors */ - if (NULL == (io_types = HDmalloc(vector_len * sizeof(*io_types)))) + if (NULL == (io_types = malloc(vector_len * sizeof(*io_types)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile I/O types vector"); - if (NULL == (io_addrs = HDmalloc(vector_len * sizeof(*io_addrs)))) + if (NULL == (io_addrs = malloc(vector_len * sizeof(*io_addrs)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile I/O addresses vector"); - if (NULL == (io_sizes = HDmalloc(vector_len * sizeof(*io_sizes)))) + if (NULL == (io_sizes = malloc(vector_len * sizeof(*io_sizes)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile I/O sizes vector"); - if (NULL == (io_bufs = HDmalloc(vector_len * sizeof(*io_bufs)))) + if (NULL == (io_bufs = malloc(vector_len * sizeof(*io_bufs)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate subfile I/O buffers vector"); @@ -2031,13 +2031,13 @@ H5FD__subfiling_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_ file_ptr->local_eof = file_ptr->pos; done: - HDfree(io_bufs); - HDfree(io_sizes); - HDfree(io_addrs); - HDfree(io_types); - HDfree(sf_offset); - HDfree(sf_data_size); - HDfree(source_data_offset); + free(io_bufs); + free(io_sizes); + free(io_addrs); + free(io_types); + free(sf_offset); + free(sf_data_size); + free(source_data_offset); if (ret_value < 0) { /* Reset last file I/O information */ @@ -2137,8 +2137,8 @@ H5FD__subfiling_read_vector(H5FD_t *_file, hid_t dxpl_id, uint32_t count, H5FD_m H5FD_mem_t type; haddr_t eoa; - HDassert((count == 0) || (sizes[0] != 0)); - HDassert((count == 0) || (types[0] != H5FD_MEM_NOLIST)); + assert((count == 0) || (sizes[0] != 0)); + assert((count == 0) || (types[0] != H5FD_MEM_NOLIST)); if (H5CX_get_io_xfer_mode(&xfer_mode) < 0) H5_SUBFILING_GOTO_ERROR(H5E_CONTEXT, H5E_CANTGET, FAIL, @@ -2254,7 +2254,7 @@ H5FD__subfiling_write_vector(H5FD_t *_file, hid_t dxpl_id, uint32_t count, H5FD_ H5FD_mpio_xfer_t xfer_mode = H5FD_MPIO_INDEPENDENT; herr_t ret_value = SUCCEED; /* Return value */ - HDassert(file_ptr != NULL); /* sanity check */ + assert(file_ptr != NULL); /* sanity check */ /* Check arguments * RAW - Do we really need to check arguments once again? @@ -2297,8 +2297,8 @@ H5FD__subfiling_write_vector(H5FD_t *_file, hid_t dxpl_id, uint32_t count, H5FD_ H5FD_mem_t type; haddr_t eoa; - HDassert((count == 0) || (sizes[0] != 0)); - HDassert((count == 0) || (types[0] != H5FD_MEM_NOLIST)); + assert((count == 0) || (sizes[0] != 0)); + assert((count == 0) || (types[0] != H5FD_MEM_NOLIST)); if (H5CX_get_io_xfer_mode(&xfer_mode) < 0) H5_SUBFILING_GOTO_ERROR(H5E_CONTEXT, H5E_CANTGET, FAIL, @@ -2390,7 +2390,7 @@ H5FD__subfiling_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5 H5FD_subfiling_t *file = (H5FD_subfiling_t *)_file; herr_t ret_value = SUCCEED; /* Return value */ - HDassert(file); + assert(file); /* Extend the file to make sure it's large enough */ if (!H5F_addr_eq(file->eoa, file->last_eoa)) { @@ -2469,7 +2469,7 @@ H5FD__subfiling_lock(H5FD_t *_file, hbool_t rw) H5FD_subfiling_t *file = (H5FD_subfiling_t *)_file; /* VFD file struct */ herr_t ret_value = SUCCEED; /* Return value */ - HDassert(file); + assert(file); if (file->fa.require_ioc) { #ifdef VERBOSE @@ -2502,7 +2502,7 @@ H5FD__subfiling_unlock(H5FD_t *_file) H5FD_subfiling_t *file = (H5FD_subfiling_t *)_file; /* VFD file struct */ herr_t ret_value = SUCCEED; /* Return value */ - HDassert(file); + assert(file); if (H5FD_unlock(file->sf_file) < 0) H5_SUBFILING_SYS_GOTO_ERROR(H5E_FILE, H5E_BADFILE, FAIL, "unable to lock file"); @@ -2581,14 +2581,14 @@ H5FD__subfiling_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, const void herr_t ret_value = SUCCEED; /* Return value */ /* Sanity checks */ - HDassert(file); - HDassert(H5FD_SUBFILING == file->pub.driver_id); + assert(file); + assert(H5FD_SUBFILING == file->pub.driver_id); switch (op_code) { case H5FD_CTL_GET_MPI_COMMUNICATOR_OPCODE: - HDassert(output); - HDassert(*output); + assert(output); + assert(*output); /* * Return a separate MPI communicator to the caller so @@ -2603,14 +2603,14 @@ H5FD__subfiling_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, const void break; case H5FD_CTL_GET_MPI_RANK_OPCODE: - HDassert(output); - HDassert(*output); + assert(output); + assert(*output); **((int **)output) = file->mpi_rank; break; case H5FD_CTL_GET_MPI_SIZE_OPCODE: - HDassert(output); - HDassert(*output); + assert(output); + assert(*output); **((int **)output) = file->mpi_size; break; @@ -2740,17 +2740,17 @@ init_indep_io(subfiling_context_t *sf_context, int64_t file_offset, size_t io_ne int num_subfiles = 0; herr_t ret_value = SUCCEED; - HDassert(sf_context); - HDassert(sf_context->sf_stripe_size > 0); - HDassert(sf_context->sf_blocksize_per_stripe > 0); - HDassert(sf_context->sf_num_subfiles > 0); - HDassert(sf_context->topology); - HDassert(mem_buf_offset); - HDassert(target_file_offset); - HDassert(io_block_len); - HDassert(first_subfile_index); - HDassert(n_subfiles_used); - HDassert(max_io_req_per_subfile); + assert(sf_context); + assert(sf_context->sf_stripe_size > 0); + assert(sf_context->sf_blocksize_per_stripe > 0); + assert(sf_context->sf_num_subfiles > 0); + assert(sf_context->topology); + assert(mem_buf_offset); + assert(target_file_offset); + assert(io_block_len); + assert(first_subfile_index); + assert(n_subfiles_used); + assert(max_io_req_per_subfile); *first_subfile_index = 0; *n_subfiles_used = 0; @@ -2808,8 +2808,8 @@ init_indep_io(subfiling_context_t *sf_context, int64_t file_offset, size_t io_ne /* Determine the size of data written to the first and last stripes */ start_length = MIN(data_size, (stripe_size - offset_in_stripe)); final_length = (start_length == data_size ? 0 : final_offset % stripe_size); - HDassert(start_length <= stripe_size); - HDassert(final_length <= stripe_size); + assert(start_length <= stripe_size); + assert(final_length <= stripe_size); /* * Determine which subfile the I/O request begins in and which @@ -2895,9 +2895,9 @@ init_indep_io(subfiling_context_t *sf_context, int64_t file_offset, size_t io_ne _target_file_offset = target_file_offset + output_offset; _io_block_len = io_block_len + output_offset; - HDmemset(_mem_buf_offset, 0, (max_iovec_len * sizeof(*_mem_buf_offset))); - HDmemset(_target_file_offset, 0, (max_iovec_len * sizeof(*_target_file_offset))); - HDmemset(_io_block_len, 0, (max_iovec_len * sizeof(*_io_block_len))); + memset(_mem_buf_offset, 0, (max_iovec_len * sizeof(*_mem_buf_offset))); + memset(_target_file_offset, 0, (max_iovec_len * sizeof(*_target_file_offset))); + memset(_io_block_len, 0, (max_iovec_len * sizeof(*_io_block_len))); if (total_bytes == data_size) { *n_subfiles_used = i; @@ -2960,8 +2960,8 @@ init_indep_io(subfiling_context_t *sf_context, int64_t file_offset, size_t io_ne } if (thin_uniform_section) { - HDassert(iovec_depth > 1); - HDassert(num_full_stripes > 1); + assert(iovec_depth > 1); + assert(num_full_stripes > 1); iovec_depth--; num_full_stripes--; @@ -3033,7 +3033,7 @@ init_indep_io(subfiling_context_t *sf_context, int64_t file_offset, size_t io_ne row_offset += block_size; } - HDassert(offset_in_block <= block_size); + assert(offset_in_block <= block_size); } if (total_bytes != data_size) @@ -3077,11 +3077,11 @@ iovec_fill_first(subfiling_context_t *sf_context, int64_t iovec_depth, int64_t t int64_t total_bytes = 0; herr_t ret_value = SUCCEED; - HDassert(sf_context); - HDassert(mem_offset_out); - HDassert(target_file_offset_out); - HDassert(io_block_len_out); - HDassert(iovec_depth > 0); + assert(sf_context); + assert(mem_offset_out); + assert(target_file_offset_out); + assert(io_block_len_out); + assert(iovec_depth > 0); stripe_size = sf_context->sf_stripe_size; block_size = sf_context->sf_blocksize_per_stripe; @@ -3176,11 +3176,11 @@ iovec_fill_last(subfiling_context_t *sf_context, int64_t iovec_depth, int64_t ta int64_t total_bytes = 0; herr_t ret_value = SUCCEED; - HDassert(sf_context); - HDassert(mem_offset_out); - HDassert(target_file_offset_out); - HDassert(io_block_len_out); - HDassert(iovec_depth > 0); + assert(sf_context); + assert(mem_offset_out); + assert(target_file_offset_out); + assert(io_block_len_out); + assert(iovec_depth > 0); stripe_size = sf_context->sf_stripe_size; block_size = sf_context->sf_blocksize_per_stripe; @@ -3308,11 +3308,11 @@ iovec_fill_first_last(subfiling_context_t *sf_context, int64_t iovec_depth, int6 int64_t total_bytes = 0; herr_t ret_value = SUCCEED; - HDassert(sf_context); - HDassert(mem_offset_out); - HDassert(target_file_offset_out); - HDassert(io_block_len_out); - HDassert(iovec_depth > 0); + assert(sf_context); + assert(mem_offset_out); + assert(target_file_offset_out); + assert(io_block_len_out); + assert(iovec_depth > 0); stripe_size = sf_context->sf_stripe_size; block_size = sf_context->sf_blocksize_per_stripe; @@ -3418,11 +3418,11 @@ iovec_fill_uniform(subfiling_context_t *sf_context, int64_t iovec_depth, int64_t int64_t total_bytes = 0; herr_t ret_value = SUCCEED; - HDassert(sf_context); - HDassert(mem_offset_out); - HDassert(target_file_offset_out); - HDassert(io_block_len_out); - HDassert((iovec_depth > 0) || (target_datasize == 0)); + assert(sf_context); + assert(mem_offset_out); + assert(target_file_offset_out); + assert(io_block_len_out); + assert((iovec_depth > 0) || (target_datasize == 0)); stripe_size = sf_context->sf_stripe_size; block_size = sf_context->sf_blocksize_per_stripe; |