mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r17646] 1. tools/h5repack/h5repack_main.c: accept string for strategy instead of a number

Browse Source 
2. tools/h5stat/h5stat.c: clean up and activate options as stated in usage
3. tools/h5stat/testfiles/*.ddl: modified according to the latest output

-This line, and those below, will be ignored--

M    tools/h5repack/h5repack_main.c
M    tools/h5stat/testfiles/h5stat_newgrat.ddl
M    tools/h5stat/testfiles/h5stat_filters.ddl
M    tools/h5stat/testfiles/h5stat_help1.ddl
M    tools/h5stat/testfiles/h5stat_help2.ddl
M    tools/h5stat/testfiles/h5stat_tsohm.ddl
M    tools/h5stat/testfiles/h5stat_filters-F.ddl
M    tools/h5stat/h5stat.c
This commit is contained in:
Vailin Choi 2009-10-15 12:43:24 -05:00
parent 7ed7937f96
commit d1bb0c7bb3
8 changed files with 378 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tools/h5repack/h5repack_main.c
View File

@ -182,8 +182,8 @@ static void usage(const char *prog)
printf(" -a A, --alignment=A Alignment value for H5Pset_alignment\n"); printf(" -a A, --alignment=A Alignment value for H5Pset_alignment\n");
printf(" -f FILT, --filter=FILT Filter type\n"); printf(" -f FILT, --filter=FILT Filter type\n");
printf(" -l LAYT, --layout=LAYT Layout type\n"); printf(" -l LAYT, --layout=LAYT Layout type\n");
printf(" -S STRGY, --fs_strategy=STRGY File-space-handling strategy\n"); printf(" -S FS_STRGY, --fs_strategy=FS_STRGY File space management strategy\n");
printf(" -T THRD, --fs_threshold=THRD Free-space section threshold\n"); printf(" -T FS_THRD, --fs_threshold=FS_THRD Free-space section threshold\n");
printf("\n"); printf("\n");
@ -198,17 +198,18 @@ static void usage(const char *prog)
printf(" F - is the shared object header message type, any of <dspace|dtype|fill|\n"); printf(" F - is the shared object header message type, any of <dspace|dtype|fill|\n");
printf(" pline|attr>. If F is not specified, S applies to all messages\n"); printf(" pline|attr>. If F is not specified, S applies to all messages\n");
printf("\n"); printf("\n");
printf(" STRGY is an integer value listed below:\n"); printf(" FS_STRGY is the file space management strategy to use for the output file.\n");
printf(" 1: Use persistent free-space managers, aggregators and virtual file driver for allocation\n"); printf(" It is a string as listed below:\n");
printf(" 2: Use non-persistent free-space managers, aggregators and virtual file driver for allocation\n"); printf(" ALL_PERSIST - Use persistent free-space managers, aggregators and virtual file driver\n");
printf(" 3: Use aggregators and virtual file driver for allocation\n"); printf(" for file space allocation\n");
printf(" 4: Use virtual file driver for allocation\n"); printf(" ALL - Use non-persistent free-space managers, aggregators and virtual file driver\n");
printf(" A value of 0 retains the existing file-space-handling strategy used in the library.\n"); printf(" for file space allocation\n");
printf(" The library default is 2.\n"); printf(" AGGR_VFD - Use aggregators and virtual file driver for file space allocation\n");
printf(" VFD - Use virtual file driver for file space allocation\n");
printf("\n"); printf("\n");
printf(" THRD is the minimum size of free-space sections to track by the free-space managers.\n"); printf(" FS_THRD is the free-space section threshold to use for the output file.\n");
printf(" A value of 0 retains the existing free-space section threshold used in the library.\n"); printf(" It is the minimum size (in bytes) of free-space sections to be tracked\n");
printf(" The library default is 1.\n"); printf(" by the the library's free-space managers.\n");
printf("\n"); printf("\n");
printf(" FILT - is a string with the format:\n"); printf(" FILT - is a string with the format:\n");
@ -445,9 +446,24 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
break; break;
case 'S': case 'S':
{
char strategy[MAX_NC_NAME];
options->fs_strategy = atol( opt_arg ); strcpy(strategy, opt_arg);
if(!strcmp(strategy, "ALL_PERSIST"))
options->fs_strategy = H5F_FILE_SPACE_ALL_PERSIST;
else if(!strcmp(strategy, "ALL"))
options->fs_strategy = H5F_FILE_SPACE_ALL;
else if(!strcmp(strategy, "AGGR_VFD"))
options->fs_strategy = H5F_FILE_SPACE_AGGR_VFD;
else if(!strcmp(strategy, "VFD"))
options->fs_strategy = H5F_FILE_SPACE_VFD;
else {
error_msg(progname, "invalid file space management strategy\n", opt_arg );
exit(EXIT_FAILURE);
}
break; break;
}
case 'T': case 'T':

472
tools/h5stat/h5stat.c
View File

@ -32,7 +32,15 @@
accommodate for user-define filters + one accommodate for user-define filters + one
to accomodate datasets whithout any filters */ to accomodate datasets whithout any filters */
/* File space management strategies: see H5Fpublic.h for declarations */
const char *FS_STRATEGY_NAME[] = {
"unknown",
"H5F_FILE_SPACE_ALL_PERSIST",
"H5F_FILE_SPACE_ALL",
"H5F_FILE_SPACE_AGGR_VFD",
"H5F_FILE_SPACE_VFD",
NULL
};
/* Datatype statistics for datasets */ /* Datatype statistics for datasets */
typedef struct dtype_info_t { typedef struct dtype_info_t {
@ -92,8 +100,10 @@ typedef struct iter_t {
hsize_t super_size; /* superblock size */ hsize_t super_size; /* superblock size */
hsize_t super_ext_size; /* superblock extension size */ hsize_t super_ext_size; /* superblock extension size */
hsize_t ublk_size; /* user block size (if exists) */ hsize_t ublk_size; /* user block size (if exists) */
H5F_file_space_type_t fs_strategy; /* File space management strategy */
hsize_t fs_threshold; /* Free-space section threshold */
hsize_t free_space; /* amount of freespace in the file */ hsize_t free_space; /* amount of freespace in the file */
hsize_t free_hdr; /* free space manager header in the file */ hsize_t free_hdr; /* size of free space manager metadata in the file */
unsigned long num_small_sects[SIZE_SMALL_SECTS]; /* Size of small free-space sections */ unsigned long num_small_sects[SIZE_SMALL_SECTS]; /* Size of small free-space sections */
unsigned sect_nbins; /* Number of bins for free-space section sizes */ unsigned sect_nbins; /* Number of bins for free-space section sizes */
unsigned long *sect_bins; /* Pointer to array of bins for free-space section sizes */ unsigned long *sect_bins; /* Pointer to array of bins for free-space section sizes */
@ -106,16 +116,24 @@ typedef struct iter_t {
const char *progname = "h5stat"; const char *progname = "h5stat";
int d_status = EXIT_SUCCESS; int d_status = EXIT_SUCCESS;
/* Enable the printing of everything */
static int display_all = TRUE; static int display_all = TRUE;
static int display_file_metadata = FALSE;
static int display_file = FALSE; /* Enable the printing of selected statistics */
static int display_group = FALSE; static int display_file = FALSE; /* display file information */
static int display_dset = FALSE; static int display_group = FALSE; /* display groups information */
static int display_dtype_metadata = FALSE; static int display_dset = FALSE; /* display datasets information */
static int display_object = FALSE; static int display_dset_dtype_info = FALSE; /* display datasets' datatype information */
static int display_attr = FALSE; static int display_attr = FALSE; /* display attributes information */
static int display_free_sections = FALSE; static int display_free_sections = FALSE; /* display free space information */
static int display_summary = FALSE; static int display_summary = FALSE; /* display summary of file space information */
static int display_file_metadata = FALSE; /* display file space info for file's metadata */
static int display_group_metadata = FALSE; /* display file space info for groups' metadata */
static int display_dset_metadata = FALSE; /* display file space info for datasets' metadata */
static int display_object = FALSE; /* not implemented yet */
/* a structure for handling the order command-line parameters come in */ /* a structure for handling the order command-line parameters come in */
struct handler_t { struct handler_t {
@ -123,10 +141,11 @@ struct handler_t {
}; };
static const char *s_opts ="ADdFfhGgsSTO:V"; static const char *s_opts ="aDdFfhGgsSTO:v";
static struct long_options l_opts[] = { static struct long_options l_opts[] = {
{"help", no_arg, 'h'}, {"help", no_arg, 'h'},
{"hel", no_arg, 'h'}, {"hel", no_arg, 'h'},
{"he", no_arg, 'h'},
{"file", no_arg, 'f'}, {"file", no_arg, 'f'},
{"fil", no_arg, 'f'}, {"fil", no_arg, 'f'},
{"fi", no_arg, 'f'}, {"fi", no_arg, 'f'},
@ -142,55 +161,52 @@ static struct long_options l_opts[] = {
{"grou", no_arg, 'g'}, {"grou", no_arg, 'g'},
{"gro", no_arg, 'g'}, {"gro", no_arg, 'g'},
{"gr", no_arg, 'g'}, {"gr", no_arg, 'g'},
{"groupmetadata", no_arg, 'G'}, {"GROUPmetadata", no_arg, 'G'},
{"groupmetadat", no_arg, 'G'}, {"GROUPmetadat", no_arg, 'G'},
{"groupmetada", no_arg, 'G'}, {"GROUPmetada", no_arg, 'G'},
{"groupmetad", no_arg, 'G'}, {"GROUPmetad", no_arg, 'G'},
{"groupmeta", no_arg, 'G'}, {"GROUPmeta", no_arg, 'G'},
{"groupmet", no_arg, 'G'}, {"GROUPmet", no_arg, 'G'},
{"groupme", no_arg, 'G'}, {"GROUPme", no_arg, 'G'},
{"groupm", no_arg, 'G'}, {"GROUPm", no_arg, 'G'},
{"dset", no_arg, 'd'}, {"dset", no_arg, 'd'},
{"dse", no_arg, 'd'}, {"dse", no_arg, 'd'},
{"ds", no_arg, 'd'}, {"ds", no_arg, 'd'},
{"d", no_arg, 'd'}, {"DSETmetadata", no_arg, 'D'},
{"dsetmetadata", no_arg, 'D'}, {"DSETmetadat", no_arg, 'D'},
{"dsetmetadat", no_arg, 'D'}, {"DSETmetada", no_arg, 'D'},
{"dsetmetada", no_arg, 'D'}, {"DSETmetad", no_arg, 'D'},
{"dsetmetad", no_arg, 'D'}, {"DSETmeta", no_arg, 'D'},
{"dsetmeta", no_arg, 'D'}, {"DSETmet", no_arg, 'D'},
{"dsetmet", no_arg, 'D'}, {"DSETme", no_arg, 'D'},
{"dsetme", no_arg, 'D'}, {"DSETm", no_arg, 'D'},
{"dsetm", no_arg, 'D'}, {"DSETtypeinfo", no_arg, 'T'},
{"dtypemetadata", no_arg, 'T'}, {"DSETtypeinf", no_arg, 'T'},
{"dtypemetadat", no_arg, 'T'}, {"DSETtypein", no_arg, 'T'},
{"dtypemetada", no_arg, 'T'}, {"DSETtypei", no_arg, 'T'},
{"dtypemetad", no_arg, 'T'}, {"DSETtype", no_arg, 'T'},
{"dtypemeta", no_arg, 'T'}, {"DSETtyp", no_arg, 'T'},
{"dtypemet", no_arg, 'T'}, {"DSETty", no_arg, 'T'},
{"dtypeme", no_arg, 'T'}, {"DSETt", no_arg, 'T'},
{"dtypem", no_arg, 'T'},
{"dtype", no_arg, 'T'},
{ "object", require_arg, 'O' }, { "object", require_arg, 'O' },
{ "objec", require_arg, 'O' }, { "objec", require_arg, 'O' },
{ "obje", require_arg, 'O' }, { "obje", require_arg, 'O' },
{ "obj", require_arg, 'O' }, { "obj", require_arg, 'O' },
{ "ob", require_arg, 'O' }, { "ob", require_arg, 'O' },
{ "version", no_arg, 'V' }, { "version", no_arg, 'v' },
{ "versio", no_arg, 'V' }, { "versio", no_arg, 'v' },
{ "versi", no_arg, 'V' }, { "versi", no_arg, 'v' },
{ "vers", no_arg, 'V' }, { "vers", no_arg, 'v' },
{ "ver", no_arg, 'V' }, { "ver", no_arg, 'v' },
{ "ve", no_arg, 'V' }, { "ve", no_arg, 'v' },
{ "attribute", no_arg, 'A' }, { "attribute", no_arg, 'a' },
{ "attribut", no_arg, 'A' }, { "attribut", no_arg, 'a' },
{ "attribu", no_arg, 'A' }, { "attribu", no_arg, 'a' },
{ "attrib", no_arg, 'A' }, { "attrib", no_arg, 'a' },
{ "attri", no_arg, 'A' }, { "attri", no_arg, 'a' },
{ "attr", no_arg, 'A' }, { "attr", no_arg, 'a' },
{ "att", no_arg, 'A' }, { "att", no_arg, 'a' },
{ "at", no_arg, 'A' }, { "at", no_arg, 'a' },
{ "a", no_arg, 'A' },
{ "freespace", no_arg, 's' }, { "freespace", no_arg, 's' },
{ "freespac", no_arg, 's' }, { "freespac", no_arg, 's' },
{ "freespa", no_arg, 's' }, { "freespa", no_arg, 's' },
@ -223,17 +239,17 @@ static void usage(const char *prog)
fprintf(stdout, "\n"); fprintf(stdout, "\n");
fprintf(stdout, " OPTIONS\n"); fprintf(stdout, " OPTIONS\n");
fprintf(stdout, " -h, --help Print a usage message and exit\n"); fprintf(stdout, " -h, --help Print a usage message and exit\n");
fprintf(stdout, " -V, --version Print version number and exit\n"); fprintf(stdout, " -v, --version Print version number and exit\n");
fprintf(stdout, " -f, --file Print file information\n"); fprintf(stdout, " -f, --file Print file information\n");
fprintf(stdout, " -F, --filemetadata Print file metadata\n"); fprintf(stdout, " -F, --FILEmetadata Print file space information for file's metadata\n");
fprintf(stdout, " -g, --group Print group information\n"); fprintf(stdout, " -g, --group Print group information\n");
fprintf(stdout, " -G, --groupmetadata Print group metadata\n"); fprintf(stdout, " -G, --GROUPmetadata Print file space information for groups' metadata\n");
fprintf(stdout, " -d, --dset Print dataset information\n"); fprintf(stdout, " -d, --dset Print dataset information\n");
fprintf(stdout, " -D, --dsetmetadata Print dataset metadata\n"); fprintf(stdout, " -D, --DSETmetadata Print file space information for datasets' metadata\n");
fprintf(stdout, " -T, --dtypemetadata Print datatype metadata\n"); fprintf(stdout, " -T, --DSETtypeinfo Print datasets' datatype information\n");
fprintf(stdout, " -A, --attribute Print attribute information\n"); fprintf(stdout, " -a, --attribute Print attribute information\n");
fprintf(stdout, " -s, --freespace Print free-space information\n"); fprintf(stdout, " -s, --freespace Print free space information\n");
fprintf(stdout, " -S, --Summary Print summary of storage information\n"); fprintf(stdout, " -S, --summary Print summary of file space information\n");
} }
@ -763,6 +779,11 @@ freespace_stats(hid_t fid, iter_t *iter)
* Programmer: Elena Pourmal * Programmer: Elena Pourmal
* Saturday, August 12, 2006 * Saturday, August 12, 2006
* *
* Modifications:
* Vailin Choi; October 2009
* Turn on display_group_metadata, display_dset_metadata
* Add 'S' & 's' for printing free space info (previous checkin)
*
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
static struct handler_t * static struct handler_t *
@ -777,11 +798,16 @@ parse_command_line(int argc, const char *argv[])
/* parse command line options */ /* parse command line options */
while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) { while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
switch ((char)opt) { switch ((char)opt) {
case 'A': case 'h':
display_all = FALSE; usage(progname);
display_attr = TRUE; leave(EXIT_SUCCESS);
case 'v':
print_version(progname);
leave(EXIT_SUCCESS);
break; break;
case 'F': case 'F':
display_all = FALSE; display_all = FALSE;
display_file_metadata = TRUE; display_file_metadata = TRUE;
@ -794,6 +820,7 @@ parse_command_line(int argc, const char *argv[])
case 'G': case 'G':
display_all = FALSE; display_all = FALSE;
display_group_metadata = TRUE;
break; break;
case 'g': case 'g':
@ -801,13 +828,9 @@ parse_command_line(int argc, const char *argv[])
display_group = TRUE; display_group = TRUE;
break; break;
case 'T':
display_all = FALSE;
display_dtype_metadata = TRUE;
break;
case 'D': case 'D':
display_all = FALSE; display_all = FALSE;
display_dset_metadata = TRUE;
break; break;
case 'd': case 'd':
@ -815,6 +838,16 @@ parse_command_line(int argc, const char *argv[])
display_dset = TRUE; display_dset = TRUE;
break; break;
case 'T':
display_all = FALSE;
display_dset_dtype_info = TRUE;
break;
case 'a':
display_all = FALSE;
display_attr = TRUE;
break;
case 's': case 's':
display_all = FALSE; display_all = FALSE;
display_free_sections = TRUE; display_free_sections = TRUE;
@ -825,16 +858,8 @@ parse_command_line(int argc, const char *argv[])
display_summary = TRUE; display_summary = TRUE;
break; break;
case 'h':
usage(progname);
leave(EXIT_SUCCESS);
case 'V':
print_version(progname);
leave(EXIT_SUCCESS);
break;
case 'O': case 'O':
display_all = FALSE;
display_object = TRUE; display_object = TRUE;
for(i = 0; i < argc; i++) for(i = 0; i < argc; i++)
if(!hand[i].obj) { if(!hand[i].obj) {
@ -916,65 +941,8 @@ print_file_info(const iter_t *iter)
HDfprintf(stdout, "\tMax. # of objects in group: %Hu\n", iter->max_fanout); HDfprintf(stdout, "\tMax. # of objects in group: %Hu\n", iter->max_fanout);
return 0; return 0;
} } /* print_file_info() */
/*-------------------------------------------------------------------------
* Function: print_file_metadata
*
* Purpose: Prints metadata information about file
*
* Return: Success: 0
*
* Failure: Never fails
*
* Programmer: Elena Pourmal
* Saturday, August 12, 2006
*
*-------------------------------------------------------------------------
*/
static herr_t
print_file_metadata(const iter_t *iter)
{
printf("Storage information (in bytes):\n");
HDfprintf(stdout, "\tSuperblock: %Hu\n", iter->super_size);
HDfprintf(stdout, "\tSuperblock extension: %Hu\n", iter->super_ext_size);
HDfprintf(stdout, "\tUser block: %Hu\n", iter->ublk_size);
HDfprintf(stdout, "\tObject headers: (total/unused)\n");
HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n", iter->group_ohdr_info.total_size,
iter->group_ohdr_info.free_size);
HDfprintf(stdout, "\t\tDatasets(exclude compact data): %Hu/%Hu\n",
iter->dset_ohdr_info.total_size,
iter->dset_ohdr_info.free_size);
HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n", iter->dtype_ohdr_info.total_size,
iter->dtype_ohdr_info.free_size);
HDfprintf(stdout, "\tGroups:\n");
HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->groups_heap_storage_size);
HDfprintf(stdout, "\tAttributes:\n");
HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->attrs_btree_storage_size);
HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->attrs_heap_storage_size);
HDfprintf(stdout, "\tChunked datasets:\n");
HDfprintf(stdout, "\t\tIndex: %Hu\n", iter->datasets_index_storage_size);
HDfprintf(stdout, "\tDatasets:\n");
HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->datasets_heap_storage_size);
HDfprintf(stdout, "\tShared Messages:\n");
HDfprintf(stdout, "\t\tHeader: %Hu\n", iter->SM_hdr_storage_size);
HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->SM_index_storage_size);
HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->SM_heap_storage_size);
HDfprintf(stdout, "\tFree-space managers:\n");
HDfprintf(stdout, "\t\tHeader: %Hu\n", iter->free_hdr);
HDfprintf(stdout, "\t\tAmount of free space: %Hu\n", iter->free_space);
return 0;
}
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
@ -1031,7 +999,7 @@ print_group_info(const iter_t *iter)
printf("\tTotal # of groups: %lu\n", total); printf("\tTotal # of groups: %lu\n", total);
return 0; return 0;
} } /* print_group_info() */
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
@ -1082,7 +1050,7 @@ print_attr_info(const iter_t *iter)
printf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs); printf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs);
return 0; return 0;
} } /* print_attr_info() */
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
@ -1170,26 +1138,56 @@ print_dataset_info(const iter_t *iter)
printf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]); printf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]);
printf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]); printf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]);
printf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL-1]); printf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL-1]);
if(display_dtype_metadata) {
printf("Dataset datatype information:\n");
printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
total = 0;
for(u = 0; u < iter->dset_ntypes; u++) {
H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
printf("\tDataset datatype #%u:\n", u);
printf("\t\tCount (total/named) = (%lu/%lu)\n", iter->dset_type_info[u].count, iter->dset_type_info[u].named);
printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
(unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
H5Tclose(iter->dset_type_info[u].tid);
total += iter->dset_type_info[u].count;
} /* end for */
printf("\tTotal dataset datatype count: %lu\n", total);
}
} /* end if */ } /* end if */
return 0; return 0;
} } /* print_dataset_info() */
/*-------------------------------------------------------------------------
* Function: print_dset_dtype_info
*
* Purpose: Prints datasets' datatype information
*
* Return: Success: 0
*
* Failure: Never fails
*
* Programmer:
*
* Modifications:
* Vailin Choi; October 2009
* Moved from print_dataset_info()
*
*-------------------------------------------------------------------------
*/
static herr_t
print_dset_dtype_info(const iter_t *iter)
{
unsigned long power; /* Temporary "power" for bins */
unsigned long total; /* Total count for various statistics */
size_t dtype_size; /* Size of encoded datatype */
unsigned u; /* Local index variable */
if(iter->dset_ntypes) {
printf("Dataset datatype information:\n");
printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
total = 0;
for(u = 0; u < iter->dset_ntypes; u++) {
H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
printf("\tDataset datatype #%u:\n", u);
printf("\t\tCount (total/named) = (%lu/%lu)\n",
iter->dset_type_info[u].count, iter->dset_type_info[u].named);
printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
(unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
H5Tclose(iter->dset_type_info[u].tid);
total += iter->dset_type_info[u].count;
} /* end for */
printf("\tTotal dataset datatype count: %lu\n", total);
}
return 0;
} /* print_dset_dtype_info() */
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
@ -1212,6 +1210,7 @@ print_freespace_info(const iter_t *iter)
unsigned long total; /* Total count for various statistics */ unsigned long total; /* Total count for various statistics */
unsigned u; /* Local index variable */ unsigned u; /* Local index variable */
HDfprintf(stdout, "Free-space section threshold: %Hu bytes\n", iter->fs_threshold);
printf("Small size free-space sections (< %u bytes):\n", (unsigned)SIZE_SMALL_SECTS); printf("Small size free-space sections (< %u bytes):\n", (unsigned)SIZE_SMALL_SECTS);
total = 0; total = 0;
for(u = 0; u < SIZE_SMALL_SECTS; u++) { for(u = 0; u < SIZE_SMALL_SECTS; u++) {
@ -1239,10 +1238,11 @@ print_freespace_info(const iter_t *iter)
return 0; return 0;
} /* print_freespace_info() */ } /* print_freespace_info() */
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function: print_storage_summary * Function: print_storage_summary
* *
* Purpose: Prints summary of the storage information in the file * Purpose: Prints file space information for the file
* *
* Return: Success: 0 * Return: Success: 0
* *
@ -1259,7 +1259,8 @@ print_storage_summary(const iter_t *iter)
hsize_t unaccount = 0; hsize_t unaccount = 0;
float percent = 0.0; float percent = 0.0;
printf("Summary of storage information:\n"); HDfprintf(stdout, "File space management strategy: %s\n", FS_STRATEGY_NAME[iter->fs_strategy]);
printf("Summary of file space information:\n");
total_meta = total_meta =
iter->super_size + iter->super_ext_size + iter->ublk_size + iter->super_size + iter->super_ext_size + iter->ublk_size +
iter->group_ohdr_info.total_size + iter->group_ohdr_info.total_size +
@ -1285,7 +1286,7 @@ print_storage_summary(const iter_t *iter)
if(iter->filesize < (total_meta+iter->dset_storage_size+iter->free_space)) { if(iter->filesize < (total_meta+iter->dset_storage_size+iter->free_space)) {
unaccount = (total_meta + iter->dset_storage_size + iter->free_space) - iter->filesize; unaccount = (total_meta + iter->dset_storage_size + iter->free_space) - iter->filesize;
HDfprintf(stdout, " ??? File has %Hu more bytes accounted for that its size! ???\n", unaccount); HDfprintf(stdout, " ??? File has %Hu more bytes accounted for than its size! ???\n", unaccount);
} }
else { else {
unaccount = iter->filesize - (total_meta + iter->dset_storage_size + iter->free_space); unaccount = iter->filesize - (total_meta + iter->dset_storage_size + iter->free_space);
@ -1298,9 +1299,125 @@ print_storage_summary(const iter_t *iter)
if(iter->nexternal) if(iter->nexternal)
HDfprintf(stdout, "External raw data: %Hu bytes\n", iter->dset_external_storage_size); HDfprintf(stdout, "External raw data: %Hu bytes\n", iter->dset_external_storage_size);
return 0; return 0;
} /* print_storage_summary() */ } /* print_storage_summary() */
/*-------------------------------------------------------------------------
* Function: print_file_metadata
*
* Purpose: Prints file space information for file's metadata
*
* Return: Success: 0
*
* Failure: Never fails
*
* Programmer: Elena Pourmal
* Saturday, August 12, 2006
*
*-------------------------------------------------------------------------
*/
static herr_t
print_file_metadata(const iter_t *iter)
{
printf("File space information for file metadata (in bytes):\n");
HDfprintf(stdout, "\tSuperblock: %Hu\n", iter->super_size);
HDfprintf(stdout, "\tSuperblock extension: %Hu\n", iter->super_ext_size);
HDfprintf(stdout, "\tUser block: %Hu\n", iter->ublk_size);
HDfprintf(stdout, "\tObject headers: (total/unused)\n");
HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n", iter->group_ohdr_info.total_size,
iter->group_ohdr_info.free_size);
HDfprintf(stdout, "\t\tDatasets(exclude compact data): %Hu/%Hu\n",
iter->dset_ohdr_info.total_size,
iter->dset_ohdr_info.free_size);
HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n", iter->dtype_ohdr_info.total_size,
iter->dtype_ohdr_info.free_size);
HDfprintf(stdout, "\tGroups:\n");
HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->groups_heap_storage_size);
HDfprintf(stdout, "\tAttributes:\n");
HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->attrs_btree_storage_size);
HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->attrs_heap_storage_size);
HDfprintf(stdout, "\tChunked datasets:\n");
HDfprintf(stdout, "\t\tIndex: %Hu\n", iter->datasets_index_storage_size);
HDfprintf(stdout, "\tDatasets:\n");
HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->datasets_heap_storage_size);
HDfprintf(stdout, "\tShared Messages:\n");
HDfprintf(stdout, "\t\tHeader: %Hu\n", iter->SM_hdr_storage_size);
HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->SM_index_storage_size);
HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->SM_heap_storage_size);
HDfprintf(stdout, "\tFree-space managers:\n");
HDfprintf(stdout, "\t\tHeader: %Hu\n", iter->free_hdr);
HDfprintf(stdout, "\t\tAmount of free space: %Hu\n", iter->free_space);
return 0;
} /* print_file_metadata() */
/*-------------------------------------------------------------------------
* Function: print_group_metadata
*
* Purpose: Prints file space information for groups' metadata
*
* Return: Success: 0
*
* Failure: Never fails
*
* Programmer: Vailin Choi; October 2009
*
*-------------------------------------------------------------------------
*/
static herr_t
print_group_metadata(const iter_t *iter)
{
printf("File space information for groups' metadata (in bytes):\n");
HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size);
HDfprintf(stdout, "\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
HDfprintf(stdout, "\tHeap: %Hu\n", iter->groups_heap_storage_size);
return 0;
} /* print_group_metadata() */
/*-------------------------------------------------------------------------
* Function: print_dataset_metadata
*
* Purpose: Prints file space information for datasets' metadata
*
* Return: Success: 0
*
* Failure: Never fails
*
* Programmer: Vailin Choi; October 2009
*
*-------------------------------------------------------------------------
*/
static herr_t
print_dset_metadata(const iter_t *iter)
{
printf("File space information for datasets' metadata (in bytes):\n");
HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
HDfprintf(stdout, "\tIndex for Chunked datasets: %Hu\n",
iter->datasets_index_storage_size);
HDfprintf(stdout, "\tHeap: %Hu\n", iter->datasets_heap_storage_size);
return 0;
} /* print_dset_metadata() */
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function: print_file_statistics * Function: print_file_statistics
@ -1314,6 +1431,11 @@ print_storage_summary(const iter_t *iter)
* Programmer: Elena Pourmal * Programmer: Elena Pourmal
* Saturday, August 12, 2006 * Saturday, August 12, 2006
* *
* Modifications:
* Vailin Choi; October 2009
* Activate "display_group_metadata", "dislay_dset_metadata" and
* "display_dset_dtype_info".
*
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
static void static void
@ -1321,21 +1443,31 @@ print_file_statistics(const iter_t *iter)
{ {
if(display_all) { if(display_all) {
display_file = TRUE; display_file = TRUE;
display_file_metadata = TRUE;
display_group = TRUE; display_group = TRUE;
display_dset = TRUE; display_dset = TRUE;
display_dtype_metadata = TRUE; display_dset_dtype_info = TRUE;
display_attr = TRUE; display_attr = TRUE;
display_free_sections = TRUE; display_free_sections = TRUE;
display_summary = TRUE;
display_file_metadata = TRUE;
display_group_metadata = TRUE;
display_dset_metadata = TRUE;
} }
if(display_file) print_file_info(iter); if(display_file) print_file_info(iter);
if(display_file_metadata) print_file_metadata(iter); if(display_file_metadata) print_file_metadata(iter);
if(display_group) print_group_info(iter);
if(display_dset) print_dataset_info(iter); if(display_group) print_group_info(iter);
if(display_attr) print_attr_info(iter); if(!display_all && display_group_metadata) print_group_metadata(iter);
if(display_free_sections) print_freespace_info(iter);
if(display_summary) print_storage_summary(iter); if(display_dset) print_dataset_info(iter);
if(display_dset_dtype_info) print_dset_dtype_info(iter);
if(!display_all && display_dset_metadata) print_dset_metadata(iter);
if(display_attr) print_attr_info(iter);
if(display_free_sections) print_freespace_info(iter);
if(display_summary) print_storage_summary(iter);
} }
@ -1424,7 +1556,7 @@ main(int argc, const char *argv[])
if(H5Fget_filesize(fid, &iter.filesize) < 0) if(H5Fget_filesize(fid, &iter.filesize) < 0)
warn_msg(progname, "Unable to retrieve file size\n"); warn_msg(progname, "Unable to retrieve file size\n");
assert(iter.filesize >= 0); assert(iter.filesize != 0);
/* Get storge info for file-level structures */ /* Get storge info for file-level structures */
if(H5Fget_info2(fid, &finfo) < 0) if(H5Fget_info2(fid, &finfo) < 0)
@ -1445,6 +1577,10 @@ main(int argc, const char *argv[])
if(H5Pget_userblock(fcpl, &iter.ublk_size) < 0) if(H5Pget_userblock(fcpl, &iter.ublk_size) < 0)
warn_msg(progname, "Unable to retrieve userblock size\n"); warn_msg(progname, "Unable to retrieve userblock size\n");
if(H5Pget_file_space(fcpl, &iter.fs_strategy, &iter.fs_threshold) < 0)
warn_msg(progname, "Unable to retrieve file space information\n");
assert(iter.fs_strategy != 0 && iter.fs_strategy < H5F_FILE_SPACE_NTYPES);
/* get information for free-space sections */ /* get information for free-space sections */
if(freespace_stats(fid, &iter) < 0) if(freespace_stats(fid, &iter) < 0)
warn_msg(progname, "Unable to retrieve freespace info\n"); warn_msg(progname, "Unable to retrieve freespace info\n");

