Commit Graph

616 Commits

Author SHA1 Message Date
Mohamad Chaarawi
644b9071c0 [svn-r27112] merge 27111 from trunk:
move undef of __attribute__ back to private and remove its usage from public routines.
2015-05-26 09:35:09 -05:00
Larry Knox
083ef61b05 [svn-r26728] Merge trunk reviwions 26669 and 26670.
Removed from configure.ac VPATH section, LONE_COLON check and checks for redundant addition of /usr/include and /usr/lib to compile flags, with reconfigure.

Tested h5committest
2015-04-04 10:27:14 -05:00
Mohamad Chaarawi
523a4f7658 [svn-r26717] Merge revisions 26387, 26649, 26650, 26678, and 26691 from trunk to squish warnings. 2015-04-03 12:40:11 -05:00
Allen Byrne
025d90f573 [svn-r26697] HDFFV-9131: Remove obsolete/unneeded sections. 2015-04-01 15:27:26 -05:00
Allen Byrne
c923afdf50 [svn-r26654] Bring trunk CMake changes to branch.
Tested: local linux
2015-03-30 12:32:55 -05:00
Quincey Koziol
6a664ffa5a [svn-r26648] Description:
Bring r26635 from trunk to 1.8 branch:

    Bring r26651 from autotools_rework branch to trunk:

    Remove the VSNPRINTF_WORKS macro, it's working around bugs in old SGI
& HP compilers.

Tested on:
    Linux/32 2.6.18 (jam) w/serial & parallel
    (Daily tested on trunk for 2+ days)
2015-03-30 09:47:36 -05:00
Allen Byrne
7ebd4c8311 [svn-r26600] Fix CMake target calls to add new parameter 2015-03-26 08:51:01 -05:00
Jerome Soumagne
2bb934857b [svn-r26582] Merge r26509 from trunk
Run reconfigure after merges from autotools_rework branch
2015-03-25 13:07:02 -05:00
Dana Robinson
ab19d0636a [svn-r26398] Merges r26333 from trunk
Eliminates gcc warnings due to -Wunsuffixed-float-constants.

- Adds 'F' suffixes for most float constants.

- A few constants MUST be of type double. These now receive the long
  double L suffix and are then cast to double. I do this via a new
  H5_DOUBLE() macro which was added to H5private.h.

- Additionally, some 1.8-specific float suffixes were added.

Fixes: HDFFV-9148

Tested on: h5committest
2015-03-09 06:27:46 -05:00
Dana Robinson
85beb272c5 [svn-r26395] Merges r26329 from trunk
Removed the configure option that allows selective disabling of individual
internal filters (fletcher32, shuffle, etc.).

This feature mucked up the code with a lot of #ifdefs, saved very little
space and was not scalable to a general scheme for library size reduction.
We've decided to remove the feature while we investigate a more general
scheme for decreasing the library size.

Fixes: HDFFV-9086

Tested on: h5committest
2015-03-08 23:24:02 -05:00
Allen Byrne
ece0ba0336 [svn-r26371] Update cmake mininum version
Update windows wix cpack process.
2015-03-05 11:48:32 -05:00
Scot Breitenfeld
add51325ef [svn-r26314] Brought autotools related changes from the trunk to the branch, r26188 r26280 2015-02-26 09:21:33 -05:00
Mohamad Chaarawi
90067b76ce [svn-r26304] bring 26303 from trunk:
remove files with .clog2 extension generated by MPE when doing make clean
2015-02-25 13:52:27 -05:00
Mohamad Chaarawi
62ec301df9 [svn-r26224] merge 26180 from trunk:
configure fixes for HDFFV-9068,9069,9096,9097,9135 from autotools_rework branch:

- Remove Infering parallel compilers (C and Fortran) from configure.ac
- Remove restriction to build shared with parallel
- Cleanup parallel sections in configure.ac
- remove large file support checks
- MPE fixes.
2015-02-18 17:01:17 -05:00
Allen Byrne
75085cc45e [svn-r26064] HDFFV-9018: Install PDB files to bin folder with dlls.
Tested: windows
2015-01-28 14:16:32 -05:00
Allen Byrne
1fd9429572 [svn-r25957] Added Perform and io_timer back into build.
Tested: local linux cmake
2015-01-05 17:10:09 -05:00
Albert Cheng
3305b13297 [svn-r25956] [Merge r25954 from trunk]
HDFFV-9046: reorganize hdf5/perform, step 2

