[svn-r14796] Description:

    Switch v1 B-tree nodes from using previous cache to use the new journaling
cache code.  This is a major switch for the cache callbacks.

    Switched the metadata caching code from having a pointer to the file it's
in to receiving a pointer to the file, when needed.  This was necessary in
order to avoid crashing when two files IDs were open on the same underlying
file and one of those files was closed with cache entries using the file
pointers.  Also took out the check in the caching code for reading off the
end of the file, which didn't play nicely with the multi-file VFD.

    Switching the cache from having a pointer internally to requiring one
externally meant tweaking almost all the test code.  :-/

    Added correct exit codes to cache2 tests that didn't have them already,
so the 'make check' will stop when they fail.

    Use the path to the h5diff in this build in the tools/h5recover testing
script, since we can't guarantee a user has HDF5 already installed.

    Assorted minor tweaks to get everything to compile more cleanly and pass
all the tests (on my Mac :-).

Tested on:
    Mac OS X (10.5.2) w/C++
    (more testing coming up shortly, I just didn't have my "rsync testbed" set
up for this branch when I started making changes to the code)

1 files changed, 2 insertions, 2 deletions

diff --git a/src/H5AC2private.h b/src/H5AC2private.h
index ca2522f..6676d7e 100644
--- a/src/H5AC2private.h
+++ b/src/H5AC2private.h
@@ -128,7 +128,7 @@ typedef enum {
 typedef H5C2_deserialize_func_t		H5AC2_deserialize_func_t;
 typedef H5C2_image_len_func_t		H5AC2_image_len_func_t;
 typedef H5C2_serialize_func_t		H5AC2_serialize_func_t;
-typedef H5C2_free_icr_func_t		H5CA2_free_icr_func_t;
+typedef H5C2_free_icr_func_t		H5AC2_free_icr_func_t;
 typedef H5C2_clear_dirty_bits_func_t	H5AC2_clear_dirty_bits_func_t;
 
 typedef H5C2_class_t			H5AC2_class_t;
@@ -305,7 +305,7 @@ H5_DLL herr_t H5AC2_get_cache_hit_rate(H5AC2_t * cache_ptr,
 
 H5_DLL herr_t H5AC2_reset_cache_hit_rate_stats(H5AC2_t * cache_ptr);
 
-H5_DLL herr_t H5AC2_set_cache_auto_resize_config(H5AC2_t * cache_ptr,
+H5_DLL herr_t H5AC2_set_cache_auto_resize_config(const H5F_t * f,
                                               H5AC2_cache_config_t *config_ptr);
 
 H5_DLL herr_t H5AC2_validate_config(H5AC2_cache_config_t * config_ptr);