mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

HDFFV-10328 merge allocation changes from 1.8

Browse Source
This commit is contained in:
Allen Byrne 2017-11-16 11:45:36 -06:00
parent 8e193705c5
commit 9f1cd84c15
3 changed files with 419 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/H5PLint.c
View File

@ -342,19 +342,38 @@ H5PL__open(const char *path, H5PL_type_t type, int id, hbool_t *success, const v
/* Check if the filter IDs match */
if (info->id == id) {
H5Z_class2_t *plugin_copy = NULL;
/* Store the plugin in the cache */
if (H5PL__add_plugin(type, id, handle))
HGOTO_ERROR(H5E_PLUGIN, H5E_CANTINSERT, FAIL, "unable to add new plugin to plugin cache")
/* allocate local copy of plugin info */
if (NULL == (plugin_copy = (H5Z_class2_t *)H5MM_calloc(sizeof(H5Z_class2_t))))
HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for plugin info")
/* Set the plugin info to return */
*plugin_info = (const void *)info;
plugin_copy->version = info->version;
plugin_copy->id = info->id;
plugin_copy->encoder_present = info->encoder_present;
plugin_copy->decoder_present = info->decoder_present;
plugin_copy->can_apply = info->can_apply;
plugin_copy->set_local = info->set_local;
plugin_copy->filter = info->filter;
/* copy the user's string into the property */
if(NULL == (plugin_copy->name = (char *)H5MM_xstrdup(info->name)))
HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "can't allocate memory for plugin info name")
/* Set output parameters */
*success = TRUE;
*plugin_info = (const void *)info;
}
}
done:
if (!success && handle)
if (*plugin_info) {
*plugin_info = (H5Z_class2_t *)H5MM_xfree(*plugin_info);
if (H5PL__close(handle) < 0)
HDONE_ERROR(H5E_PLUGIN, H5E_CLOSEERROR, FAIL, "can't close dynamic library")

26
src/H5PLplugin_cache.c
View File

@ -280,18 +280,34 @@ H5PL__find_plugin_in_cache(const H5PL_search_params_t *search_params, hbool_t *f
H5PL_get_plugin_info_t get_plugin_info_function;
const H5Z_class2_t *filter_info;
H5Z_class2_t *plugin_copy = NULL;
/* Get the "get plugin info" function from the plugin. */
if (NULL == (get_plugin_info_function = (H5PL_get_plugin_info_t)H5PL_GET_LIB_FUNC((H5PL_cache_g[u]).handle, "H5PLget_plugin_info")))
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get function for H5PLget_plugin_info")
HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "can't get function for H5PLget_plugin_info")
/* Call the "get plugin info" function */
if (NULL == (filter_info = (const H5Z_class2_t *)(*get_plugin_info_function)()))
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get plugin info")
HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "can't get plugin info")
if (NULL == (plugin_copy = (H5Z_class2_t *)H5MM_calloc(sizeof(H5Z_class2_t))))
HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for plugin info")
/* Set the plugin info to return */
*plugin_info = plugin_copy;
plugin_copy->version = filter_info->version;
plugin_copy->id = filter_info->id;
plugin_copy->encoder_present = filter_info->encoder_present;
plugin_copy->decoder_present = filter_info->decoder_present;
plugin_copy->can_apply = filter_info->can_apply;
plugin_copy->set_local = filter_info->set_local;
plugin_copy->filter = filter_info->filter;
/* copy the user's string into the property */
if(NULL == (plugin_copy->name = (char *)H5MM_xstrdup(filter_info->name)))
HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "can't allocate memory for plugin info name")
/* Set output parameters */
*found = TRUE;
*plugin_info = filter_info;
/* No need to continue processing */
break;
@ -301,6 +317,10 @@ H5PL__find_plugin_in_cache(const H5PL_search_params_t *search_params, hbool_t *f
} /* end for */
done:
/* unallocate local copy of plugin info on failure */
if (FAIL == ret_value && *plugin_info) {
*plugin_info = (H5Z_class2_t *)H5MM_xfree(*plugin_info);
}
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5PL__find_plugin_in_cache() */
#pragma GCC diagnostic pop

709
src/H5Z.c
View File

File diff suppressed because it is too large Load Diff