Last changes had caused problems with Windows platform:
1. H5private.h in io_timer.h is not accessible in the distributed shared library of tools.
   Need to move it to io_timer.c.
2. debug_start_stop_time() would not be available outside of h5perf. Some favor of compiler
   does not like it.  Screened it out for now.
3. mere "extern" is not good enough for Windows shared library. Must mark them as DLL. Need to mark them as 
   "H5TOOLS_DLL".
4. STANDALONE mode is broken. Screened out the code for now.

Tested: h5committest.
2015-01-05 17:05:43 -05:00
Allen Byrne
3525935821 [svn-r25952] HDFFV-9054: disable io_timer in tools lib and perform sub-folder due to SHARED compile issues and other issues. 2015-01-05 11:22:02 -05:00
Albert Cheng
cac2c7324f [svn-r25948] [Merged r25946 from trunk]
Removed debug statments that use //.

Tested: env CFLAGS=-ansi buildhdf5 in jam and parallel platypus.
2015-01-04 00:33:26 -05:00
Albert Cheng
c57665bb4f [svn-r25947] [merged changes from trunk r25940]
HDFFV-9046: reorganize hdf5/perform, step 2
Move timing measurement routines used by h5perf and h5perf_serial to tools/lib
so that they can be used by other tools too.

tools/lib/io_timer.c
tools/lib/io_timer.h
tools/perform/io_timer.c
tools/perform/io_timer.h
    renamed perform/io_timer.[ch] to lib/io_timer.[ch]

tools/lib/Makefile.am
tools/lib/Makefile.in
tools/lib/CMakeLists.txt
tools/perform/Makefile.in
tools/perform/Makefile.am
tools/perform/CMakeLists.txt
MANIFEST
    updated due to the move.

Tested; h5committest and jam (serial)
2015-01-04 00:04:10 -05:00
Quincey Koziol
e8c162613b [svn-r25497] Description:
Merge changes that correspond to the 64-bit ID changes (without the actual
switch to 64-bit IDs) to the 1.8 release branch.  (Plus a few minor cleanups
and alignments with the trunk that aren't on the branch)

Tested on:
    Mac OSX/64 10.9.4 (amazon) w/C++ & FORTRAN
    (h5committested on branch already for a week)
2014-07-30 15:56:40 -05:00
Mohamad Chaarawi
2700d20859 [svn-r25402] Bring 25397/8 from trunk:
- remove configure checks for MPI_File_get_size and Big MPI_File_set_size as they are supported by MPIO implementations today.
- fix bug in t_mpi.c (HDFFV-8856)

tested with h5committest.
2014-07-10 09:36:34 -05:00
Quincey Koziol
b0fe30721b [svn-r25225] Description:
Bring r25215 from trunk to 1.8 branch:

    Bring changes from Coverity branch back to trunk:

    r20914:
        Use HDstrncpy and HDstrncat! --gh

    r20915:
        Use HDstrncpy and HDstrncat! --gh

Tested on:
    MacOSX/64 10.9.3 (amazon) w/gcc 4.9, FORTRAN, C++, multi-threads & parallel
    (h5committested on the trunk)
2014-05-29 16:26:28 -05:00
Allen Byrne
5278b9737d [svn-r25222] Merge cmake_ext_mod into 1.8 2014-05-27 12:46:30 -05:00
Quincey Koziol
a9d99b0539 [svn-r25198] Description:
Bring r25197 from trunk to 1.8 branch:

    Bring changes from hdf5_1_8_coverity branch back to trunk:

r20878:
    Issue 76: Check if H5Tget_nmembers(type) fails and simply return(FALSE). Also move printf to after check.

r20880:
    Issue 192: Create ret_val var set to -1. Add out label for failures to jump to, return ret_val at bottom.

r20882:
    Fixes for coverity:
    1) bug #1679: remove dead code in test/mf.c
    2) bug #1680: remove dead code in tools/lib/h5diff_dset.c

r20883:
    Fix coverity issue 585

    Description:
    Changed variable "c" in processStrData in h5import.c to an int, to match fgetc
    return value, and removed call to feof, instead checking if c == EOF.

Tested on:
    MacOSX/64 10.9.3 (amazon) w/C++, FORTRAN & parallel
    (too minor to require h5committest)
