philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r13390] Description:

Browse Source 
Make H5O_protect/H5O_unprotect use pinned cache entries instead of
protected entries (allowing the object header routines to be semi-reentrant).

Tested on:
	FreeBSD 6.2 (duty)
This commit is contained in:
Quincey Koziol
2007-02-26 13:18:08 -05:00
parent 3ea2c632d5
commit e0ae782d27
12 changed files with 184 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/H5Oalloc.c
View File

@@ -840,7 +840,7 @@ done:
*/
unsigned
H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
const void *mesg, unsigned * oh_flags_ptr)
const void *mesg)
{
size_t raw_size; /* Raw size of message */
size_t aligned_size; /* Size of message including alignment */
@@ -853,7 +853,6 @@ H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
HDassert(oh);
HDassert(type);
HDassert(mesg);
HDassert(oh_flags_ptr);
/* Compute the size needed to store the message in the object header */
if((raw_size = (type->raw_size)(f, FALSE, mesg)) >= H5O_MESG_MAX_SIZE)
@@ -901,8 +900,9 @@ H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
if(H5O_alloc_null(oh, idx, type, NULL, aligned_size) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, UFAIL, "can't split null message")
/* Mark the object header as modified */
*oh_flags_ptr |= H5AC__DIRTIED_FLAG;
/* Mark object header as dirty in cache */
if(H5AC_mark_pinned_or_protected_entry_dirty(f, oh) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, UFAIL, "unable to mark object header as dirty")
/* Set return value */
ret_value = idx;