diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-04-05 04:24:19 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-04-05 04:24:19 (GMT) |
| commit | 935f20f142196edd6272d4621cf41ad817677da1 (patch) | |
| tree | 0751b89098852a8419b1ee32ea140fc67e8d6a1f /src/H5C2.c | |
| parent | 1c425ac9d2dead1c028370a068ac7add6634ed85 (diff) | |
| download | hdf5-935f20f142196edd6272d4621cf41ad817677da1.zip hdf5-935f20f142196edd6272d4621cf41ad817677da1.tar.gz hdf5-935f20f142196edd6272d4621cf41ad817677da1.tar.bz2 | |
[svn-r14797] Description:
Misc. cleanups found while compiling in other environments.
Still failing on linux machines with a memory corruption error and
not finished building in parallel yet either...
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5C2.c')
| -rw-r--r-- | src/H5C2.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -4988,11 +4988,12 @@ done: #ifdef H5_HAVE_PARALLEL herr_t -H5C2_mark_entries_as_clean(H5C2_t * cache_ptr, +H5C2_mark_entries_as_clean(H5F_t * f, hid_t dxpl_id, int32_t ce_array_len, haddr_t * ce_array_ptr) { + H5C2_t * cache_ptr; herr_t ret_value = SUCCEED; /* Return value */ int entries_cleared; int entries_examined; @@ -5010,6 +5011,8 @@ H5C2_mark_entries_as_clean(H5C2_t * cache_ptr, FUNC_ENTER_NOAPI(H5C2_mark_entries_as_clean, FAIL) + HDassert( f ); + cache_ptr = f->shared->cache2; HDassert( cache_ptr ); HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC ); @@ -7055,11 +7058,11 @@ H5C2_stats(H5C2_t * cache_ptr, hit_rate); HDfprintf(stdout, - "%s Total write / read (max) protects = %ld / %ld (%d)\n", + "%s Total write / read (max) protects = %ld / %ld (%ld)\n", cache_ptr->prefix, (long)total_write_protects, (long)total_read_protects, - max_read_protects); + (long)max_read_protects); HDfprintf(stdout, "%s Total clears / flushes / evictions = %ld / %ld / %ld\n", |