summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-05-05 14:45:57 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-05-05 14:45:57 (GMT)
commit3f3a900177d9464376ea7baf5f989cbfa0e86b0a (patch)
tree38ed174516c0c65bcbbe4c543c54119bb83d5452 /testpar
parentf2190dd264fb97dfb699888d20c4ab6c112e45aa (diff)
downloadhdf5-3f3a900177d9464376ea7baf5f989cbfa0e86b0a.zip
hdf5-3f3a900177d9464376ea7baf5f989cbfa0e86b0a.tar.gz
hdf5-3f3a900177d9464376ea7baf5f989cbfa0e86b0a.tar.bz2
[svn-r18704] Description:
Bring r18702 from trunk to 1.8 branch: Bring r18672 from metadata journaling "merging" branch to trunk: 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 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-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
Diffstat (limited to 'testpar')
-rw-r--r--testpar/t_cache.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 723f6ab..5639e59 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -27,7 +27,7 @@
#include "H5Cpkg.h"
-#define H5AC_PACKAGE /*suppress error about including H5Cpkg */
+#define H5AC_PACKAGE /*suppress error about including H5ACpkg */
#include "H5ACpkg.h"
@@ -319,7 +319,7 @@ static herr_t destroy_datum(H5F_t UNUSED * f, void * thing);
static herr_t flush_datum(H5F_t *f, hid_t UNUSED dxpl_id, hbool_t dest, haddr_t addr,
void *thing);
static void * load_datum(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t addr,
- const void UNUSED *udata1, void UNUSED *udata2);
+ void UNUSED *udata);
static herr_t size_datum(H5F_t UNUSED * f, void * thing, size_t * size_ptr);
#define DATUM_ENTRY_TYPE H5AC_TEST_ID
@@ -1848,7 +1848,7 @@ flush_datum(H5F_t *f,
HDassert( entry_ptr->header.addr == entry_ptr->base_addr );
HDassert( ( entry_ptr->header.size == entry_ptr->len ) ||
- ( entry_ptr->header.size == entry_ptr->local_len ) );
+ ( entry_ptr->header.size == entry_ptr->local_len ) );
HDassert( entry_ptr->header.is_dirty == entry_ptr->dirty );
@@ -1857,7 +1857,7 @@ flush_datum(H5F_t *f,
ret_value = FAIL;
HDfprintf(stdout,
"%d:%s: Flushed dirty entry from non-zero file process.",
- world_mpi_rank, fcn_name);
+ world_mpi_rank, fcn_name);
}
if ( ret_value == SUCCEED ) {
@@ -1936,7 +1936,7 @@ flush_datum(H5F_t *f,
if ( entry_ptr->header.is_pinned ) {
datum_pinned_flushes++;
- HDassert( entry_ptr->global_pinned || entry_ptr->local_pinned );
+ HDassert( entry_ptr->global_pinned || entry_ptr->local_pinned );
}
return(ret_value);
@@ -1963,8 +1963,7 @@ static void *
load_datum(H5F_t UNUSED *f,
hid_t UNUSED dxpl_id,
haddr_t addr,
- const void UNUSED *udata1,
- void UNUSED *udata2)
+ void UNUSED *udata)
{
const char * fcn_name = "load_datum()";
hbool_t success = TRUE;
@@ -2735,8 +2734,7 @@ lock_entry(H5C_t * cache_ptr,
HDassert( ! (entry_ptr->locked) );
cache_entry_ptr = (H5C_cache_entry_t *)H5AC_protect(file_ptr, -1, &(types[0]),
- entry_ptr->base_addr,
- NULL, NULL, H5AC_WRITE);
+ entry_ptr->base_addr, NULL, H5AC_WRITE);
if ( ( cache_entry_ptr != (void *)(&(entry_ptr->header)) ) ||
( entry_ptr->header.type != &(types[0]) ) ||
@@ -3650,7 +3648,7 @@ unlock_entry(H5C_t * cache_ptr,
entry_ptr->dirty = TRUE;
}
- result = H5AC_unprotect(file_ptr, -1, &(types[0]),
+ result = H5AC_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT, &(types[0]),
entry_ptr->base_addr,
(void *)(&(entry_ptr->header)), flags);
@@ -3757,7 +3755,7 @@ unpin_entry(H5C_t * cache_ptr,
}
- result = H5AC_unpin_entry((void *)entry_ptr);
+ result = H5AC_unpin_entry(entry_ptr);
if ( result < 0 ) {
@@ -5385,7 +5383,7 @@ smoke_check_5(void)
* Modifications:
*
* JRM -- 7/11/06
- * Updated fro H5AC_expunge_entry() and
+ * Updated for H5AC_expunge_entry() and
* H5AC_resize_pinned_entry().
*
*****************************************************************************/
@@ -5565,8 +5563,8 @@ trace_file_check(void)
nerrors++;
HDfprintf(stdout,
- "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n",
- world_mpi_rank, fcn_name);
+ "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n",
+ world_mpi_rank, fcn_name);
}
}
}