2014-05-17 22:29:30 -05:00
Larry Knox
b018ba48ce [svn-r25106] Removed LT_ADD_LIBHDF5_DEPENDENCY configure conditional to roll back fix for removing rpaths from lib files. The fix also removed dependencies on libhdf5, etc. when the --disable-sharedlib-rpath configure option was invoked.
Added instead configure variable hardcode_into_lib=no.  This removes rpath from lib files on Linux and solaris machines.

Tested with h5committest on jam, koala, ostrich and platypus (cmake), and on emu and kite.
2014-04-25 14:34:54 -05:00
Albert Cheng
7031b03ac8 [svn-r25082] Bug HDFFV-8625, HDFFV-8639, HDFFV-8745:
h5diff issues "unable to read attribute" error message when comparing
    two files

Description:
    h5diff did not handle attributes of variable length strings
    correctly. It created the wrong memory type if one but not both
    compared attributes are of the variable strings type. It ended in
    H5Aread() failure.

Solution:
    We decided to treat the case when one type is variable length string
    and the other is not as incomparable. That bypassed the above error.
    We still need to figure out the proper way, if possible, to compare
    variable string with non-variable string types.

Tested: h5committested plus tested in Swallow (OS X 10.8).
2014-04-22 17:30:38 -05:00
Dana Robinson
8a52475245 [svn-r25014] Purpose:
Merge of r24937 from the trunk
    Adds H5free_memory to the API. This function should be used to free
    memory allocated by the library (e.g., returned values from
    H5Tget_tag, H5Pget_class_name, etc.).

    This is mainly to help Windows applications deal with multiple CRT 
    instances, but can also be helpful when a debug memory manager is
    being used or when the HDF5 API is being wrapped for managed languages
    like Python and Java.

Tested on:
    32-bit LE linux (jam) with fortran and C++
    64-bit BE linux (ostrich)
    64-bit LE linux (koala)
2014-04-11 09:48:31 -05:00
Albert Cheng
a9110fa0d1 [svn-r25000] Bugfix: HDFFV-8639
h5diff segfaults with user's files

Solution:
Added a variable to indicate if real data are in the buffer and will call H5Dvlen_reclaim()
only when real data are in the buffer.

Tested: with the user provided data files and no more segmentaion fault.
Also h5committ tested.
2014-04-09 06:41:28 -05:00
Allen Byrne
ab2d9f1e9c [svn-r24980] HDFFV-8290: Merge automake 1.14.1 changes from trunk
Tested: h5committest
2014-04-07 12:26:44 -05:00
Allen Byrne
d9020f2e35 [svn-r24906] Merge latest CMake changes from trunk.
Tested: local linux
2014-03-26 10:00:35 -05:00
Quincey Koziol
25147d5567 [svn-r24878] Description:
Bring r24864 from trunk to 1.8 branch:

    Remove all traces of MPI-POSIX VFD and GPFS detection/code.

    Remove remaining traces of stream VFD.

    Remove testpar/t_posix_compliant test (it's not actually verifying anything).

    Clean up H5D__mpio_opt_possible() further.

    Moved environment variable that disables MPI collective operations into
    MPI-IO VFD (instead of it being in src/H5S.c).

    A few other small code cleanups.

Tested on:
    Mac OSX/64 10.9.2 (amazon) w/parallel & serial
    (daily tested on trunk)
2014-03-24 12:41:18 -05:00
Quincey Koziol
f2aa62ec76 [svn-r24810] Description:
Bring r24803 & r24804 from trunk to 1.8 branch:

r24804:
   Brought changes from Coverity branch back to trunk, and cleaned up misc.
   other warnings & formatting issues:

   r20833:
   Fixed Coverity 667 and 668 with real integer overflow tests this time.

   r20834:
   Use HDstrncpy and HDstrncat. --gh 

   r20835:
   Change to use strncpy - use base_len + 1 for line 156, use HDstrlen(path) + 1 for line 159

   r20836:
   Fixed coverity 585 by casting output of fgetc() to a char.

   r20837:
   Changed sprintf calls to snprintf with size 1 less than the allocated buffer to address coverity issue #967.

r24803:
  Rename GCC_DIAG_OFF/ON macros to H5_GCC_DIAG_OFF/ON and move from
  src/H5private.h to src/H5public.h.  Wrap typedef of hsize_t and hssize_t
  in DIAG_OFF(long-long) macros.

  Clean up a bunch of "macro '-' is unused" warnings.

Tested on:
    Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & parallel
    (too minor to require h5committest)
2014-03-17 09:28:40 -05:00
Allen Byrne
e5759186e8 [svn-r24746] Merge trunk revision 24744 from cmake branch includes;
HDFFV-8505: UD filter changes to remove filters in h5repack.

Tested: local linux
2014-02-27 14:16:04 -05:00
Larry Knox
f4781c29da [svn-r24732] Fix for reconfigure, which fails because LT_ADD_LIBHDF5_DEPENDENCY is used in Makefiles but the declaration in configure.ac is missing.
Copied declaration from trunk.  Tested with h5committest on jam ostrich koala and platypus(cmake).
2014-02-22 13:22:26 -05:00
Quincey Koziol
86d6651b44 [svn-r24728] Description:
Bring r24726 & r24727 from trunk to 1.8 branch:

Description:
   Revert some earlier usage of strncpy, which was incorrect.

   Bring Coverity changes from branch back to trunk:

r20821:
   Use HDstrncpy. --gh
   (Fixed already, with strdup)

r20822:
   (Not merged, incorrect use of HDstrncpy())

r20823:
   (Not merged, incorrect use of HDstrncpy())

r20824:
   Maintenance: Bug fix: addressed CID 666.
   Value stored at *expression_len should be used in the call to
       HD5packFstring to avoid overflow (and unnecessary arithmetic
       calculation and casting) 

r20825:
   Issue 642: Added check for error and handler with print to stderr and exit.

r20826:
   Undo revision 20818, as that issue has already been fixed in the 1.8 branch
       and trunk (but not coverity branch)

r20827:
   (Not merged, incorrect use of HDstrncpy())

r20828:
   Use HDstrncpy. --gh
   (Corrected use of strncpy())

r20829:
   Check return of H5Lget_val(print_udata->fid, path, targbuf,
       linfo->u.val_size + 1, H5P_DEFAULT) and if error set trgbuf[0] to 0.
       Check if  H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL,
       &filename, &objname) was successful and allow print. Otherwise filename
       and objname are not created. (init those to NULL)