2
tools/h5stat/testfiles/h5stat_filters-F.ddl
View File

@ -2,7 +2,7 @@
Expected output for 'h5stat -F h5stat_filters.h5' Expected output for 'h5stat -F h5stat_filters.h5'
############################# #############################
Filename: h5stat_filters.h5 Filename: h5stat_filters.h5
Storage information (in bytes): File space information for file metadata (in bytes):
Superblock: 96 Superblock: 96
Superblock extension: 0 Superblock extension: 0
User block: 0 User block: 0

11
tools/h5stat/testfiles/h5stat_filters.ddl
View File

@ -10,7 +10,7 @@ File information
# of unique other: 0 # of unique other: 0
Max. # of links to object: 1 Max. # of links to object: 1
Max. # of objects in group: 16 Max. # of objects in group: 16
Storage information (in bytes): File space information for file metadata (in bytes):
Superblock: 96 Superblock: 96
Superblock extension: 0 Superblock extension: 0
User block: 0 User block: 0
@ -84,7 +84,16 @@ Small # of attributes:
Attribute bins: Attribute bins:
Total # of objects with attributes: 0 Total # of objects with attributes: 0
Max. # of attributes to objects: 0 Max. # of attributes to objects: 0
Free-space section threshold: 1 bytes
Small size free-space sections (< 10 bytes): Small size free-space sections (< 10 bytes):
Total # of small size sections: 0 Total # of small size sections: 0
Free-space section bins: Free-space section bins:
Total # of sections: 0 Total # of sections: 0
File space management strategy: H5F_FILE_SPACE_ALL
Summary of file space information:
File metadata: 37312 bytes
Raw data: 8659 bytes
Amount/Percent of tracked free space: 0 bytes/0.0%
Unaccounted space: 301 bytes
Total space: 46272 bytes
External raw data: 400 bytes

