Skip to content

Commit

Permalink
Handle H5G_info_t properly
Browse files Browse the repository at this point in the history
  • Loading branch information
@derobins
derobins committed Mar 6, 2024
1 parent d57e314 commit 653706c
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 12 deletions.
1 change: 1 addition & 0 deletions bin/trace
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ $Source = "";
"H5F_file_space_type_t" => "Ft",
"H5F_libver_t" => "Fv",
"H5G_iterate_t" => "Gi",
"H5G_info_t" => "GI",
"H5G_obj_t" => "Go",
"H5G_stat_t" => "Gs",
"hsize_t" => "h",
Expand Down
20 changes: 10 additions & 10 deletions src/H5G.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ H5Gget_info(hid_t loc_id, H5G_info_t *group_info /*out*/)
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*!", loc_id, group_info);
H5TRACE2("e", "i*GI", loc_id, group_info);

/* Retrieve group information synchronously */
if (H5G__get_info_api_common(loc_id, group_info, NULL, NULL) < 0)
Expand Down Expand Up @@ -620,7 +620,7 @@ H5Gget_info_async(const char *app_file, const char *app_func, unsigned app_line,
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_API(FAIL)
H5TRACE6("e", "*s*sIui*!i", app_file, app_func, app_line, loc_id, group_info, es_id);
H5TRACE6("e", "*s*sIui*GIi", app_file, app_func, app_line, loc_id, group_info, es_id);

/* Set up request token pointer for asynchronous operation */
if (H5ES_NONE != es_id)
Expand All @@ -634,7 +634,7 @@ H5Gget_info_async(const char *app_file, const char *app_func, unsigned app_line,
if (NULL != token)
/* clang-format off */
if (H5ES_insert(es_id, vol_obj->connector, token,
H5ARG_TRACE6(__func__, "*s*sIui*!i", app_file, app_func, app_line, loc_id, group_info, es_id)) < 0)
H5ARG_TRACE6(__func__, "*s*sIui*GIi", app_file, app_func, app_line, loc_id, group_info, es_id)) < 0)
/* clang-format on */
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert token into event set");

Expand Down Expand Up @@ -699,7 +699,7 @@ H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *group_info /*out
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*s*!i", loc_id, name, group_info, lapl_id);
H5TRACE4("e", "i*s*GIi", loc_id, name, group_info, lapl_id);

/* Retrieve group information synchronously */
if (H5G__get_info_by_name_api_common(loc_id, name, group_info, lapl_id, NULL, NULL) < 0)
Expand Down Expand Up @@ -728,7 +728,7 @@ H5Gget_info_by_name_async(const char *app_file, const char *app_func, unsigned a
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_API(FAIL)
H5TRACE8("e", "*s*sIui*s*!ii", app_file, app_func, app_line, loc_id, name, group_info, lapl_id, es_id);
H5TRACE8("e", "*s*sIui*s*GIii", app_file, app_func, app_line, loc_id, name, group_info, lapl_id, es_id);

/* Set up request token pointer for asynchronous operation */
if (H5ES_NONE != es_id)
Expand All @@ -742,7 +742,7 @@ H5Gget_info_by_name_async(const char *app_file, const char *app_func, unsigned a
if (NULL != token)
/* clang-format off */
if (H5ES_insert(es_id, vol_obj->connector, token,
H5ARG_TRACE8(__func__, "*s*sIui*s*!ii", app_file, app_func, app_line, loc_id, name, group_info, lapl_id, es_id)) < 0)
H5ARG_TRACE8(__func__, "*s*sIui*s*GIii", app_file, app_func, app_line, loc_id, name, group_info, lapl_id, es_id)) < 0)
/* clang-format on */
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert token into event set");

Expand Down Expand Up @@ -809,7 +809,7 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_API(FAIL)
H5TRACE7("e", "i*sIiIoh*!i", loc_id, group_name, idx_type, order, n, group_info, lapl_id);
H5TRACE7("e", "i*sIiIoh*GIi", loc_id, group_name, idx_type, order, n, group_info, lapl_id);

/* Retrieve group information synchronously */
if (H5G__get_info_by_idx_api_common(loc_id, group_name, idx_type, order, n, group_info, lapl_id, NULL,
Expand Down Expand Up @@ -840,8 +840,8 @@ H5Gget_info_by_idx_async(const char *app_file, const char *app_func, unsigned ap
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_API(FAIL)
H5TRACE11("e", "*s*sIui*sIiIoh*!ii", app_file, app_func, app_line, loc_id, group_name, idx_type, order, n,
group_info, lapl_id, es_id);
H5TRACE11("e", "*s*sIui*sIiIoh*GIii", app_file, app_func, app_line, loc_id, group_name, idx_type, order,
n, group_info, lapl_id, es_id);

/* Set up request token pointer for asynchronous operation */
if (H5ES_NONE != es_id)
Expand All @@ -856,7 +856,7 @@ H5Gget_info_by_idx_async(const char *app_file, const char *app_func, unsigned ap
if (NULL != token)
/* clang-format off */
if (H5ES_insert(es_id, vol_obj->connector, token,
H5ARG_TRACE11(__func__, "*s*sIui*sIiIoh*!ii", app_file, app_func, app_line, loc_id, group_name, idx_type, order, n, group_info, lapl_id, es_id)) < 0)
H5ARG_TRACE11(__func__, "*s*sIui*sIiIoh*GIii", app_file, app_func, app_line, loc_id, group_name, idx_type, order, n, group_info, lapl_id, es_id)) < 0)
/* clang-format on */
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert token into event set");

Expand Down
36 changes: 34 additions & 2 deletions src/H5trace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1480,8 +1480,40 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap)
H5G_iterate_t git = (H5G_iterate_t)va_arg(ap, H5G_iterate_t);

H5RS_asprintf_cat(rs, "%p", (void *)(uintptr_t)git);
} /* end block */
break;
} break;

case 'I': /* H5G_info_t */
{
H5G_info_t ginfo = va_arg(ap, H5G_info_t);

H5RS_acat(rs, "{");
switch (ginfo.storage_type) {
case H5G_STORAGE_TYPE_UNKNOWN:
H5RS_asprintf_cat(rs, "H5G_STORAGE_TYPE_UNKNOWN");
break;

case H5G_STORAGE_TYPE_SYMBOL_TABLE:
H5RS_asprintf_cat(rs, "H5G_STORAGE_TYPE_SYMBOL_TABLE");
break;

case H5G_STORAGE_TYPE_COMPACT:
H5RS_asprintf_cat(rs, "H5G_STORAGE_TYPE_COMPACT");
break;

case H5G_STORAGE_TYPE_DENSE:
H5RS_asprintf_cat(rs, "H5G_STORAGE_TYPE_DENSE");
break;

default:
H5RS_asprintf_cat(rs, "%ld", (long)ginfo.storage_type);
break;
}
H5RS_asprintf_cat(rs, ", ");
H5RS_asprintf_cat(rs, "%" PRIuHSIZE ", ", ginfo.nlinks);
H5RS_asprintf_cat(rs, "%" PRId64 ", ", ginfo.max_corder);
H5_trace_args_bool(rs, ginfo.mounted);
H5RS_asprintf_cat(rs, "}");
} break;

case 'o': /* H5G_obj_t */
{
Expand Down

0 comments on commit 653706c

Please sign in to comment.