diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2008-04-05 03:21:41 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-04-05 03:21:41 (GMT) |
commit | 1c425ac9d2dead1c028370a068ac7add6634ed85 (patch) | |
tree | 6c10d9fb596929e980714f6aa571fb40a95a56ad /src/H5C2pkg.h | |
parent | e023ad625fbfa97ed0cfcd05861f626e55b4b262 (diff) | |
download | hdf5-1c425ac9d2dead1c028370a068ac7add6634ed85.zip hdf5-1c425ac9d2dead1c028370a068ac7add6634ed85.tar.gz hdf5-1c425ac9d2dead1c028370a068ac7add6634ed85.tar.bz2 |
[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)
Diffstat (limited to 'src/H5C2pkg.h')
-rw-r--r-- | src/H5C2pkg.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/H5C2pkg.h b/src/H5C2pkg.h index 7d12053..878e372 100644 --- a/src/H5C2pkg.h +++ b/src/H5C2pkg.h @@ -174,8 +174,8 @@ struct H5C2_jbrb_t unsigned long cur_trans; unsigned long last_trans_on_disk; hbool_t trans_in_prog; - char * jname; - char * hdf5_file_name; + const char * jname; + const char * hdf5_file_name; hbool_t header_present; size_t cur_buf_free_space; size_t rb_space_to_rollover; @@ -243,11 +243,6 @@ struct H5C2_jbrb_t * This field is used to validate pointers to instances of * H5C2_t. * - * f: Pointer to the instance of H5F_t associated with this - * instance of the metadata cache. This field is set at - * create, and then used until the file is closed (at which - * point, the cache will be shut down as well). - * * flush_in_progress: Boolean flag indicating whether a flush is in * progress. * @@ -1024,8 +1019,6 @@ struct H5C2_t { uint32_t magic; - H5F_t * f; - hbool_t flush_in_progress; FILE * trace_file_ptr; |