16
tools/h5stat/testfiles/h5stat_help1.ddl
View File

@ -5,14 +5,14 @@ Usage: h5stat [OPTIONS] file
OPTIONS OPTIONS
-h, --help Print a usage message and exit -h, --help Print a usage message and exit
-V, --version Print version number and exit -v, --version Print version number and exit
-f, --file Print file information -f, --file Print file information
-F, --filemetadata Print file metadata -F, --FILEmetadata Print file space information for file's metadata
-g, --group Print group information -g, --group Print group information
-G, --groupmetadata Print group metadata -G, --GROUPmetadata Print file space information for groups' metadata
-d, --dset Print dataset information -d, --dset Print dataset information
-D, --dsetmetadata Print dataset metadata -D, --DSETmetadata Print file space information for datasets' metadata
-T, --dtypemetadata Print datatype metadata -T, --DSETtypeinfo Print datasets' datatype information
-A, --attribute Print attribute information -a, --attribute Print attribute information
-s, --freespace Print free-space information -s, --freespace Print free space information
-S, --Summary Print summary of storage information -S, --summary Print summary of file space information

16
tools/h5stat/testfiles/h5stat_help2.ddl
View File

@ -5,14 +5,14 @@ Usage: h5stat [OPTIONS] file
OPTIONS OPTIONS
-h, --help Print a usage message and exit -h, --help Print a usage message and exit
-V, --version Print version number and exit -v, --version Print version number and exit
-f, --file Print file information -f, --file Print file information
-F, --filemetadata Print file metadata -F, --FILEmetadata Print file space information for file's metadata
-g, --group Print group information -g, --group Print group information
-G, --groupmetadata Print group metadata -G, --GROUPmetadata Print file space information for groups' metadata
-d, --dset Print dataset information -d, --dset Print dataset information
-D, --dsetmetadata Print dataset metadata -D, --DSETmetadata Print file space information for datasets' metadata
-T, --dtypemetadata Print datatype metadata -T, --DSETtypeinfo Print datasets' datatype information
-A, --attribute Print attribute information -a, --attribute Print attribute information
-s, --freespace Print free-space information -s, --freespace Print free space information
-S, --Summary Print summary of storage information -S, --summary Print summary of file space information

