Commit Graph

382 Commits

Author SHA1 Message Date
Allen Byrne
8194f34ef7 [svn-r24072] Merge trunk cmake changes to 1.8 branch.
Also add default switch blocks to h5import.
Merge h5dump any_path option from trunk.

Tested: local linux
2013-08-26 10:35:15 -05:00
Jonathan Kim
d283a83a49 [svn-r24039] Purpose:
Warning fixes (Jonathan and Peter) from coverity fix.
  merge from r23986 trunk.

Tested: 
    jam-pp (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE)
2013-08-20 16:52:41 -05:00
Quincey Koziol
6e58f671ec [svn-r24021] Description:
Bring r24020 from trunk to 1.8 branch:

    Clean up compiler warnings

Tested on:
    Mac OSX/64 10.8.4 (amazon) w/C++ & FORTRAN
    (too minor to require h5committest)
2013-08-17 19:31:01 -05:00
Allen Byrne
528e0d1cac [svn-r23869] HDFFV-8302: replace (v)snprintf with _(v)snprintf for windows. Merge from trunk along with other windows functions and HD prefix corrections.
HDFFV-8394: Add cmake code to package examples

Tested: local linux
2013-07-08 10:52:49 -05:00
Mohamad Chaarawi
38bdc241ed [svn-r23868] bring r 23862 from trunk:
Change printfs in perform output and h5dump to prevent overflow.
This fixes: https://jira.hdfgroup.uiuc.edu/browse/HDFFV-8450
2013-07-08 09:04:23 -05:00
Mohamad Chaarawi
5ee14b07b9 [svn-r23809] revert printf format changes to do a better solution. 2013-06-24 13:16:27 -05:00
Mohamad Chaarawi
afea64705b [svn-r23808] merge 23801 from trunk.
Change printfs in perform output for long long to use %lld instead of %Hd. The later is for shorts.
This fixes: https://jira.hdfgroup.uiuc.edu/browse/HDFFV-8450

Tested on Jam.
2013-06-24 08:51:40 -05:00
Allen Byrne
e41f1a44b8 [svn-r23771] HDFFV-8434,-8437,-8445,-8447,-8461: Merge changes from Trunk.
Tested: local linux
2013-06-14 09:24:27 -05:00
HDF Tester
ab5a49b8bd [svn-r23324] Snapshot version 1.8 release 11 (snap11) 2013-03-03 21:47:16 -05:00
Allen Byrne
13693b307c [svn-r23211] Merge trunk CMake changes for minimum cmake version of 2.8.10. This was prompted by HDFFV-8227, OS X requires latest version of cmake for proper support.
Tested: local linux
2013-01-31 12:30:34 -05:00
Albert Cheng
fe63b32f86 [svn-r22850] Bug fix: HDFFV-8156
benchpar.c is compiled when configure --enable-build-all --enable-paralllel.
But it failed to compile.  It is decided to retire or move it to example.
I removed it from the PARA_BUILD_ALL list so that --enable-build-all will
not fail.  The program file still need to be moved.

Tested: Koala using --enable-build-all --enable-parallel.
2012-10-01 19:05:33 -05:00
Albert Cheng
c0787b5614 [svn-r22801] Updated for the removal of mpi-perf.c.
Copied from the trunk version.

Tested: Don't know how to test. assume if it works for trunk, it will
work for v18.
2012-09-22 15:09:37 -05:00
Albert Cheng
f3c3aa2440 [svn-r22796] HDFFV-8110: Removed mpi-perf.c which was given with permission to freely
distribute by the author. It was an example program showing how to measure
parallel IO speed. Since then, we have created h5perf to do I/O performanace
measurement. This example is not needed any more.

mpi-perf.c:
    Removed.
Makefile.am:
Makefile.in:
    Removed the entry of mpi-perf.c so that "configure --enable-build-all ..."
    will not build it.
MANIFEST:
    Updated.

The change is trivial that I got permission to skip the code review step.