r20830:
   resolved coverity issues 939, 940, 941, 944, and 947.

   all were complaints about use of sprintf, and in all cases, the
   buffers used were large enough for all eventualities.

   Resolved issue by replacing calls to sprintf with calls
   to snprintf.

r20831:
   Maintenance: Addressed CID 852
   Replaced sprintf with snprintf

r20832:
   Purpose: Fix valgrind issues with hl/examples/ex_image2

   Description:
   Modified hl/examples/ex_image2 to free global "gbuf" before exit.

Tested on:
   Mac OSX/64 10.9.1 (amaon) w/C++, FORTRAN & Threadsafety
   (too minor to require h5committest)
2014-02-21 11:59:33 -05:00
Allen Byrne
551c147aa9 [svn-r24684] Add IF SHARED block around Windows PDB file generation command. 2014-02-04 10:29:04 -05:00
Quincey Koziol
acf41d8300 [svn-r24479] Description:
Fix ph5diff worker command handling so it can correctly respond to
situations where there's no work to perform.  Also, a few minor code cleanups.

Tested on:
    Mac OSX/64 10.9.0 (amazon) w/parallel
2013-11-30 13:05:10 -05:00
Allen Byrne
eccd41643b [svn-r24228] HDFFV-8529: Space separate define strings
Tested: local linux
2013-09-30 13:56:09 -05:00
Allen Byrne
deddc7f955 [svn-r24205] Merge HDFFV-8513/8522 from trunk (via cmake branch), h5repack UD plugins.
Also warning session fixes.

Tested: CMake local linux
2013-09-26 17:10:54 -05:00
Quincey Koziol
38e0563a6e [svn-r24112] Description:
Bring r24101 & 24111 from trunk to 1.8 branch:

r24101:
=======
Description:
    Clean up warnings, enable new compiler warning flag(s) and bring back
