diff options
-rwxr-xr-x | src/H5SM.c | 62 |
1 files changed, 31 insertions, 31 deletions
@@ -1659,7 +1659,7 @@ H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr, HDassert(f); HDassert(table_addr != HADDR_UNDEF); HDassert(stream); - HDassert(indent >= 0);
+ HDassert(indent >= 0); HDassert(fwidth >= 0); /* If table_vers and num_indexes are UFAIL, replace them with values from @@ -1684,28 +1684,28 @@ H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr, if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, table_addr, NULL, NULL, H5AC_READ))) HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table") - HDfprintf(stream, "%*sShared Message Master Table...\n", indent, "");
+ HDfprintf(stream, "%*sShared Message Master Table...\n", indent, ""); for(x=0; x<num_indexes; ++x) { - HDfprintf(stream, "%*sIndex %d...\n", indent, "", x);
- HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth,
- "SOHM Index Type:",
- (table->indexes[x].index_type == H5SM_LIST ? "List" :
- (table->indexes[x].index_type == H5SM_BTREE ? "B-Tree" : "Unknown")));
-
- HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", fwidth,
- "Address of index:", table->indexes[x].index_addr);
- HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", fwidth,
- "Address of index's heap:", table->indexes[x].heap_addr);
- HDfprintf(stream, "%*s%-*s 0x%08x\n", indent + 3, "", fwidth,
- "Message type flags:", table->indexes[x].mesg_types);
- HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth,
- "Minimum size of messages:", table->indexes[x].min_mesg_size);
- HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth,
- "Number of messages:", table->indexes[x].num_messages);
- HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth,
- "Maximum list size:", table->indexes[x].list_max);
- HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth,
- "Minimum B-tree size:", table->indexes[x].btree_min);
+ HDfprintf(stream, "%*sIndex %d...\n", indent, "", x); + HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, + "SOHM Index Type:", + (table->indexes[x].index_type == H5SM_LIST ? "List" : + (table->indexes[x].index_type == H5SM_BTREE ? "B-Tree" : "Unknown"))); + + HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", fwidth, + "Address of index:", table->indexes[x].index_addr); + HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", fwidth, + "Address of index's heap:", table->indexes[x].heap_addr); + HDfprintf(stream, "%*s%-*s 0x%08x\n", indent + 3, "", fwidth, + "Message type flags:", table->indexes[x].mesg_types); + HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth, + "Minimum size of messages:", table->indexes[x].min_mesg_size); + HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth, + "Number of messages:", table->indexes[x].num_messages); + HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth, + "Maximum list size:", table->indexes[x].list_max); + HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth, + "Minimum B-tree size:", table->indexes[x].btree_min); } done: @@ -1745,7 +1745,7 @@ H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr, HDassert(f); HDassert(num_messages != HADDR_UNDEF); HDassert(stream); - HDassert(indent >= 0);
+ HDassert(indent >= 0); HDassert(fwidth >= 0); /* Check arguments. Version must be 0, the only version implemented so far */ @@ -1764,15 +1764,15 @@ H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr, if (NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, list_addr, NULL, &header, H5AC_READ))) HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM index") - HDfprintf(stream, "%*sShared Message List Index...\n", indent, "");
+ HDfprintf(stream, "%*sShared Message List Index...\n", indent, ""); for(x=0; x<num_messages; ++x) { - HDfprintf(stream, "%*sShared Object Header Message %d...\n", indent, "", x);
- HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth,
- "Heap ID:", list->messages[x].fheap_id);
- HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth, /* JAMES: better flag for this? */
- "Hash value:", list->messages[x].hash);
- HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", fwidth,
- "Reference count:", list->messages[x].ref_count);
+ HDfprintf(stream, "%*sShared Object Header Message %d...\n", indent, "", x); + HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth, + "Heap ID:", list->messages[x].fheap_id); + HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", fwidth, /* JAMES: better flag for this? */ + "Hash value:", list->messages[x].hash); + HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", fwidth, + "Reference count:", list->messages[x].ref_count); } done: |