Tested: h5committest plus "--enable-parallel --enable-build-all" in koala.
2012-09-21 17:05:56 -05:00
Allen Byrne
3117ffcbb4 [svn-r22788] HDFFV-8153: Pull POSIX_C_SOURCE define out to separate variable. Use ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS}) in non-fortran CMakeLists.txt folders
Tested: local
2012-09-19 09:32:13 -05:00
Allen Byrne
612af6440b [svn-r22724] Convert tests to *.sh.in.
Convert configure.in to configure.ac.
Align TESTS usage with autotools convention.
Update all references from configure.in to configure.ac

Tested: h5committest
2012-08-28 14:11:34 -05:00
Larry Knox
073ba00980 [svn-r22711] Updated autotools: autoconf 2.69, automake 1.12.3, m4 1.4.16, libtool 2.4.2
Tested THG machines.
2012-08-23 12:05:07 -05:00
Allen Byrne
d857219181 [svn-r22451] Brought cmake configuration / configure changes from Trunk.
Tested jam, local linux
2012-06-11 11:12:49 -05:00
Dana Robinson
35a903680e [svn-r22148] Removed incorrect executable svn properties from text, source, in, and HDF5 files. 2012-03-26 15:12:51 -05:00
Allen Byrne
68d93b7f4e [svn-r22013] HDFFV-7560:
Merge 1.8 and h5dump/tools and tests based on tools library from trunk.
Reduced warnings.

HDFFV-7949:
Remove duplicated functions in h5ls

Tested: local linux,h5committest
2012-03-02 09:21:13 -05:00
Allen Byrne
6158a3128c [svn-r21805] Update CMake Required version in all folders to match current standard 2.8.6 2011-12-05 11:32:07 -05:00
Allen Byrne
141383fb26 [svn-r21717] Update cmake configuration
Update cmake to generate source folders in VS
Brought parallel changes from trunk

Tested: local linux
2011-11-04 13:45:41 -05:00
Allen Byrne
3fa119253b [svn-r21513] Add HDprefix and change when pio_timer.h is included
Tested
2011-10-11 08:49:40 -05:00
Scot Breitenfeld
4af3cd2b7a [svn-r21421] Merged the Fortran 2003 changes from the trunk into the 1.8 branch, used:
svn merge -r 20506:21414 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Tested: jam (gnu, intel, pgi compilers)

Also merged effected non-Fortran files: 
svn merge -r21247:r21248 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/src/libhdf5.settings.in
2011-09-27 00:02:38 -05:00
Allen Byrne
9115bab9e3 [svn-r21376] JIRA-HDFFV-2748: Relplace WIN32 macros in source. New H5_HAVE_WIN32_API and H5_HAVE_VISUAL_STUDIO defines only need to be set on windows. Autotools configure is not affected.
Trunk passed for a week and cmake branch has been in place > 3 weeks.

Tested: local linux
2011-09-12 09:02:44 -05:00
Allen Byrne
144b129492 [svn-r21365] Related files to files from HDF5-33 review - all changes ran correctly in trunk. Changes have been tested in cmake branch.
#ifdef around include <unistd.h> and <time.h>

Tested: local linux
2011-09-06 09:25:19 -05:00
Allen Byrne
b3bc8132c5 [svn-r21363] files from HDF5-33 review - all changes ran correctly in trunk. Changes have been tested in cmake branch.
Tested: local linux
2011-09-06 09:16:50 -05:00
Allen Byrne
40480c8a72 [svn-r21336] Synchronize cmake files with tested commits from trunk 2011-08-30 11:39:25 -05:00
Mike McGreevy
d93ae26226 [svn-r21044] Purpose:
Fix HDFFV-7592

    "Remove PACKEDBITS option from autotools files"

Description:
    The code for h5dump's packed bits feature was
    conditionally compiled in via this option during its
    'beta' release in 1.8.5. Now that the feature is fully
    supported, h5dump has since been changed to always
    compile the packed bits code (having removed the #ifdef
    H5_HAVE_H5DUMP_PACKED_BITS checks), so this option in
    configure is no longer needed.

    This commit removes the --enable-h5dump-packed-bits
    configure option, including the help summary from
    './configure --help' and the libhdf5.settings output
    summary, the PACKED_BITS Makefile variable, and the
    definition of H5_HAVE_H5DUMP_PACKED_BITS define in
    appropriate pubconf header files (which has already
    been removed from use in source code as of r20722).

    Note that this option was never added to the trunk,
    thus this commit only need occur on the 1.8 branch.

