diff options
Diffstat (limited to 'src/H5FDsubfiling/H5FDioc_int.c')
-rw-r--r-- | src/H5FDsubfiling/H5FDioc_int.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/H5FDsubfiling/H5FDioc_int.c b/src/H5FDsubfiling/H5FDioc_int.c index ce5a000..fdde752 100644 --- a/src/H5FDsubfiling/H5FDioc_int.c +++ b/src/H5FDsubfiling/H5FDioc_int.c @@ -32,12 +32,12 @@ calculate_target_ioc(int64_t file_offset, int64_t stripe_size, int num_io_concen int64_t subfile_row; int64_t subfile_idx; - HDassert(stripe_size > 0); - HDassert(num_io_concentrators > 0); - HDassert(num_subfiles > 0); - HDassert(target_ioc); - HDassert(ioc_file_offset); - HDassert(ioc_subfile_idx); + assert(stripe_size > 0); + assert(num_io_concentrators > 0); + assert(num_subfiles > 0); + assert(target_ioc); + assert(ioc_file_offset); + assert(ioc_subfile_idx); stripe_idx = file_offset / stripe_size; subfile_row = stripe_idx / num_subfiles; @@ -111,12 +111,12 @@ ioc__write_independent_async(int64_t context_id, int64_t offset, int64_t element int mpi_code; herr_t ret_value = SUCCEED; - HDassert(io_req); + assert(io_req); if (NULL == (sf_context = H5_get_subfiling_object(context_id))) H5_SUBFILING_GOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "can't get subfiling context from ID"); - HDassert(sf_context->topology); - HDassert(sf_context->topology->io_concentrators); + assert(sf_context->topology); + assert(sf_context->topology->io_concentrators); io_concentrators = sf_context->topology->io_concentrators; num_io_concentrators = sf_context->topology->n_io_concentrators; @@ -167,7 +167,7 @@ ioc__write_independent_async(int64_t context_id, int64_t offset, int64_t element * Allocate the I/O request object that will * be returned to the caller */ - if (NULL == (sf_io_request = HDmalloc(sizeof(io_req_t)))) + if (NULL == (sf_io_request = malloc(sizeof(io_req_t)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_WRITEERROR, FAIL, "couldn't allocate I/O request"); H5_CHECK_OVERFLOW(ioc_start, int64_t, int); @@ -228,7 +228,7 @@ done: } } - HDfree(sf_io_request); + free(sf_io_request); *io_req = NULL; } @@ -283,14 +283,14 @@ ioc__read_independent_async(int64_t context_id, int64_t offset, int64_t elements int mpi_code; herr_t ret_value = SUCCEED; - HDassert(io_req); + assert(io_req); H5_CHECK_OVERFLOW(elements, int64_t, int); if (NULL == (sf_context = H5_get_subfiling_object(context_id))) H5_SUBFILING_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "can't get subfiling context from ID"); - HDassert(sf_context->topology); - HDassert(sf_context->topology->io_concentrators); + assert(sf_context->topology); + assert(sf_context->topology->io_concentrators); io_concentrators = sf_context->topology->io_concentrators; num_io_concentrators = sf_context->topology->n_io_concentrators; @@ -320,7 +320,7 @@ ioc__read_independent_async(int64_t context_id, int64_t offset, int64_t elements * Allocate the I/O request object that will * be returned to the caller */ - if (NULL == (sf_io_request = HDmalloc(sizeof(io_req_t)))) + if (NULL == (sf_io_request = malloc(sizeof(io_req_t)))) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_READERROR, FAIL, "couldn't allocate I/O request"); H5_CHECK_OVERFLOW(ioc_start, int64_t, int); @@ -402,7 +402,7 @@ done: } } - HDfree(sf_io_request); + free(sf_io_request); *io_req = NULL; } @@ -426,7 +426,7 @@ ioc__async_completion(MPI_Request *mpi_reqs, size_t num_reqs) herr_t ret_value = SUCCEED; int mpi_code; - HDassert(mpi_reqs); + assert(mpi_reqs); H5_CHECK_OVERFLOW(num_reqs, size_t, int); if (MPI_SUCCESS != (mpi_code = MPI_Waitall((int)num_reqs, mpi_reqs, MPI_STATUSES_IGNORE))) |