summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2014-12-17 23:07:24 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2014-12-17 23:07:24 (GMT)
commitd9ba0ae35fce3c6fdf2559753093338061588c00 (patch)
tree4160f420ade0df1ebfc561b4e61d55dfd34dc5e8
parent4c24346fe1c5ff4ff9e4a9ae7ffec2b5ef9cd922 (diff)
downloadhdf5-d9ba0ae35fce3c6fdf2559753093338061588c00.zip
hdf5-d9ba0ae35fce3c6fdf2559753093338061588c00.tar.gz
hdf5-d9ba0ae35fce3c6fdf2559753093338061588c00.tar.bz2
[svn-r25900] HDFFV-9046: reorganize hdf5/perform/ directory
Moved perform/ to tools/perform. Updated all the configure related files for the new location. Tested: h5committested plus tested in jam and kite.
-rw-r--r--CMakeLists.txt8
-rw-r--r--MANIFEST60
-rw-r--r--Makefile.am24
-rw-r--r--Makefile.in52
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac2
-rw-r--r--tools/CMakeLists.txt3
-rw-r--r--tools/Makefile.am3
-rw-r--r--tools/Makefile.in4
-rw-r--r--tools/perform/CMakeLists.txt (renamed from perform/CMakeLists.txt)0
-rw-r--r--tools/perform/CMakeTests.cmake (renamed from perform/CMakeTests.cmake)0
-rw-r--r--tools/perform/COPYING (renamed from perform/COPYING)0
-rw-r--r--tools/perform/Makefile.am (renamed from perform/Makefile.am)0
-rw-r--r--tools/perform/Makefile.in (renamed from perform/Makefile.in)6
-rw-r--r--tools/perform/benchpar.c (renamed from perform/benchpar.c)0
-rwxr-xr-xtools/perform/build_h5perf_alone.sh (renamed from perform/build_h5perf_alone.sh)0
-rwxr-xr-xtools/perform/build_h5perf_serial_alone.sh (renamed from perform/build_h5perf_serial_alone.sh)0
-rw-r--r--tools/perform/chunk.c (renamed from perform/chunk.c)0
-rwxr-xr-xtools/perform/gen_report.pl (renamed from perform/gen_report.pl)0
-rw-r--r--tools/perform/iopipe.c (renamed from perform/iopipe.c)0
-rw-r--r--tools/perform/overhead.c (renamed from perform/overhead.c)0
-rw-r--r--tools/perform/perf.c (renamed from perform/perf.c)0
-rw-r--r--tools/perform/perf_meta.c (renamed from perform/perf_meta.c)0
-rw-r--r--tools/perform/pio_engine.c (renamed from perform/pio_engine.c)0
-rw-r--r--tools/perform/pio_perf.c (renamed from perform/pio_perf.c)0
-rw-r--r--tools/perform/pio_perf.h (renamed from perform/pio_perf.h)0
-rw-r--r--tools/perform/pio_standalone.c (renamed from perform/pio_standalone.c)0
-rw-r--r--tools/perform/pio_standalone.h (renamed from perform/pio_standalone.h)0
-rw-r--r--tools/perform/pio_timer.c (renamed from perform/pio_timer.c)0
-rw-r--r--tools/perform/pio_timer.h (renamed from perform/pio_timer.h)0
-rw-r--r--tools/perform/sio_engine.c (renamed from perform/sio_engine.c)0
-rw-r--r--tools/perform/sio_perf.c (renamed from perform/sio_perf.c)0
-rw-r--r--tools/perform/sio_perf.h (renamed from perform/sio_perf.h)0
-rw-r--r--tools/perform/sio_standalone.c (renamed from perform/sio_standalone.c)0
-rw-r--r--tools/perform/sio_standalone.h (renamed from perform/sio_standalone.h)0
-rw-r--r--tools/perform/sio_timer.c (renamed from perform/sio_timer.c)0
-rw-r--r--tools/perform/sio_timer.h (renamed from perform/sio_timer.h)0
-rw-r--r--tools/perform/zip_perf.c (renamed from perform/zip_perf.c)0
38 files changed, 82 insertions, 84 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6877b6a..8edffdb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,7 +145,7 @@ set (HDF5_CPP_TST_DIR ${HDF5_SOURCE_DIR}/c++/test)
set (HDF5_HL_SRC_DIR ${HDF5_SOURCE_DIR}/hl)
set (HDF5_HL_CPP_SRC_DIR ${HDF5_SOURCE_DIR}/hl/c++)
set (HDF5_TOOLS_SRC_DIR ${HDF5_SOURCE_DIR}/tools)
-set (HDF5_PERFORM_SRC_DIR ${HDF5_SOURCE_DIR}/perform)
+set (HDF5_PERFORM_SRC_DIR ${HDF5_SOURCE_DIR}/tools/perform)
set (HDF5_F90_SRC_DIR ${HDF5_SOURCE_DIR}/fortran)
if (NOT HDF5_INSTALL_BIN_DIR)
@@ -773,9 +773,9 @@ if (BUILD_TESTING)
add_subdirectory (${HDF5_SOURCE_DIR}/tools/lib ${PROJECT_BINARY_DIR}/tools/lib)
add_subdirectory (${HDF5_SOURCE_DIR}/test ${PROJECT_BINARY_DIR}/test)
endif (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test")
- if (EXISTS "${HDF5_SOURCE_DIR}/perform" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/perform")
- add_subdirectory (${HDF5_SOURCE_DIR}/perform ${PROJECT_BINARY_DIR}/perform)
- endif (EXISTS "${HDF5_SOURCE_DIR}/perform" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/perform")
+# if (EXISTS "${HDF5_SOURCE_DIR}/perform" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/perform")
+# add_subdirectory (${HDF5_SOURCE_DIR}/perform ${PROJECT_BINARY_DIR}/perform)
+# endif (EXISTS "${HDF5_SOURCE_DIR}/perform" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/perform")
if (H5_HAVE_PARALLEL)
if (EXISTS "${HDF5_SOURCE_DIR}/testpar" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/testpar")
add_subdirectory (${HDF5_SOURCE_DIR}/testpar ${PROJECT_BINARY_DIR}/testpar)
diff --git a/MANIFEST b/MANIFEST
index 69e4ecd..843bc8e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -525,34 +525,6 @@
#
#------------------------------------------------------------------------------
-./perform/COPYING
-./perform/Makefile.am
-./perform/Makefile.in
-./perform/benchpar.c
-./perform/build_h5perf_alone.sh
-./perform/build_h5perf_serial_alone.sh
-./perform/chunk.c
-./perform/gen_report.pl
-./perform/iopipe.c
-./perform/overhead.c
-./perform/perf.c
-./perform/perf_meta.c
-./perform/pio_engine.c
-./perform/pio_perf.c
-./perform/pio_perf.h
-./perform/pio_standalone.c
-./perform/pio_standalone.h
-./perform/pio_timer.c
-./perform/pio_timer.h
-./perform/sio_engine.c
-./perform/sio_perf.c
-./perform/sio_perf.h
-./perform/sio_standalone.c
-./perform/sio_standalone.h
-./perform/sio_timer.c
-./perform/sio_timer.h
-./perform/zip_perf.c
-
./release_docs/COPYING
./release_docs/HISTORY-1_0-1_8_0_rc3.txt
./release_docs/HISTORY-1_9.txt
@@ -2231,6 +2203,34 @@
./tools/testfiles/h5mkgrp_single_p.ls
./tools/testfiles/h5mkgrp_single_l.ls
+./tools/perform/COPYING
+./tools/perform/Makefile.am
+./tools/perform/Makefile.in
+./tools/perform/benchpar.c
+./tools/perform/build_h5perf_alone.sh
+./tools/perform/build_h5perf_serial_alone.sh
+./tools/perform/chunk.c
+./tools/perform/gen_report.pl
+./tools/perform/iopipe.c
+./tools/perform/overhead.c
+./tools/perform/perf.c
+./tools/perform/perf_meta.c
+./tools/perform/pio_engine.c
+./tools/perform/pio_perf.c
+./tools/perform/pio_perf.h
+./tools/perform/pio_standalone.c
+./tools/perform/pio_standalone.h
+./tools/perform/pio_timer.c
+./tools/perform/pio_timer.h
+./tools/perform/sio_engine.c
+./tools/perform/sio_perf.c
+./tools/perform/sio_perf.h
+./tools/perform/sio_standalone.c
+./tools/perform/sio_standalone.h
+./tools/perform/sio_timer.c
+./tools/perform/sio_timer.h
+./tools/perform/zip_perf.c
+
# high level libraries
./hl/COPYING
@@ -2526,8 +2526,6 @@
./hl/test/CMakeTests.cmake
./hl/tools/CMakeLists.txt
./hl/tools/CMakeTests.cmake
-./perform/CMakeLists.txt
-./perform/CMakeTests.cmake
./src/CMakeLists.txt
./test/CMakeLists.txt
./test/CMakeTests.cmake
@@ -2555,3 +2553,5 @@
./tools/lib/CMakeLists.txt
./tools/misc/CMakeLists.txt
./tools/misc/CMakeTests.cmake
+./tools/perform/CMakeLists.txt
+./tools/perform/CMakeTests.cmake
diff --git a/Makefile.am b/Makefile.am
index 640fdcb..aaa3b9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,13 +73,13 @@ else
endif
SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
- $(HDF5_HL_DIR) perform
-DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
+ $(HDF5_HL_DIR)
+DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples
# Some files generated during configure that should be cleaned
DISTCLEANFILES=config/stamp1 config/stamp2
-# Some files/directories generated during check that should be cleaned
+# Some files/directories generated during checkperform that should be cleaned
CHECK_CLEANFILES+=*-tmp
# Define rules for lib, progs, check, and tests.
@@ -93,25 +93,17 @@ lib progs check-p check-s:
fi; \
done
-# Make all, tests, and (un)install also recurse into perform directory
-all-local:
- @cd perform && $(MAKE) $(AM_MAKEFLAGS) all
-
+# Make all, tests, and (un)install also recurse into directory
tests:
- @@SETX@; for d in $(SUBDIRS) perform; do \
+ @@SETX@; for d in $(SUBDIRS); do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
- done
-
-install-exec-local:
- @cd perform && $(MAKE) $(AM_MAKEFLAGS) install
-uninstall-local:
- @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
+ done
# Check-clean also recurses into examples directory
check-clean:
- @@SETX@; for d in $(SUBDIRS) examples perform; do \
+ @@SETX@; for d in $(SUBDIRS) examples; do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
@@ -201,4 +193,4 @@ check-vfd:
$(top_builddir)/config.status:
# Don't include conclude.am in root Makefile; tests target needs to
-# recurse into perform directory as well as reguar subdirs.
+# recurse into reguar subdirs.
diff --git a/Makefile.in b/Makefile.in
index 05e2d73..e7fcf48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -503,7 +503,7 @@ TRACE = perl $(top_srcdir)/bin/trace
# .chklog files are output from those tests.
# *.clog are from the MPE option.
-# Some files/directories generated during check that should be cleaned
+# Some files/directories generated during checkperform that should be cleaned
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *-tmp
@BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR =
@@ -525,9 +525,9 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *-tmp
@BUILD_HDF5_HL_CONDITIONAL_FALSE@HDF5_HL_DIR =
@BUILD_HDF5_HL_CONDITIONAL_TRUE@HDF5_HL_DIR = hl
SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
- $(HDF5_HL_DIR) perform
+ $(HDF5_HL_DIR)
-DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
+DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples
# Some files generated during configure that should be cleaned
DISTCLEANFILES = config/stamp1 config/stamp2
@@ -872,7 +872,7 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-recursive
-all-am: Makefile all-local
+all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
install-exec: install-exec-recursive
@@ -932,7 +932,7 @@ install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am: install-exec-local
+install-exec-am:
install-html: install-html-recursive
@@ -973,11 +973,11 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-local
+uninstall-am:
.MAKE: $(am__recursive_targets) install-am install-strip
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--refresh check check-am clean clean-cscope clean-generic \
clean-libtool cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
@@ -985,14 +985,14 @@ uninstall-am: uninstall-local
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-exec-local \
- install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installcheck-local installdirs installdirs-am maintainer-clean \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installcheck-local \
+ installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
- tags-am uninstall uninstall-am uninstall-local
+ tags-am uninstall uninstall-am
# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
@@ -1017,25 +1017,25 @@ lib progs check-p check-s:
fi; \
done
-# Make all, tests, and (un)install also recurse into perform directory
-all-local:
- @cd perform && $(MAKE) $(AM_MAKEFLAGS) all
-
+# Make all, tests, and (un)install also recurse into directory
+#delall-local:
+#del @cd perform && $(MAKE) $(AM_MAKEFLAGS) all
+#del
tests:
- @@SETX@; for d in $(SUBDIRS) perform; do \
+ @@SETX@; for d in $(SUBDIRS); do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
- done
-
-install-exec-local:
- @cd perform && $(MAKE) $(AM_MAKEFLAGS) install
-uninstall-local:
- @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
+ done
+#delinstall-exec-local:
+#del @cd perform && $(MAKE) $(AM_MAKEFLAGS) install
+#deluninstall-local:
+#del @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
+#del
# Check-clean also recurses into examples directory
check-clean:
- @@SETX@; for d in $(SUBDIRS) examples perform; do \
+ @@SETX@; for d in $(SUBDIRS) examples; do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
@@ -1125,7 +1125,7 @@ check-vfd:
$(top_builddir)/config.status:
# Don't include conclude.am in root Makefile; tests target needs to
-# recurse into perform directory as well as reguar subdirs.
+# recurse into reguar subdirs.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/configure b/configure
index d0909c7..a309ff3 100755
--- a/configure
+++ b/configure
@@ -33272,7 +33272,7 @@ else
fi
-ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testcheck_version.sh test/testerror.sh test/H5srcdir_str.h test/testlibinfo.sh test/testlinks_env.sh test/test_plugin.sh testpar/Makefile perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumppbits.sh tools/h5dump/testh5dumpxml.sh tools/h5ls/testh5ls.sh tools/h5import/Makefile tools/h5import/h5importtestutil.sh tools/h5diff/Makefile tools/h5diff/testh5diff.sh tools/h5diff/testph5diff.sh tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5repack/h5repack_plugin.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/h5copy/testh5copy.sh tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5mkgrp.sh tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile examples/Makefile examples/run-c-ex.sh examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/test/H5srcdir_str.h c++/examples/Makefile c++/examples/run-c++-ex.sh c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/run-fortran-ex.sh fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/test/H5srcdir_str.h hl/tools/Makefile hl/tools/gif2h5/Makefile hl/tools/gif2h5/h52giftest.sh hl/examples/Makefile hl/examples/run-hlc-ex.sh hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/c++/examples/run-hlc++-ex.sh hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile hl/fortran/examples/run-hlfortran-ex.sh"
+ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testcheck_version.sh test/testerror.sh test/H5srcdir_str.h test/testlibinfo.sh test/testlinks_env.sh test/test_plugin.sh testpar/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumppbits.sh tools/h5dump/testh5dumpxml.sh tools/h5ls/testh5ls.sh tools/h5import/Makefile tools/h5import/h5importtestutil.sh tools/h5diff/Makefile tools/h5diff/testh5diff.sh tools/h5diff/testph5diff.sh tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5repack/h5repack_plugin.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/h5copy/testh5copy.sh tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5mkgrp.sh tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile tools/perform/Makefile examples/Makefile examples/run-c-ex.sh examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/test/H5srcdir_str.h c++/examples/Makefile c++/examples/run-c++-ex.sh c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/run-fortran-ex.sh fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/test/H5srcdir_str.h hl/tools/Makefile hl/tools/gif2h5/Makefile hl/tools/gif2h5/h52giftest.sh hl/examples/Makefile hl/examples/run-hlc-ex.sh hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/c++/examples/run-hlc++-ex.sh hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile hl/fortran/examples/run-hlfortran-ex.sh"
cat >confcache <<\_ACEOF
@@ -34552,7 +34552,6 @@ do
"test/testlinks_env.sh") CONFIG_FILES="$CONFIG_FILES test/testlinks_env.sh" ;;
"test/test_plugin.sh") CONFIG_FILES="$CONFIG_FILES test/test_plugin.sh" ;;
"testpar/Makefile") CONFIG_FILES="$CONFIG_FILES testpar/Makefile" ;;
- "perform/Makefile") CONFIG_FILES="$CONFIG_FILES perform/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"tools/h5dump/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5dump/Makefile" ;;
"tools/h5dump/testh5dump.sh") CONFIG_FILES="$CONFIG_FILES tools/h5dump/testh5dump.sh" ;;
@@ -34579,6 +34578,7 @@ do
"tools/misc/testh5repart.sh") CONFIG_FILES="$CONFIG_FILES tools/misc/testh5repart.sh" ;;
"tools/h5stat/testh5stat.sh") CONFIG_FILES="$CONFIG_FILES tools/h5stat/testh5stat.sh" ;;
"tools/h5stat/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5stat/Makefile" ;;
+ "tools/perform/Makefile") CONFIG_FILES="$CONFIG_FILES tools/perform/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"examples/run-c-ex.sh") CONFIG_FILES="$CONFIG_FILES examples/run-c-ex.sh" ;;
"examples/testh5cc.sh") CONFIG_FILES="$CONFIG_FILES examples/testh5cc.sh" ;;
diff --git a/configure.ac b/configure.ac
index 2d9ed08..d988751 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4484,7 +4484,6 @@ AC_CONFIG_FILES([src/libhdf5.settings
test/testlinks_env.sh
test/test_plugin.sh
testpar/Makefile
- perform/Makefile
tools/Makefile
tools/h5dump/Makefile
tools/h5dump/testh5dump.sh
@@ -4511,6 +4510,7 @@ AC_CONFIG_FILES([src/libhdf5.settings
tools/misc/testh5repart.sh
tools/h5stat/testh5stat.sh
tools/h5stat/Makefile
+ tools/perform/Makefile
examples/Makefile
examples/run-c-ex.sh
examples/testh5cc.sh
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index a9a8c49..2365326 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -44,3 +44,6 @@ add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5stat)
#-- Add the h5dump and test executables
add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5dump)
+
+#-- Add the perform and test executables
+add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/perform)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 76b32d2..095cc30 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,6 +24,7 @@ include $(top_srcdir)/config/commence.am
CONFIG=ordered
# All subdirectories
-SUBDIRS=lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat
+SUBDIRS=lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat \
+ perform
include $(top_srcdir)/config/conclude.am
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 0b0e2d0..c4bf941 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -667,7 +667,9 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
CONFIG = ordered
# All subdirectories
-SUBDIRS = lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat
+SUBDIRS = lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat \
+ perform
+
# Automake needs to be taught how to build lib, progs, and tests targets.
# These will be filled in automatically for the most part (e.g.,
diff --git a/perform/CMakeLists.txt b/tools/perform/CMakeLists.txt
index 6887c60..6887c60 100644
--- a/perform/CMakeLists.txt
+++ b/tools/perform/CMakeLists.txt
diff --git a/perform/CMakeTests.cmake b/tools/perform/CMakeTests.cmake
index 74055d5..74055d5 100644
--- a/perform/CMakeTests.cmake
+++ b/tools/perform/CMakeTests.cmake
diff --git a/perform/COPYING b/tools/perform/COPYING
index 6903daf..6903daf 100644
--- a/perform/COPYING
+++ b/tools/perform/COPYING
diff --git a/perform/Makefile.am b/tools/perform/Makefile.am
index 59c598a..59c598a 100644
--- a/perform/Makefile.am
+++ b/tools/perform/Makefile.am
diff --git a/perform/Makefile.in b/tools/perform/Makefile.in
index 8db63de..1244e27 100644
--- a/perform/Makefile.in
+++ b/tools/perform/Makefile.in
@@ -109,7 +109,7 @@ check_PROGRAMS = iopipe$(EXEEXT) chunk$(EXEEXT) overhead$(EXEEXT) \
zip_perf$(EXEEXT) perf_meta$(EXEEXT) $(am__EXEEXT_2) \
perf$(EXEEXT)
TESTS = $(am__EXEEXT_3)
-subdir = perform
+subdir = tools/perform
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -772,9 +772,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign perform/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/perform/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign perform/Makefile
+ $(AUTOMAKE) --foreign tools/perform/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/perform/benchpar.c b/tools/perform/benchpar.c
index b75006a..b75006a 100644
--- a/perform/benchpar.c
+++ b/tools/perform/benchpar.c
diff --git a/perform/build_h5perf_alone.sh b/tools/perform/build_h5perf_alone.sh
index b65e863..b65e863 100755
--- a/perform/build_h5perf_alone.sh
+++ b/tools/perform/build_h5perf_alone.sh
diff --git a/perform/build_h5perf_serial_alone.sh b/tools/perform/build_h5perf_serial_alone.sh
index 2566609..2566609 100755
--- a/perform/build_h5perf_serial_alone.sh
+++ b/tools/perform/build_h5perf_serial_alone.sh
diff --git a/perform/chunk.c b/tools/perform/chunk.c
index a3c11c1..a3c11c1 100644
--- a/perform/chunk.c
+++ b/tools/perform/chunk.c
diff --git a/perform/gen_report.pl b/tools/perform/gen_report.pl
index 285f5d7..285f5d7 100755
--- a/perform/gen_report.pl
+++ b/tools/perform/gen_report.pl
diff --git a/perform/iopipe.c b/tools/perform/iopipe.c
index 85063fa..85063fa 100644
--- a/perform/iopipe.c
+++ b/tools/perform/iopipe.c
diff --git a/perform/overhead.c b/tools/perform/overhead.c
index 9341e64..9341e64 100644
--- a/perform/overhead.c
+++ b/tools/perform/overhead.c
diff --git a/perform/perf.c b/tools/perform/perf.c
index 7d329f0..7d329f0 100644
--- a/perform/perf.c
+++ b/tools/perform/perf.c
diff --git a/perform/perf_meta.c b/tools/perform/perf_meta.c
index b52871e..b52871e 100644
--- a/perform/perf_meta.c
+++ b/tools/perform/perf_meta.c
diff --git a/perform/pio_engine.c b/tools/perform/pio_engine.c
index 3535fb4..3535fb4 100644
--- a/perform/pio_engine.c
+++ b/tools/perform/pio_engine.c
diff --git a/perform/pio_perf.c b/tools/perform/pio_perf.c
index cf41cbe..cf41cbe 100644
--- a/perform/pio_perf.c
+++ b/tools/perform/pio_perf.c
diff --git a/perform/pio_perf.h b/tools/perform/pio_perf.h
index 3295e2b..3295e2b 100644
--- a/perform/pio_perf.h
+++ b/tools/perform/pio_perf.h
diff --git a/perform/pio_standalone.c b/tools/perform/pio_standalone.c
index e404274..e404274 100644
--- a/perform/pio_standalone.c
+++ b/tools/perform/pio_standalone.c
diff --git a/perform/pio_standalone.h b/tools/perform/pio_standalone.h
index 584a057..584a057 100644
--- a/perform/pio_standalone.h
+++ b/tools/perform/pio_standalone.h
diff --git a/perform/pio_timer.c b/tools/perform/pio_timer.c
index aba219e..aba219e 100644
--- a/perform/pio_timer.c
+++ b/tools/perform/pio_timer.c
diff --git a/perform/pio_timer.h b/tools/perform/pio_timer.h
index a5ee6d7..a5ee6d7 100644
--- a/perform/pio_timer.h
+++ b/tools/perform/pio_timer.h
diff --git a/perform/sio_engine.c b/tools/perform/sio_engine.c
index 07e6b16c..07e6b16c 100644
--- a/perform/sio_engine.c
+++ b/tools/perform/sio_engine.c
diff --git a/perform/sio_perf.c b/tools/perform/sio_perf.c
index 26cec6d..26cec6d 100644
--- a/perform/sio_perf.c
+++ b/tools/perform/sio_perf.c
diff --git a/perform/sio_perf.h b/tools/perform/sio_perf.h
index b40fed3..b40fed3 100644
--- a/perform/sio_perf.h
+++ b/tools/perform/sio_perf.h
diff --git a/perform/sio_standalone.c b/tools/perform/sio_standalone.c
index d92ed30..d92ed30 100644
--- a/perform/sio_standalone.c
+++ b/tools/perform/sio_standalone.c
diff --git a/perform/sio_standalone.h b/tools/perform/sio_standalone.h
index b2f8220..b2f8220 100644
--- a/perform/sio_standalone.h
+++ b/tools/perform/sio_standalone.h
diff --git a/perform/sio_timer.c b/tools/perform/sio_timer.c
index 4e42ee6..4e42ee6 100644
--- a/perform/sio_timer.c
+++ b/tools/perform/sio_timer.c
diff --git a/perform/sio_timer.h b/tools/perform/sio_timer.h
index 46702c3..46702c3 100644
--- a/perform/sio_timer.h
+++ b/tools/perform/sio_timer.h
diff --git a/perform/zip_perf.c b/tools/perform/zip_perf.c
index edd5b0f..edd5b0f 100644
--- a/perform/zip_perf.c
+++ b/tools/perform/zip_perf.c