Tested:
    - Configure output, help, & summary verified on jam
    - h5committested
2011-06-28 16:25:10 -05:00
Quincey Koziol
a01f323d4c [svn-r20893] Description:
Bring r20885 from trunk to 1.8 branch:

r20340:
Address coverity issue 248.  Set freed pointer to NULL if realloc fails, then check for NULL before attempting to close array of handles stored in memory addressed by pointer.

r20341:
Added initialization udata.path = NULL; udata.visited = NULL; to prevent unintialized use after done: label.

Do C-style initialization AFTER all variable definitions.

r20342:
Fix valgrind error in H5DUMP-XML-tall.h5

r20343:
Addressed Coverity issue 591 - check the return value of H5S_SELECT_ITER_RELEASE.

r20344:
Added initialization udata.path = NULL; to prevent uninitialized used after done: label

r20347:
Purpose: Fix memory leak in overhead.c

Description: Fixed leak in test() in overhead.c where array "had" was never
freed.


r20348:
Addressed Coverity issue 705 - added prototype for resize_configs_are_equal to cache_common.h.

r20392:
Purpose: Fix coverity issues 1677 and 1678

Description: Added return value checking for 4 funciton calls in
H5tools_get_symlink_info().

r20394:
Purpose: Fix coverity issues 1674 and 1675

Description: Modified H5Epush2() and H5E_printf_stack() to keep track of whether
va_start() has been called, and to call va_end() at the end if so.

r20395:
Should be H5MM_calloc(count * sizeof(void*)). Fixed --gh 

r20396:
Should be H5MM_calloc(count * sizeof(void*)). Fixed. --gh

Tested on:
    Mac OSX/32 10.6.7 (amazon) w/debug & production
    (h5committested on branch)
2011-05-23 12:43:37 -05:00
Allen Byrne
bb611704bf [svn-r20674] Eliminate memory buffer errors,
overhead - add free to successful path.
  zip_perf - filename handling needed inits to NULL and free
  
Tested: local linux
2011-04-28 17:10:55 -05:00
Jonathan Kim
7f8e7f724c [svn-r20671] Fixed file name handling with char pointer incorrectly causing crash.
(Reviewed by ADB)
2011-04-28 15:44:47 -05:00
Mike McGreevy
699098014b [svn-r20525] Description:
Merge revisions 20475, 20502, and 20504 from trunk to 1.8 branch.

Tested:

    Tested on jam, fred, bangan (CYGWIN), and h5committested.
2011-04-15 15:41:32 -05:00
Allen Byrne
16e46eecd8 [svn-r20336] Remove unused windows defines. Add _CONSOLE to windows definitions. 2011-03-25 13:35:26 -05:00
Allen Byrne
e18e2fc404 [svn-r20314] Changed winsock.h guard to sync with trunk
Tested: windows
2011-03-24 12:26:42 -05:00
Allen Byrne
0417fd2bd7 [svn-r20313] Change incorrect use of "struct stat" to use "h5_stat_t".
Also removed includes from top of file - they are included with proper config checks in h5private.h.
Changed name of Windows only gettimeofday function to avoid a define loop according to VS2008

Tested: local linux, windows
2011-03-24 12:22:13 -05:00
Allen Byrne
7eb98436fc [svn-r20157] Bring CMake changes to branch up to r20156 from trunk 2011-02-25 09:33:50 -05:00
Quincey Koziol
fe7e78f2d9 [svn-r20049] Description:
Bring r20048 from trunk to 1.8 branch:

    Bring Coverity changes back to trunk:

r19733:
Fix memory leak in h5perf_serial.  Global buffer "buffer2" was allocated at the
beginning of do_sio() but never freed.  Added call to free() at end of do_sio().