10
tools/h5stat/testfiles/h5stat_newgrat.ddl
View File

@ -10,7 +10,7 @@ File information
# of unique other: 0 # of unique other: 0
Max. # of links to object: 1 Max. # of links to object: 1
Max. # of objects in group: 35001 Max. # of objects in group: 35001
Storage information (in bytes): File space information for file metadata (in bytes):
Superblock: 48 Superblock: 48
Superblock extension: 119 Superblock extension: 119
User block: 0 User block: 0
@ -80,6 +80,7 @@ Attribute bins:
# of objects with 100 - 999 attributes: 1 # of objects with 100 - 999 attributes: 1
Total # of objects with attributes: 1 Total # of objects with attributes: 1
Max. # of attributes to objects: 100 Max. # of attributes to objects: 100
Free-space section threshold: 1 bytes
Small size free-space sections (< 10 bytes): Small size free-space sections (< 10 bytes):
# of sections of size 1: 1 # of sections of size 1: 1
# of sections of size 2: 12 # of sections of size 2: 12
@ -92,3 +93,10 @@ Free-space section bins:
# of sections of size 10 - 99: 44 # of sections of size 10 - 99: 44
# of sections of size 100 - 999: 18 # of sections of size 100 - 999: 18
Total # of sections: 81 Total # of sections: 81
File space management strategy: H5F_FILE_SPACE_ALL_PERSIST
Summary of file space information:
File metadata: 6363206 bytes
Raw data: 0 bytes
Amount/Percent of tracked free space: 4463 bytes/0.1%
Unaccounted space: 0 bytes
Total space: 6367669 bytes

10
tools/h5stat/testfiles/h5stat_tsohm.ddl
View File

@ -10,7 +10,7 @@ File information
# of unique other: 0 # of unique other: 0
Max. # of links to object: 1 Max. # of links to object: 1
Max. # of objects in group: 3 Max. # of objects in group: 3
Storage information (in bytes): File space information for file metadata (in bytes):
Superblock: 48 Superblock: 48
Superblock extension: 40 Superblock extension: 40
User block: 0 User block: 0
@ -78,7 +78,15 @@ Small # of attributes:
Attribute bins: Attribute bins:
Total # of objects with attributes: 0 Total # of objects with attributes: 0
Max. # of attributes to objects: 0 Max. # of attributes to objects: 0
Free-space section threshold: 1 bytes
Small size free-space sections (< 10 bytes): Small size free-space sections (< 10 bytes):
Total # of small size sections: 0 Total # of small size sections: 0
Free-space section bins: Free-space section bins:
Total # of sections: 0 Total # of sections: 0
File space management strategy: H5F_FILE_SPACE_ALL
Summary of file space information:
File metadata: 3887 bytes
Raw data: 0 bytes
Amount/Percent of tracked free space: 0 bytes/0.0%
Unaccounted space: 0 bytes
Total space: 3887 bytes