diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.in | 2 | ||||
-rw-r--r-- | tools/gifconv/Makefile.in | 2 | ||||
-rw-r--r-- | tools/h5diff/Makefile.in | 2 | ||||
-rw-r--r-- | tools/h5dump/Makefile.in | 2 | ||||
-rwxr-xr-x | tools/h5import/Makefile.in | 2 | ||||
-rw-r--r-- | tools/h5jam/Makefile.in | 2 | ||||
-rw-r--r-- | tools/h5ls/Makefile.in | 2 | ||||
-rw-r--r-- | tools/h5repack/Makefile.in | 2 | ||||
-rw-r--r-- | tools/lib/Makefile.in | 2 | ||||
-rw-r--r-- | tools/misc/Makefile.in | 2 | ||||
-rw-r--r-- | tools/misc/h5debug.c | 36 |
11 files changed, 44 insertions, 12 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index cab7823..a273c2a 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -232,7 +232,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/Makefile + $(AUTOMAKE) --gnu tools/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 884b7ba..0d58f52 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -274,7 +274,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/gifconv/Makefile + $(AUTOMAKE) --gnu tools/gifconv/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 1fb5b22..d915684 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -291,7 +291,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/h5diff/Makefile + $(AUTOMAKE) --gnu tools/h5diff/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index dea8a1a..92f2647 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -280,7 +280,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/h5dump/Makefile + $(AUTOMAKE) --gnu tools/h5dump/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) testh5dump.sh: $(top_builddir)/config.status testh5dump.sh.in diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index cebd50d..50b50cc 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -275,7 +275,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/h5import/Makefile + $(AUTOMAKE) --gnu tools/h5import/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 7cb049f..38ae399 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -293,7 +293,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/h5jam/Makefile + $(AUTOMAKE) --gnu tools/h5jam/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) testh5jam.sh: $(top_builddir)/config.status testh5jam.sh.in diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 4b3ba28..8510e7c 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -264,7 +264,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/h5ls/Makefile + $(AUTOMAKE) --gnu tools/h5ls/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 5da78ff..50d03c1 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -324,7 +324,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/h5repack/Makefile + $(AUTOMAKE) --gnu tools/h5repack/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) h5repack.sh: $(top_builddir)/config.status h5repack.sh.in diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 5be44e4..3c6f426 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -290,7 +290,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/lib/Makefile + $(AUTOMAKE) --gnu tools/lib/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 3362269..f76b769 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -294,7 +294,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/misc/Makefile + $(AUTOMAKE) --gnu tools/misc/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) h5cc: $(top_builddir)/config.status h5cc.in diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c index 466279c..88dc861 100644 --- a/tools/misc/h5debug.c +++ b/tools/misc/h5debug.c @@ -26,9 +26,11 @@ */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ #define H5O_PACKAGE /*suppress error about including H5Opkg */ +#define H5B2_PACKAGE /*suppress error about including H5B2pkg */ -#include "H5private.h" +#include "H5private.h" /* Generic Functions */ #include "H5Bprivate.h" +#include "H5B2pkg.h" /* B-trees */ #include "H5Dprivate.h" #include "H5Fpkg.h" #include "H5Gprivate.h" @@ -75,7 +77,7 @@ main(int argc, char *argv[]) if (argc == 1) { fprintf(stderr, - "Usage: %s filename [signature addr [extra]]\n", argv[0]); + "Usage: %s filename [signature-addr [extra]]\n", argv[0]); HDexit(1); } @@ -173,6 +175,36 @@ main(int argc, char *argv[]) HDexit(4); } + } else if (!HDmemcmp(sig, H5B2_HDR_MAGIC, H5B2_SIZEOF_MAGIC)) { + /* + * Debug a v2 B-tree. B-trees are debugged through the B-tree + * subclass. The subclass identifier is two bytes after the + * B-tree signature. + */ + H5B2_subid_t subtype = (H5B_subid_t)sig[H5B2_SIZEOF_MAGIC+1]; + +#ifdef NOT_YET + switch (subtype) { + case H5B_SNODE_ID: + status = H5G_node_debug(f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL, extra); + break; + + case H5B_ISTORE_ID: + ndims = (unsigned)extra; + status = H5D_istore_debug (f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL, ndims); + break; + + default: + fprintf(stderr, "Unknown B-tree subtype %u\n", (unsigned)(subtype)); + HDexit(4); + } +#else /* NOT_YET */ +H5B2_class_t type={0,sizeof(hsize_t),NULL,NULL,NULL}; /* B-tree class information */ + +fprintf(stderr,"B-tree subtype=%u\n",(unsigned)subtype); + status = H5B2_hdr_debug(f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL, &type); +#endif /* NOT_YET */ + } else if (sig[0] == H5O_VERSION) { /* * This could be an object header. Since they don't have a signature |