r19734:
Fix memory leak in iopipe.  Buffer "the_data" was allocated at the beginning of
main() but never freed.  Added call to free() at end of main().


Tested on:
  Coverity branch in daily tests & Mac
2011-02-04 22:00:49 -05:00
Albert Cheng
20dd18e059 [svn-r20020] Bug 2019: h5perf or h5perf_serial is removed twice. Some systems like AIX do
not like it as it may get into a racing condition when "gmake -j N" is used--
two "rm" commands were trying to remove the same file.

Solution:
Rearranged the Makefile.am so that h5perf or h5perf_serial are built only
once, that is through bin_PROGRAMS only.

Bug 2135: h5perf_serial is not installed in --enable-parallel build.
It was because in parallel build, h5perf_serial is not was not in the 
bin_PROGRAMS list but it was still being built and tested.

Solution:
Rearranged the Makefile.am code so that h5perf_serial is installed too.
(It is easier to make cleaner code to install it than to build and test
h5perf_serial but not test it.)

Tested: Jam, both serial and parallel.
Did not run h5committest because the changes are in perform/ directory only
and I think Jam has given the changes in Makefile a complete test already.
2011-01-28 18:58:19 -05:00
Allen Byrne
3771df0757 [svn-r19906] Windows: Correct how fortran links in CRT library. Also correct macro use for checking libtype.
Tested: Windows
2011-01-04 13:23:24 -05:00
Allen Byrne
8a7bf1ae4e [svn-r19898] Remove use of /MT compile flag for building static libs and programs. Added BUILT_AS_STATIC_LIBRARY define to set the windows import/export defines correctly for static libraries. 2010-12-30 09:03:15 -05:00
Allen Byrne
3a581adac6 [svn-r19883] Corrected time_of_day define configuration, found during parallel CMake build.
Tested: local linux, fix confirmed by user
2010-12-13 08:27:47 -05:00
Larry Knox
e48acc4119 [svn-r19862] Updated libtool to version 2.4, autoconf to version 2.68, and m4 to version 1.4.15.
Tested with h5committest on amani, jam and heiwa.
2010-12-01 10:12:06 -05:00
Albert Cheng
10c3eb0a9f [svn-r19797] Bug 2091: remove all Metraowerks compiler code bracheted by __MWERKS__.
Metraowerks compiler is no more. Make the code cleaner.

Tested: H5committest plus jam serial.
2010-11-16 19:33:48 -05:00
Allen Byrne
3b2af9e08f [svn-r19688] Spelling mistake in TARGET_WIN_PROPERTIES broke cmake configuration 2010-10-28 09:41:57 -05:00
Allen Byrne
c18db616e5 [svn-r19528] Add clear generated objects commands to test blocks.
Add configurefile command to copy CTestCustom to build folder.

Bring r19527 back from trunk

Tested: local linux
2010-10-06 15:51:02 -05:00
Larry Knox
696675029e [svn-r19408] In this revision the '/' after ${DESTDIR} wherever it occurs
has been removed. According to the official description of DESTDIR by Gnu at
http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is
prepended to the normal and complete install path that it precedes for the
purpose of installing in a temporary directory which is useful for building
rpms and other packages.  The '/' after ${DESTDIR} will be followed by another
'/' at the beginning of the normal install path.  When DESTDIR is empty the
path then begins with '//', which is incorrect and causes problems at least for
Cygwin.

The change made in config/commence.am affects many Makefile.*s when bin/reconfigure
is run.  EXAMPLEDIRs had to be corrected individually.

Also the scripts to run examples after they are installed have checks added to see 
that the fortran and c++ directories are present before trying to run the scripts 
in them.

Tested with h5committest on amani, heiwa and jam.
2010-09-16 17:12:07 -05:00
Larry Knox
23bc2c0b38 [svn-r19371] Updated autoconf to version 2.6.7, libtool to version 2.2.10, and m4 to version 1.4.14. Also added m4 directory for m4 macros according to autoconf suggestion.
Tested with h5committest on amani, jam, and heiwa, and on linew.

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

