| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Minor formatting tweaks
|
|
|
|
|
|
|
|
| |
Bring changes from trunk to this "merging" branch, to make further
merging of metadata journaling changes easier.
Tested on:
N/A - this branch is not compilable currently.
|
|
|
|
|
|
|
|
|
| |
Bring changes for "journaling" cache into "merging" branch, for
further merging into the trunk.
Tested on:
Mac OS X/32 10.6.8 (amazon)
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
| |
Bring changes from metadata journaling branch to "merging" branch.
Tested on:
Mac OS X/32 10.6.6 (amazon) w/ debug, production & parallel
(h5committest not necessary on this branch)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Converge code on "metadata journaling merge" branch to be closer to
code on current trunk:
- Updates to internal error reporting macros
- Updated routines to operation on superblock extension
- Object header query operations
Misc. minor updates to caching code.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, w/threadsafe, in production mode
Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Mac OS X/32 10.6.4 (amazon) in debug mode
Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
|
|
|
|
|
|
|
|
| |
Rename H5AC_set() to H5AC_insert_entry()
Get rid of H5C_set_skip_flags() & related flags
Tested on:
Eyeballed only, very simple...
|
|
|
|
|
|
|
|
|
| |
More general changes to align trunk with eventual changes from
metadata journaling branch.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug, production & parallel
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
General cleanups to align metadata journaling branch and trunk
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
|
|
|
|
|
|
|
|
|
|
|
| |
Upgrade autoconf framework and run bin/reconfigure, to align better
with metadata journaling branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
|
|
|
|
|
|
|
|
|
|
| |
Remove the size parameter from H5[A]C_unprotect() and the
H5[A]C__SIZE_CHANGED_FLAG, switching all clients & tests over to using
H5[A]C_resize_entry appropriately.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug & prod
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
| |
Correct error in H5C_resize_entry() where protected entry sizes were
not updated if the entry being resized was both pinned and protected.
Tested on:
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
|
| |
Switch H5AC_resize_pinned_entry() to work on protected entries as well,
and rename to H5AC_resize_entry()
Tested on:
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
| |
Rename H5[A]C_rename to H5[A]C_move_entry.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug & production
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bring changes from metadata journaling branch to 'merging' branch:
Rename H5[A]C_mark_pinned_or_protected_entry_dirty() to
H5[A]C_mark_entry_dirty() and get rid of H5[A]C_mark_pinned_entry_dirty().
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
|
|
|
|
|
|
|
|
| |
Changes to further align trunk with state of metadata journaling branch.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug & production
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Mostly changes to move to only using one 'user data' parameter for
calls to H5AC_protect(), along with some minor reformatting code cleanups.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
|
|
|
|
|
|
|
|
|
| |
Fix a memory leak, a problem in the metadata accumulator and clean up
a few compiler warnings.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug, prod & parallel
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bring new object header pin/unpin & protect/unprotect routines and
split-out object header chunk proxy changes from metadata_journaling branch to
"merging" branch, along with some other minor tweaks to clean up compiler
warnings, etc.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
|
|
|
|
|
|
|
|
|
|
| |
Bring metadata journaling branch into closer correspondence with trunk:
extract data structure freeing routines from metadata cache client 'destroy'
callbacks.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
| |
Bring metadata journaling branch into closer correspondence with trunk:
extract data structure freeing routines from metadata cache client 'destroy'
callbacks.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug, production & parallel
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
| |
Extract data structure 'destroy' routines from metadata cache client
'destroy' callbacks.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
| |
Extract data structure 'destroy' routines from metadata cache client
'destroy' callbacks.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
| |
Extract data structure 'destroy' routines from metadata cache client
'destroy' callbacks.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug, production & parallel
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
| |
Remove unused symbol table entry dirty flag.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug, production & parallel
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
| |
A couple of tweaks to bring the "merging" branch into better sync
with the metadata journaling branch.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug, production & parallel
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Further convergence of the metadata journaling changes toward the trunk.
Lots of little things in the cache code, remove the H5F_t * from the H5G_entry_t
struct.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
|
|
|
|
|
|
|
|
|
|
|
|
| |
Converge metadata journaling branch with trunk with a bunch of v1 B-tre
changes:
- Remove H5ACprivate.h header from H5Bprivate.h header
- Revise v1 B-tree client callbacks
- Get rid of H5B_serialize() by bringing it into H5B_flush()
Tested on:
Mac OS X/32 10.6.2 (amazon) w/debug, prod & parallel
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
|
| |
Bring r18227 from metadata_journaling branch to the merging branch:
Small cleanups and move v1 cache maintenance macros into package header
file, to better align with changes to v2 cache.
Tested on:
FreeBSD 6.3/32 (duty) w/debug
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
| |
Trim trailing whitespace from source files, with the following command:
find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.f90" \) -print |xargs -n 1 sed -i "" 's/[[:blank:]]*$//'
Tested on:
None - just eyeballed
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Converge changes on metadata_journaling branch and trunk:
- Remove H5F_t* parameter from H5HL_unprotect()
- Remove H5F_t* parameter from H5HL_dirty()
- Remove H5F_t* parameter from H5O_unprotect()
- Bring changes to metadata caching routines back:
- H5AC_pin_protected_entry()
- H5AC_resize_pinned_entry()
- H5AC_unpin_entry()
- H5AC_mark_pinned_entry_dirty()
- H5AC_mark_pinned_or_protected_entry_dirty()
- Revise internal H5C routines to drop H5F_t* and/or H5C_t* as
parameter where possible
- Revise tests to follow internal routine changes
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.2 (amazon) in debug mode
Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
|
|
|
|
|
|
|
|
|
| |
Minor brush-clearing changes to converge metadata_journaling branch and
trunk.
Tested on:
Mac OS X/32 10.6.2 (amazon) debug & prod
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
| |
Refactor local heap routines with changes from metadata journaling
branch, along with other misc. changes as the changes on the metadata journaling
branch are being converged with the current state of the trunk.
Tested on:
Mac OS X/32 10.6.2 (amazon) debug & prod
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
| |
Slush changes back & forth between trunk, the merging branch and the
metadata journaling branch to level them out to a reasonably common set of code
to work from for the next set of more significant changes.
Tested on:
Mac OS X/32 10.6.2 (amazon) w/debug
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
|
| |
Move local & global heap metadata cache callback routines to their own
source module, as they are in later revisions of the trunk and on the metadata
journaling branch, in order to make the convergence of the trunk and the
metadata journaling branch easier.
Tested on:
Mac OS X/32 10.6.2 (amazon) w/debug
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
| |
More "brush clearing" convergence between metadata_journaling branch
and the trunk.
Tested on:
Mac OS X/32 10.6.2 (amazon) debug & prod
(h5committest not required on this branch)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bring "brush clearing" changes (whitespace & style issues, mostly) from
metadata_journaling branch to the "merging" branch, to converge the trunk and
the metadata_journaling branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.2 (amazon) in debug mode
Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
|
|
|
|
|
|
|
| |
Added notes about:
- bugzilla 1068: revising class hierarchy to move Attribute out.
- replacing IdComponent::dereference with new H5Object member functions
and constructors in various other classes.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
mounted files.
Description:
Moved mount table from top file structure to shared file structure. Moved
parent out of mount table and back into top file structure. Mounted files can
now be accessed from any handle of the parent file. Changes to how files are
closed. Stricter cycle checking on mounted files. Removed unused function
H5F_has_mount().
Tested:
committest in 1.8 branch. Committing now due to the urgency of the fix. No
changes here are specific to the trunk, but I will keep an eye on the daily
tests.
|
|
|
|
|
|
|
| |
http://bugzilla.hdfgroup.uiuc.edu/show_bug.cgi?id=788
don't print array indices for regions
tested: windows, linux
|
|
|
|
| |
tested: windows, linux
|
|
|
|
|
|
|
|
|
|
| |
Description:
-- Remove a couple lines of debugging output
-- Make sure H5_PACKAGE_NAME outputs 'HDF5' rather than 'hdf5'
-- Take into account version strings with a postfix. This isn't currently used in HDF5 1.9 branch, but is in HDF5 1.8.
Tested:
kagiso
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
===
The following patch to h5copy.c on or near line 173 makes the
tool substantially more useful...
*flag = (*flag) | fla;
Because the command-line option parsing permits multiple '-f' arguments,
this will have the effect of or'ing the flags together so one can do
someting like....
~/tmp/hdf5-1.8.1/tools/h5copy/h5copy -i multi_ucd3d.h5 -s block5 -o gorfo -d foo -f shallow -f soft
Mark C. Miller, Lawrence Livermore National Laboratory
email: mailto:miller86@llnl.gov
===
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Description:
This commit is a major update to the Windows-maintained H5pubconf.h file. This file is statically-distributed because Windows cannot generate it dynamically as other platforms do. Previously, our Windows version contained a minimal subset of the macro definitions required. To update, I've gone through each macro (based on kagiso's output), and tested for the correct value on Windows. This allows us to better target code based on feature flags. It should also be easier to update in the future as changes are made to the configure script.
This commit also contains one small bug fix in h5ls.c. Some Windows-specific code was missing a local variable definition. The bug went unnoticed because Windows didn't define the feature flag correctly.
I've also made changes to the h5vers script. Whenever the version string is incremented (automatically by h5test after a snapshot), the strings in H5pubconf.h will also be updated.
Tested:
VS2005 on WinXP (32- and 64-bit)
VS.NET on WinXP 32-bit
h5vers tested under Cygwin
|
|
|
|
|
|
| |
the compression ratio was being printed for cases where a layout was requested and not a filter
tested: windows, linux
|
|
|
|
|
|
| |
h5repack test
tested: windows, linux
|
|
|
|
|
|
|
|
| |
Description:
A new parameter was added to h5diff recently. We add a new test to the h5diff script, and change the syntax in which h5diff is called from the h5repack test script
Tested:
VS2005 on WinXP
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Summary: when using h5diff to compare the results of h5repack (or other tools that copy one HDF5 file to another), a new option is needed to allow h5diff to make an "absolute" comparison of the 2 files. This is the "contents" mode explained in the usage below.
If this mode is present, objects in both files must match (must be exactly the same). If this does not happen, the tool returns an error code of 1 (instead of the success code of 0)
Changes to the h5repack test script: the call to h5diff was changed to include -c (maintaining the previous -q).
tested: windows, linux, solaris
|
| |
|