changes from Coverity branch:

    r20813:
        Remove the dead code as listed for coverity bug #1722. h5committested.

    r20814:
        Issue 69: Check return value and throw error if negative return. Also free datatype id on error

    r20815:
        Use HDstrncpy. --gh

    r20816:
        Replaced one last HDstrcat call with HDstrncat to resolve coverity issue 832.

    r20817:
        Use HDstrncpy and HDstrncat. --gh

    r20818:
        Purpose: Fix valgrind issues with h5jam

        Description:
        Modified h5jam to free strings strdup'd in parse_command_line before exit. Note
        that they may still not be freed in case of error, due to the widespread use of
        exit().

    r20819:
        Issue 80: change loop to use int as loop index.

    r20820:
        Maintenance: Fixed the bug found by coverity CID 788
        There were two problems with this function:
            1) it tried to unnecessary free NULL pointer
        2) it tried to allocate c_name buffer that is done by H5Pget_class_name

r24111:
=======
Description:
   Restrict GCC diagnostic pragmas to only gcc 4.6+


Tested on:
    Mac OSX 10.8.4 (amazon) w/gcc 4.8.1, C++ & FORTRAN
    (too minor to require h5committest)
2013-09-06 14:09:07 -05:00
Quincey Koziol
a33303139e [svn-r24032] Description:
Bring r24030 from trunk to 1.8 branch:

    Clean up more compiler warnings.

Tested on:
    Mac OSX/64 10.8.4 (amazon) w/gcc, C++ & FORTRAN
    (too minor to require h5committest)
2013-08-19 19:55:47 -05:00
Quincey Koziol
efb39881a0 [svn-r24012] Description:
Bring r24011 from trunk to 1.8 branch:

    Clean up a few warnings

Tested on:
    Mac OSX 10.8.4 (amazon) w/C++ & FORTRAN
    (too minor to require h5committest)
2013-08-15 08:27:24 -05:00
Allen Byrne
a003143ded [svn-r23992] HDFFV-8490 and H5UNJAM file handling. Merge from trunk.
Tested: local linux
2013-08-12 14:54:49 -05:00
Allen Byrne
f6ffaf1f69 [svn-r23898] HDFFV-8476: Add optional arg to -A for excluding attributes.
Merged from trunk.

Tested: local linux
2013-07-15 10:53:17 -05:00
Raymond Lu
562892e538 [svn-r23855] I added macro condition for OpenVMS in the hard-coded initialization of h5tools_dataformat.
Tested on jam and OpenVMS - simple change.
2013-07-01 18:17:24 -05:00
Albert Cheng
1bd478b1dc [svn-r23826] Bug HDFFV-8469: C++ comments in C code.
Found and removed two more "//" comments.

Tested: in Koala by
$ env CFLAGS="-ansi" ../hdf5/bin/buildhdf5 -fortran -cxx -config # enable fortran and cxx, configure only
$ make AM_CFLAGS=-ansi # compile all source file by setting HDF5 build CFLAGS as "-ansi" only
2013-06-26 01:26:13 -05:00
Allen Byrne
858668f900 [svn-r23797] remove commented line with c++ style 2013-06-20 10:06:30 -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
Quincey Koziol
afc68537cd [svn-r23696] Description:
Bring r23695 from trunk to 1.8 branch:

Clean up warnings in H5Tconv.c (down to _only_ 9000 lines of output now!)

Merge changes from Coverity branch back to trunk:

r20684:
Fix for coverity bug #1721 which was due to the fix for coverity bug #943.

r20685:
Use HDstrncpy. --gh

r20761:
Purpose: Fix valgrind issues

Description:
Free image_data and data as appropriate in test_image.

r20762:
Purpose: Fix coverity issue 600

Description:
Add check for return value of H5O_close in H5Ocopy.  Also cleaned up various
warnings.

r20763:
Purpose: Fix valgrind issues with h5stat

Description:
Modified h5stat to free "iter" before exit, and free "hand" before exit if
parse_command_line exits directly.

r20764:
fixed coverity issues:
69, 327, 614, 684, 685, 696, 697, 1681, 967, 826, 660, 80

r20765:
Fixed coverity bug 668

Pulled x * y * z multiply out of malloc operand into a separate n_elements variable to quiet integer overflow warning.

No actual integer overflow tests are performed since it's just a test program but I did add a check that n_elements is >= 1.

I also changed an error condition from doing its own close and returning -1 to "goto out;" like the rest of the program.

r20766:
Fixed coverity bug 667

Pulled x * y * z multiply out of malloc operand into a separate n_elements variable to quiet integer overflow warning.

No actual integer overflow tests are performed since it's just a test program.


Tested on:
    Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
    (h5committest upcoming)
2013-05-11 11:42:54 -05:00