M    hdf5_1_8/test/Makefile.in
A    hdf5_1_8/m4
AM   hdf5_1_8/m4/ltsugar.m4
AM   hdf5_1_8/m4/libtool.m4
AM   hdf5_1_8/m4/ltversion.m4
AM   hdf5_1_8/m4/lt~obsolete.m4
AM   hdf5_1_8/m4/ltoptions.m4
M    hdf5_1_8/configure
M    hdf5_1_8/Makefile.in
M    hdf5_1_8/testpar/Makefile.in
M    hdf5_1_8/configure.in
M    hdf5_1_8/src/Makefile.in
M    hdf5_1_8/tools/Makefile.in
M    hdf5_1_8/tools/misc/Makefile.in
M    hdf5_1_8/tools/h5dump/Makefile.in
M    hdf5_1_8/tools/h5repack/Makefile.in
M    hdf5_1_8/tools/h5jam/Makefile.in
M    hdf5_1_8/tools/h5diff/Makefile.in
M    hdf5_1_8/tools/lib/Makefile.in
M    hdf5_1_8/tools/h5copy/Makefile.in
M    hdf5_1_8/tools/h5import/Makefile.in
M    hdf5_1_8/tools/h5stat/Makefile.in
M    hdf5_1_8/tools/h5ls/Makefile.in
M    hdf5_1_8/hl/test/Makefile.in
M    hdf5_1_8/hl/tools/Makefile.in
M    hdf5_1_8/hl/tools/gif2h5/Makefile.in
M    hdf5_1_8/hl/Makefile.in
M    hdf5_1_8/hl/src/Makefile.in
M    hdf5_1_8/hl/c++/test/Makefile.in
M    hdf5_1_8/hl/c++/Makefile.in
M    hdf5_1_8/hl/c++/src/Makefile.in
M    hdf5_1_8/hl/c++/examples/Makefile.in
M    hdf5_1_8/hl/fortran/test/Makefile.in
M    hdf5_1_8/hl/fortran/Makefile.in
M    hdf5_1_8/hl/fortran/src/Makefile.in
M    hdf5_1_8/hl/fortran/examples/Makefile.in
M    hdf5_1_8/hl/examples/Makefile.in
M    hdf5_1_8/config/commence.am
M    hdf5_1_8/MANIFEST
M    hdf5_1_8/c++/test/Makefile.in
M    hdf5_1_8/c++/Makefile.in
M    hdf5_1_8/c++/src/Makefile.in
M    hdf5_1_8/c++/examples/Makefile.in
M    hdf5_1_8/bin/ltmain.sh
M    hdf5_1_8/bin/reconfigure
M    hdf5_1_8/perform/Makefile.in
M    hdf5_1_8/fortran/test/Makefile.in
M    hdf5_1_8/fortran/testpar/Makefile.in
M    hdf5_1_8/fortran/Makefile.in
M    hdf5_1_8/fortran/src/Makefile.in
M    hdf5_1_8/fortran/examples/Makefile.in
M    hdf5_1_8/aclocal.m4
M    hdf5_1_8/examples/Makefile.in
2010-09-10 17:41:44 -05:00
Allen Byrne
ff47a7df1b [svn-r19362] Move Windows specific compile and link flags to macros 2010-09-09 11:31:46 -05:00
Allen Byrne
c9cf76d5f9 [svn-r19326] Added parallel build commands.
Corrected use/name of source folder aliases.
Duplicated FindMPI.cmake so that non-c++ compiler is found first (recommemded commands did not work).
Bring r19325 from trunk

Tested: local linux with mpich
2010-08-31 15:20:12 -05:00
Albert Cheng
ac240e1ed4 [svn-r19216] Bug 1986, error1.
It is an error to use the condition H5_HAVE_FSEEK64 to control the definition
of HDlseek. It caused errors in AIX where lseek64 is available.

Replaced it with H5_HAVE_LSEEK64. Also added the missing HDstrcasecmp macro.

Tested: AIX using default and --disable-largefile.
2010-08-10 11:41:45 -05:00