HDFFV-10384 and includes cleanup merged from devlop

This commit is contained in:
Allen Byrne 2018-02-16 09:25:51 -06:00
parent 4644bd295a
commit fc875eb5b7
48 changed files with 102 additions and 118 deletions

View File

@ -518,6 +518,18 @@ Bug Fixes since HDF5-1.10.1 release
Tools
-----
- h5dump
the tools library will hide the error stack during file open.
While this is preferable almost always, there are reasons to enable
display of the error stack when a tool will not open a file. Adding an
optional argument to the --enable-error-stack will provide this use case.
As an optional argument it will not affect the operation of the
--enable-error-stack. h5dump is the only tool to implement this change.
(ADB - 2018/02/15, HDFFV-10384)
- h5dump
h5dump would output an indented blank line in the filters section.

View File

@ -21,7 +21,6 @@
*/
#include "hdf5.h"
#include "h5test.h"
#define PRINT_DATA

View File

@ -15,10 +15,9 @@
* Programmer: Quincey Koziol <koziol@ncsa.uiuc.edu>
* Tuesday, May 13, 2003
*
* Purpose: Test dangling IDs
* Purpose: Test dangling IDs
*/
#include "h5test.h"
#include "H5private.h"
const char *FILENAME[] = {
"dangle",

View File

@ -26,7 +26,6 @@
* worth keeping around for now.
*/
#include <stdio.h>
#include "h5test.h"
#define H5FILE_NAME "data.h5"

View File

@ -20,9 +20,7 @@
* another by anything that appears in the file format.
*/
#include "h5test.h"
#include "H5private.h"
#include "H5ACprivate.h"
#include "H5Eprivate.h"
#include "H5Fprivate.h"
#include "H5Gprivate.h"
#include "H5HGprivate.h"

View File

@ -20,8 +20,13 @@
#ifndef _H5TEST_H
#define _H5TEST_H
/*
* Include required headers. This file tests internal library functions,
* so we include the private headers here.
*/
#include "hdf5.h"
#include "H5private.h"
#include "H5Eprivate.h"
/*
* Predefined test verbosity levels.

View File

@ -21,8 +21,6 @@
* rewrite much of the hyperslab stuff.
*/
#include "h5test.h"
#include "H5private.h"
#include "H5Eprivate.h"
#include "H5VMprivate.h"
#define TEST_SMALL 0x0001

View File

@ -20,15 +20,13 @@
#define H5F_FRIEND /*suppress error about including H5Fpkg */
#include "h5test.h"
#include "H5private.h"
#include "H5Dprivate.h"
#include "H5Eprivate.h"
#include "H5Iprivate.h"
#include "H5Pprivate.h"
#include "H5Fpkg.h"
#include "H5Gprivate.h"
#include "H5Oprivate.h"
#include "H5Pprivate.h"
#include "H5VMprivate.h"
const char *FILENAME[] = {

View File

@ -24,7 +24,6 @@
*
*************************************************************/
#include "hdf5.h"
#include "h5test.h"
#include "H5Iprivate.h"

View File

@ -22,8 +22,6 @@
#include "testhdf5.h"
#include "H5srcdir.h"
#include "hdf5.h"
#define FILENAME "tarray1.h5"
#define TESTFILE "tarrold.h5"

View File

@ -20,8 +20,6 @@
*************************************************************/
#include "testhdf5.h"
#include "h5test.h"
#include "hdf5.h"
/*
* This file needs to access private information from the H5O package.

View File

@ -19,7 +19,6 @@
*
*************************************************************/
#include "hdf5.h"
#include "testhdf5.h"
/* macros definitions */

View File

@ -18,13 +18,6 @@
#ifndef TESTHDF5_H
#define TESTHDF5_H
/*
* Include required headers. This file tests internal library functions,
* so we include the private headers here.
*/
#include "H5private.h"
#include "H5Eprivate.h"
/* Include generic testing header also */
#include "h5test.h"
@ -204,12 +197,12 @@ void test_vlstrings(void);
void test_iterate(void);
void test_array(void);
void test_genprop(void);
void test_configure(void);
void test_misc(void);
void test_ids(void);
void test_skiplist(void);
void test_sohm(void);
void test_unicode(void);
void test_configure(void);
void test_misc(void);
void test_ids(void);
void test_skiplist(void);
void test_sohm(void);
void test_unicode(void);
/* Prototypes for the cleanup routines */
void cleanup_metadata(void);
@ -227,10 +220,10 @@ void cleanup_vlstrings(void);
void cleanup_iterate(void);
void cleanup_array(void);
void cleanup_genprop(void);
void cleanup_configure(void);
void cleanup_sohm(void);
void cleanup_misc(void);
void cleanup_unicode(void);
void cleanup_configure(void);
void cleanup_sohm(void);
void cleanup_misc(void);
void cleanup_unicode(void);
#ifdef __cplusplus
}

View File

@ -19,7 +19,6 @@
*
*************************************************************/
#include "hdf5.h"
#include "testhdf5.h"
#include "H5srcdir.h"

View File

@ -25,7 +25,7 @@
#define H5P_TESTING
#include "testhdf5.h"
#include "hdf5.h"
#include "H5Dprivate.h" /* For Dataset creation property list names */
#include "H5Ppkg.h" /* Generic Properties */

View File

@ -22,7 +22,6 @@
#include "testhdf5.h"
#include "H5srcdir.h"
#include "H5private.h"
#include "H5Bprivate.h"
#include "H5Sprivate.h"
#include "H5Pprivate.h"

View File

@ -14,7 +14,6 @@
/* Test user-created identifiers (hid_t's) and identifier types. */
#include "testhdf5.h"
#include "hdf5.h"
/* Include H5Ipkg.h to calculate max number of groups */
#define H5I_FRIEND /*suppress error about including H5Ipkg */

View File

@ -21,8 +21,6 @@
#include "testhdf5.h"
#include "hdf5.h"
#define DATAFILE "titerate.h5"
/* Number of datasets for group iteration test */

View File

@ -26,7 +26,6 @@
/* Define this macro to indicate that the testing APIs should be available */
#define H5D_TESTING
#include "hdf5.h"
#include "testhdf5.h"
#include "H5srcdir.h"
#include "H5Dpkg.h" /* Datasets */

View File

@ -21,8 +21,6 @@
#include "testhdf5.h"
#include "hdf5.h"
#define FILE1 "trefer1.h5"
#define FILE2 "trefer2.h5"
#define FILE3 "trefer3.h5"

View File

@ -21,8 +21,6 @@
#include "testhdf5.h"
#include "hdf5.h"
#define DATAFILE "ttime.h5"
#ifdef NOT_YET
#define DATASETNAME "Dataset"

View File

@ -22,9 +22,6 @@
* Include required headers. This file tests internal library functions,
* so we include the private headers here.
*/
#include "hdf5.h"
#include "H5private.h"
#include "H5Eprivate.h"
#include "testhdf5.h"

View File

@ -21,8 +21,6 @@
#include "testhdf5.h"
#include "hdf5.h"
#define DATAFILE "tvlstr.h5"
#define DATAFILE2 "tvlstr2.h5"

View File

@ -21,7 +21,6 @@
#include "testhdf5.h"
#include "hdf5.h"
#include "H5Dprivate.h"
#define FILENAME "tvltypes.h5"

View File

@ -1,5 +1,5 @@
#include "testpar.h"
#include "hdf5.h"
#include "testphdf5.h"
#include "H5Dprivate.h" /* For Chunk tests */

View File

@ -16,7 +16,6 @@
*
*/
#include "h5test.h"
#include "testpar.h"
#define H5AC_FRIEND /*suppress error about including H5ACpkg */

View File

@ -17,9 +17,8 @@
* This file contains tests specific to the cache image
* feature implemented in H5C.c
*/
#include "h5test.h"
#include "testphdf5.h"
#include "testpar.h"
#include "cache_common.h"
#include "genall5.h"

View File

@ -21,7 +21,6 @@
* calling _exit(0) since this doesn't flush HDF5 caches but
* still exits with success.
*/
#include <mpi.h>
#include "h5test.h"
const char *FILENAME[] = {

View File

@ -16,7 +16,6 @@
*
*/
#include "h5test.h"
#include "testpar.h"
/* The collection of files is included below to aid

View File

@ -22,8 +22,6 @@
#define H5S_TESTING
#include "hdf5.h"
#include "H5private.h"
#include "testphdf5.h"
#include "H5Spkg.h" /* Dataspaces */

View File

@ -32,8 +32,6 @@
*/
#include "hdf5.h"
#include "H5private.h"
#include "testphdf5.h"

View File

@ -43,7 +43,7 @@ unsigned packed_bits_num; /* number of packed bits to display */
unsigned packed_data_offset; /* offset of packed bits to display */
unsigned packed_data_length; /* length of packed bits to display */
unsigned long long packed_data_mask; /* mask in which packed bits to display */
int enable_error_stack= FALSE; /* re-enable error stack */
int enable_error_stack = 0; /* re-enable error stack; disable=0 enable=1 */
/* sort parameters */
H5_index_t sort_by = H5_INDEX_NAME; /*sort_by [creation_order | name] */
@ -548,9 +548,15 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, const char *driver,
if ((my_fapl = h5tools_get_fapl(fapl, driver, &drivernum)) < 0)
goto done;
H5E_BEGIN_TRY {
/* allow error stack display if enable-error-stack has optional arg number */
if (enable_error_stack > 1) {
fid = H5Fopen(fname, flags, my_fapl);
} H5E_END_TRY;
}
else {
H5E_BEGIN_TRY {
fid = H5Fopen(fname, flags, my_fapl);
} H5E_END_TRY;
}
if (fid == FAIL)
goto done;
@ -563,9 +569,15 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, const char *driver,
if((my_fapl = h5tools_get_fapl(fapl, drivernames[drivernum], NULL)) < 0)
goto done;
H5E_BEGIN_TRY {
/* allow error stack display if enable-error-stack has optional arg number */
if (enable_error_stack > 1) {
fid = H5Fopen(fname, flags, my_fapl);
} H5E_END_TRY;
}
else {
H5E_BEGIN_TRY {
fid = H5Fopen(fname, flags, my_fapl);
} H5E_END_TRY;
}
if (fid != FAIL)
break;

View File

@ -573,7 +573,7 @@ H5TOOLS_DLLVAR H5_index_t sort_by; /*sort_by [creation_order | name] *
H5TOOLS_DLLVAR H5_iter_order_t sort_order; /*sort_order [ascending | descending] */
/* things to display or which are set via command line parameters */
H5TOOLS_DLLVAR int enable_error_stack; /* re-enable error stack */
H5TOOLS_DLLVAR int enable_error_stack; /* re-enable error stack; disable=0 enable=1 */
/* Strings for output */
#define H5_TOOLS_GROUP "GROUP"

View File

@ -293,7 +293,7 @@ main (int argc, const char *argv[])
break;
case 'E':
enable_error_stack = TRUE;
enable_error_stack = 1;
break;
default:
@ -330,7 +330,7 @@ main (int argc, const char *argv[])
leave(EXIT_FAILURE);
}
if (enable_error_stack) {
if (enable_error_stack > 0) {
H5Eset_auto2(H5E_DEFAULT, func, edata);
H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
}

View File

@ -178,7 +178,7 @@ void parse_command_line(int argc,
break;
case 'S':
enable_error_stack = TRUE;
enable_error_stack = 1;
break;
case 'E':

View File

@ -100,7 +100,7 @@ int main(int argc, const char *argv[])
*/
parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &opts);
if (enable_error_stack) {
if (enable_error_stack > 0) {
H5Eset_auto2(H5E_DEFAULT, func, edata);
H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
}

View File

@ -67,7 +67,7 @@ struct handler_t {
*/
/* The following initialization makes use of C language cancatenating */
/* "xxx" "yyy" into "xxxyyy". */
static const char *s_opts = "hn*peyBHirVa:c:d:f:g:k:l:t:w:xD:uX:o*b*F:s:S:A*q:z:m:RECM:O*N:vG:";
static const char *s_opts = "hn*peyBHirVa:c:d:f:g:k:l:t:w:xD:uX:o*b*F:s:S:A*q:z:m:RE*CM:O*N:vG:";
static struct long_options l_opts[] = {
{ "help", no_arg, 'h' },
{ "hel", no_arg, 'h' },
@ -181,7 +181,7 @@ static struct long_options l_opts[] = {
{ "sort_order", require_arg, 'z' },
{ "format", require_arg, 'm' },
{ "region", no_arg, 'R' },
{ "enable-error-stack", no_arg, 'E' },
{ "enable-error-stack", optional_arg, 'E' },
{ "packed-bits", require_arg, 'M' },
{ "no-compact-subset", no_arg, 'C' },
{ "ddl", optional_arg, 'O' },
@ -273,8 +273,8 @@ usage(const char *prog)
PRINTVALSTREAM(rawoutstream, " -m T, --format=T Set the floating point output format\n");
PRINTVALSTREAM(rawoutstream, " -q Q, --sort_by=Q Sort groups and attributes by index Q\n");
PRINTVALSTREAM(rawoutstream, " -z Z, --sort_order=Z Sort groups and attributes by order Z\n");
PRINTVALSTREAM(rawoutstream, " --enable-error-stack Prints messages from the HDF5 error stack as they\n");
PRINTVALSTREAM(rawoutstream, " occur.\n");
PRINTVALSTREAM(rawoutstream, " --enable-error-stack Prints messages from the HDF5 error stack as they occur.\n");
PRINTVALSTREAM(rawoutstream, " Optional value 2 also prints file open errors.\n");
PRINTVALSTREAM(rawoutstream, " --no-compact-subset Disable compact form of subsetting and allow the use\n");
PRINTVALSTREAM(rawoutstream, " of \"[\" in dataset names.\n");
PRINTVALSTREAM(rawoutstream, " -w N, --width=N Set the number of columns of output. A value of 0 (zero)\n");
@ -920,9 +920,8 @@ parse_start:
case 'n':
display_fi = TRUE;
last_was_dset = FALSE;
if ( opt_arg != NULL) {
if (opt_arg != NULL)
h5trav_set_verbose(HDatoi(opt_arg));
}
break;
case 'p':
display_dcpl = TRUE;
@ -939,8 +938,9 @@ parse_start:
last_was_dset = FALSE;
break;
case 'A':
if ( opt_arg != NULL) {
if(0 == HDatoi(opt_arg)) include_attrs = FALSE;
if (opt_arg != NULL) {
if(0 == HDatoi(opt_arg))
include_attrs = FALSE;
}
else {
display_data = FALSE;
@ -1059,7 +1059,7 @@ parse_start:
break;
case 'o':
if ( bin_output ) {
if (bin_output) {
if (h5tools_set_data_output_file(opt_arg, 1) < 0) {
usage(h5tools_getprogname());
goto error;
@ -1086,8 +1086,8 @@ parse_start:
break;
case 'b':
if ( opt_arg != NULL) {
if ( ( bin_form = set_binary_form(opt_arg)) < 0) {
if (opt_arg != NULL) {
if ((bin_form = set_binary_form(opt_arg)) < 0) {
/* failed to set binary form */
usage(h5tools_getprogname());
goto error;
@ -1106,7 +1106,7 @@ parse_start:
break;
case 'q':
if ( ( sort_by = set_sort_by(opt_arg)) < 0) {
if ((sort_by = set_sort_by(opt_arg)) < 0) {
/* failed to set "sort by" form */
usage(h5tools_getprogname());
goto error;
@ -1114,7 +1114,7 @@ parse_start:
break;
case 'z':
if ( ( sort_order = set_sort_order(opt_arg)) < 0) {
if ((sort_order = set_sort_order(opt_arg)) < 0) {
/* failed to set "sort order" form */
usage(h5tools_getprogname());
goto error;
@ -1268,7 +1268,10 @@ end_collect:
/** end subsetting parameters **/
case 'E':
enable_error_stack = TRUE;
if (opt_arg != NULL)
enable_error_stack = HDatoi(opt_arg);
else
enable_error_stack = 1;
break;
case 'C':
disable_compact_subset = TRUE;
@ -1388,7 +1391,7 @@ main(int argc, const char *argv[])
goto done;
}
if (enable_error_stack) {
if (enable_error_stack > 0) {
H5Eset_auto2(H5E_DEFAULT, func, edata);
H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
}

View File

@ -634,7 +634,7 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
break;
case 'E':
enable_error_stack = TRUE;
enable_error_stack = 1;
break;
default:
@ -727,7 +727,7 @@ int main(int argc, const char **argv)
}
}
if (enable_error_stack) {
if (enable_error_stack > 0) {
H5Eset_auto2(H5E_DEFAULT, func, edata);
H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
}

View File

@ -15,7 +15,6 @@
#include "io_timer.h"
#ifndef STANDALONE
#include "H5private.h"
#include "h5test.h"
#include "h5tools.h"
#include "h5tools_utils.h"
@ -36,22 +35,22 @@ typedef enum iotype_ {
} iotype;
typedef struct parameters_ {
iotype io_type; /* The type of IO test to perform */
int num_procs; /* Maximum number of processes to use */
long num_files; /* Number of files to create */
long num_dsets; /* Number of datasets to create */
off_t num_bytes; /* Number of bytes in each dset */
iotype io_type; /* The type of IO test to perform */
int num_procs; /* Maximum number of processes to use */
long num_files; /* Number of files to create */
long num_dsets; /* Number of datasets to create */
off_t num_bytes; /* Number of bytes in each dset */
int num_iters; /* Number of times to loop doing the IO */
size_t buf_size; /* Buffer size */
size_t blk_size; /* Block size */
size_t buf_size; /* Buffer size */
size_t blk_size; /* Block size */
unsigned interleaved; /* Interleaved vs. contiguous blocks */
unsigned collective; /* Collective vs. independent I/O */
unsigned dim2d; /* 1D vs. 2D */
hsize_t h5_align; /* HDF5 object alignment */
hsize_t h5_thresh; /* HDF5 object alignment threshold */
int h5_use_chunks; /* Make HDF5 dataset chunked */
int h5_write_only; /* Perform the write tests only */
int verify; /* Verify data correctness */
hsize_t h5_align; /* HDF5 object alignment */
hsize_t h5_thresh; /* HDF5 object alignment threshold */
int h5_use_chunks; /* Make HDF5 dataset chunked */
int h5_write_only; /* Perform the write tests only */
int verify; /* Verify data correctness */
} parameters;
typedef struct results_ {

View File

@ -15,7 +15,6 @@
#include "io_timer.h"
#ifndef STANDALONE
#include "H5private.h"
#include "h5test.h"
#include "h5tools.h"
#include "h5tools_utils.h"

View File

@ -44,8 +44,8 @@ usage: h5dump [OPTIONS] files
-m T, --format=T Set the floating point output format
-q Q, --sort_by=Q Sort groups and attributes by index Q
-z Z, --sort_order=Z Sort groups and attributes by order Z
--enable-error-stack Prints messages from the HDF5 error stack as they
occur.
--enable-error-stack Prints messages from the HDF5 error stack as they occur.
Optional value 2 also prints file open errors.
--no-compact-subset Disable compact form of subsetting and allow the use
of "[" in dataset names.
-w N, --width=N Set the number of columns of output. A value of 0 (zero)

View File

@ -44,8 +44,8 @@ usage: h5dump [OPTIONS] files
-m T, --format=T Set the floating point output format
-q Q, --sort_by=Q Sort groups and attributes by index Q
-z Z, --sort_order=Z Sort groups and attributes by order Z
--enable-error-stack Prints messages from the HDF5 error stack as they
occur.
--enable-error-stack Prints messages from the HDF5 error stack as they occur.
Optional value 2 also prints file open errors.
--no-compact-subset Disable compact form of subsetting and allow the use
of "[" in dataset names.
-w N, --width=N Set the number of columns of output. A value of 0 (zero)

View File

@ -44,8 +44,8 @@ usage: h5dump [OPTIONS] files
-m T, --format=T Set the floating point output format
-q Q, --sort_by=Q Sort groups and attributes by index Q
-z Z, --sort_order=Z Sort groups and attributes by order Z
--enable-error-stack Prints messages from the HDF5 error stack as they
occur.
--enable-error-stack Prints messages from the HDF5 error stack as they occur.
Optional value 2 also prints file open errors.
--no-compact-subset Disable compact form of subsetting and allow the use
of "[" in dataset names.
-w N, --width=N Set the number of columns of output. A value of 0 (zero)

View File

@ -44,8 +44,8 @@ usage: h5dump [OPTIONS] files
-m T, --format=T Set the floating point output format
-q Q, --sort_by=Q Sort groups and attributes by index Q
-z Z, --sort_order=Z Sort groups and attributes by order Z
--enable-error-stack Prints messages from the HDF5 error stack as they
occur.
--enable-error-stack Prints messages from the HDF5 error stack as they occur.
Optional value 2 also prints file open errors.
--no-compact-subset Disable compact form of subsetting and allow the use
of "[" in dataset names.
-w N, --width=N Set the number of columns of output. A value of 0 (zero)

View File

@ -44,8 +44,8 @@ usage: h5dump [OPTIONS] files
-m T, --format=T Set the floating point output format
-q Q, --sort_by=Q Sort groups and attributes by index Q
-z Z, --sort_order=Z Sort groups and attributes by order Z
--enable-error-stack Prints messages from the HDF5 error stack as they
occur.
--enable-error-stack Prints messages from the HDF5 error stack as they occur.
Optional value 2 also prints file open errors.
--no-compact-subset Disable compact form of subsetting and allow the use
of "[" in dataset names.
-w N, --width=N Set the number of columns of output. A value of 0 (zero)

View File

@ -44,8 +44,8 @@ usage: h5dump [OPTIONS] files
-m T, --format=T Set the floating point output format
-q Q, --sort_by=Q Sort groups and attributes by index Q
-z Z, --sort_order=Z Sort groups and attributes by order Z
--enable-error-stack Prints messages from the HDF5 error stack as they
occur.
--enable-error-stack Prints messages from the HDF5 error stack as they occur.
Optional value 2 also prints file open errors.
--no-compact-subset Disable compact form of subsetting and allow the use
of "[" in dataset names.
-w N, --width=N Set the number of columns of output. A value of 0 (zero)

View File

@ -44,8 +44,8 @@ usage: h5dump [OPTIONS] files
-m T, --format=T Set the floating point output format
-q Q, --sort_by=Q Sort groups and attributes by index Q
-z Z, --sort_order=Z Sort groups and attributes by order Z
--enable-error-stack Prints messages from the HDF5 error stack as they
occur.
--enable-error-stack Prints messages from the HDF5 error stack as they occur.
Optional value 2 also prints file open errors.
--no-compact-subset Disable compact form of subsetting and allow the use
of "[" in dataset names.
-w N, --width=N Set the number of columns of output. A value of 0 (zero)

View File

@ -44,8 +44,8 @@ usage: h5dump [OPTIONS] files
-m T, --format=T Set the floating point output format
-q Q, --sort_by=Q Sort groups and attributes by index Q
-z Z, --sort_order=Z Sort groups and attributes by order Z
--enable-error-stack Prints messages from the HDF5 error stack as they
occur.
--enable-error-stack Prints messages from the HDF5 error stack as they occur.
Optional value 2 also prints file open errors.
--no-compact-subset Disable compact form of subsetting and allow the use
of "[" in dataset names.
-w N, --width=N Set the number of columns of output. A value of 0 (zero)