diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2017-01-06 21:45:13 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2017-01-06 21:45:13 (GMT) |
commit | be00c2b6c2a370fdda6c63d1ba683a24646ce567 (patch) | |
tree | c4bdbf68081724299919101522cb5c248cf6b471 /testpar/t_cache.c | |
parent | 047646d469a8bf7ccc3362a8bd9de2dc182e543e (diff) | |
parent | 8d4c84eae2954a77c725f42298b20d694a6150c8 (diff) | |
download | hdf5-be00c2b6c2a370fdda6c63d1ba683a24646ce567.zip hdf5-be00c2b6c2a370fdda6c63d1ba683a24646ce567.tar.gz hdf5-be00c2b6c2a370fdda6c63d1ba683a24646ce567.tar.bz2 |
Merge pull request #239 in HDFFV/hdf5 from develop_merge_cache_image_05 to develop
* commit '8d4c84eae2954a77c725f42298b20d694a6150c8':
Bring changes to metadata cache "get entry status" call and new "child serialized / unserialized" messages and support from the cache image branch.
Add "image up to date" flag / parameter to metadata cache entry status calls.
Diffstat (limited to 'testpar/t_cache.c')
-rw-r--r-- | testpar/t_cache.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 94a6e7c..8753325 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -2927,6 +2927,30 @@ datum_notify(H5C_notify_action_t action, void *thing) /* do nothing */ break; + case H5AC_NOTIFY_ACTION_CHILD_UNSERIALIZED: + if ( callbacks_verbose ) { + + HDfprintf(stdout, + "%d: notify() action = child entry unserialized, idx = %d, addr = %ld.\n", + world_mpi_rank, idx, (long)entry_ptr->header.addr); + fflush(stdout); + } + + /* do nothing */ + break; + + case H5AC_NOTIFY_ACTION_CHILD_SERIALIZED: + if ( callbacks_verbose ) { + + HDfprintf(stdout, + "%d: notify() action = child entry serialized, idx = %d, addr = %ld.\n", + world_mpi_rank, idx, (long)entry_ptr->header.addr); + fflush(stdout); + } + + /* do nothing */ + break; + default: nerrors++; ret_value = FAIL; @@ -3054,7 +3078,7 @@ expunge_entry(H5F_t * file_ptr, HDassert( ! ((entry_ptr->header).is_dirty) ); result = H5C_get_entry_status(file_ptr, entry_ptr->base_addr, - NULL, &in_cache, NULL, NULL, NULL, NULL, NULL, NULL); + NULL, &in_cache, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if ( result < 0 ) { |