summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-08-24 21:03:32 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-08-24 21:03:32 (GMT)
commit0cd7123fb6ef25fe2be44e53e16b6214c32fb3b9 (patch)
tree26793fd552f75dd0cc6646b7ed8d366d00376c47 /src
parent9fbdf8f07aeb41e04108e369196c426b7403881a (diff)
downloadhdf5-0cd7123fb6ef25fe2be44e53e16b6214c32fb3b9.zip
hdf5-0cd7123fb6ef25fe2be44e53e16b6214c32fb3b9.tar.gz
hdf5-0cd7123fb6ef25fe2be44e53e16b6214c32fb3b9.tar.bz2
[svn-r19292] Description:
Merge r19290 & r19291 from 1.8 branch to trunk: r19290: Correct another error in metadata accumulator dirty region calculations (this time with a corner case when freeing data in the file). r19291: Avoid getting object information for soft/external links if we aren't going to traverse across the link itself. 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, w/threadsafe, in production mode Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug 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 debug mode Mac OS X/32 10.6.4 (amazon) in debug mode Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
Diffstat (limited to 'src')
-rw-r--r--src/H5Faccum.c70
1 files changed, 43 insertions, 27 deletions
diff --git a/src/H5Faccum.c b/src/H5Faccum.c
index f74925a..2fc53ea 100644
--- a/src/H5Faccum.c
+++ b/src/H5Faccum.c
@@ -766,50 +766,66 @@ H5F_accum_free(H5F_t *f, hid_t dxpl_id, H5FD_mem_t UNUSED type, haddr_t addr,
/* Calculate the address of the tail to write */
tail_addr = addr + size;
- /* Check if there's dirty data after the block to free */
- if(H5F_addr_lt(tail_addr, dirty_end)) {
- /* Check if the dirty region falls entirely after block to free */
- if(tail_addr < dirty_start) {
- /* Write out the dirty region of the accumulator */
+ /* Check if the block to free begins before dirty region */
+ if(H5F_addr_lt(addr, dirty_start)) {
+ /* Check if block to free is entirely before dirty region */
+ if(H5F_addr_le(tail_addr, dirty_start)) {
+ /* Write out the entire dirty region of the accumulator */
if(H5FD_write(f->shared->lf, dxpl_id, H5FD_MEM_DEFAULT, dirty_start, f->shared->accum.dirty_len, f->shared->accum.buf + f->shared->accum.dirty_off) < 0)
HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
-
- /* Reset dirty flag */
- f->shared->accum.dirty = FALSE;
} /* end if */
- /* Dirty region overlaps block to free */
+ /* Block to free overlaps with some/all of dirty region */
else {
- size_t tail_size;
size_t write_size;
- /* Calculate the size of the tail to write */
- H5_ASSIGN_OVERFLOW(tail_size, dirty_end - tail_addr, haddr_t, size_t);
write_size = (size_t)(dirty_end - tail_addr);
- /* Write out the dirty part of the accumulator after the block to free */
- if(H5FD_write(f->shared->lf, dxpl_id, H5FD_MEM_DEFAULT, tail_addr, write_size, f->shared->accum.buf + (tail_addr - f->shared->accum.loc)) < 0)
- HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
+ /* Check for unfreed dirty region to write */
+ if(write_size > 0) {
+ size_t dirty_delta;
- /* Check if block to free falls within dirty region */
- if(addr == dirty_start)
- /* Reset dirty flag */
- f->shared->accum.dirty = FALSE;
- else
- /* Truncate dirty region */
- f->shared->accum.dirty_len = (size_t)(addr - dirty_start);
+ dirty_delta = f->shared->accum.dirty_len - write_size;
+
+ /* Write out the unfreed dirty region of the accumulator */
+ if(H5FD_write(f->shared->lf, dxpl_id, H5FD_MEM_DEFAULT, dirty_start + dirty_delta, write_size, f->shared->accum.buf + f->shared->accum.dirty_off + dirty_delta) < 0)
+ HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
+ } /* end if */
} /* end else */
+
+ /* Reset dirty flag */
+ f->shared->accum.dirty = FALSE;
} /* end if */
+ /* Block to free begins at beginning of or in middle of dirty region */
else {
- /* Check if entire dirty region is in block to free */
- if(addr < dirty_start)
+ /* Check if block to free ends before end of dirty region */
+ if(H5F_addr_lt(tail_addr, dirty_end)) {
+ size_t write_size;
+
+ write_size = (size_t)(dirty_end - tail_addr);
+
+ /* Check for unfreed dirty region to write */
+ if(write_size > 0) {
+ size_t dirty_delta;
+
+ dirty_delta = f->shared->accum.dirty_len - write_size;
+
+ /* Write out the unfreed end of the dirty region of the accumulator */
+ if(H5FD_write(f->shared->lf, dxpl_id, H5FD_MEM_DEFAULT, dirty_start + dirty_delta, write_size, f->shared->accum.buf + f->shared->accum.dirty_off + dirty_delta) < 0)
+ HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
+ } /* end if */
+ } /* end if */
+
+ /* Check for block to free beginning at same location as dirty region */
+ if(H5F_addr_eq(addr, dirty_start)) {
/* Reset dirty flag */
f->shared->accum.dirty = FALSE;
- /* Block to free truncates dirty region */
+ } /* end if */
+ /* Block to free eliminates end of dirty region */
else {
- /* Truncate dirty region */
- f->shared->accum.dirty_len = (size_t)(addr - dirty_start);
+ f->shared->accum.dirty_len = (addr - dirty_start);
} /* end else */
} /* end else */
+
} /* end if */
/* Adjust the accumulator information */