diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-20 12:43:30 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-20 12:43:30 (GMT) |
| commit | 83f50e5a722f7a58562a0885fef695f74bce7285 (patch) | |
| tree | 604f4dad662be4824a77eb85cffa3639cd35a9de /src/H5SMtest.c | |
| parent | 02a23331992c618bb3cacb35bc0ea52f36ba1482 (diff) | |
| download | hdf5-83f50e5a722f7a58562a0885fef695f74bce7285.zip hdf5-83f50e5a722f7a58562a0885fef695f74bce7285.tar.gz hdf5-83f50e5a722f7a58562a0885fef695f74bce7285.tar.bz2 | |
[svn-r18865] Description:
Bring r18864 from trunk to 1.8 branch:
General cleanups to align metadata journaling branch and trunk
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5SMtest.c')
| -rw-r--r-- | src/H5SMtest.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/H5SMtest.c b/src/H5SMtest.c index cc8a98f..78fb161 100644 --- a/src/H5SMtest.c +++ b/src/H5SMtest.c @@ -91,10 +91,15 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id, /* Check for shared messages being enabled */ if(H5F_addr_defined(f->shared->sohm_addr)) { H5SM_index_header_t *header; /* Index header for message type */ + H5SM_table_cache_ud_t cache_udata; /* User-data for callback */ ssize_t index_num; /* Table index for message type */ + /* Set up user data for callback */ + cache_udata.f = f; + cache_udata.table_size = H5SM_TABLE_SIZE(f) + (f->shared->sohm_nindexes * H5SM_INDEX_HEADER_SIZE(f)); + /* Look up the master SOHM table */ - if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, f, H5AC_READ))) + if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, &cache_udata, H5AC_READ))) HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table") /* Find the correct index for this message type */ |