summaryrefslogtreecommitdiffstats
path: root/src/H5HFint.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-03-13 19:47:16 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-03-13 19:47:16 (GMT)
commitee3fdc2dbcdf9daaf4e41c085fddd37c1eadbcf9 (patch)
tree7cbd8c5fc545197f4efed76b9c317c817ebf791f /src/H5HFint.c
parentc619cf0f518bfea91a34136a1424951eb17b99a4 (diff)
downloadhdf5-ee3fdc2dbcdf9daaf4e41c085fddd37c1eadbcf9.zip
hdf5-ee3fdc2dbcdf9daaf4e41c085fddd37c1eadbcf9.tar.gz
hdf5-ee3fdc2dbcdf9daaf4e41c085fddd37c1eadbcf9.tar.bz2
[svn-r12084] Purpose:
Code checkpoint Description: The fractal heap code is reasonably stable and is passing all its current tests, so checkpoint everything with CVS. Also, add "statistics" module for v2 B-trees code, which is only a stub right now. Platforms tested: FreeBSD 4.11 (sleipnir) Mac OSX (amazon) Linux 2.4 (chicago)
Diffstat (limited to 'src/H5HFint.c')
-rw-r--r--src/H5HFint.c922
1 files changed, 750 insertions, 172 deletions
diff --git a/src/H5HFint.c b/src/H5HFint.c
index 151b19f..fce8640 100644
--- a/src/H5HFint.c
+++ b/src/H5HFint.c
@@ -33,9 +33,10 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5HFpkg.h" /* Fractal heaps */
#include "H5Eprivate.h" /* Error handling */
+#include "H5HFpkg.h" /* Fractal heaps */
#include "H5MFprivate.h" /* File memory management */
+#include "H5MMprivate.h" /* Memory management */
#include "H5Vprivate.h" /* Vectors and arrays */
/****************/
@@ -44,7 +45,8 @@
/* Limit on the size of the max. direct block size */
/* (This is limited to 32-bits currently, because I think it's unlikely to
- * need to be larger, and the 32-bit limit for H5V_log2_of2(n) - QAK)
+ * need to be larger, the 32-bit limit for H5V_log2_of2(n), and
+ * some offsets/sizes are encoded with a maxiumum of 32-bits - QAK)
*/
#define H5HL_MAX_DIRECT_SIZE_LIMIT ((hsize_t)2 * 1024 * 1024 * 1024)
@@ -54,15 +56,45 @@
/********************/
+/* Package Typedefs */
+/********************/
+
+/* Direct block free list section node */
+struct H5HF_section_free_node_t {
+ haddr_t sect_addr; /* Address of free list section in the file */
+ /* (Not actually used as address, used as unique ID for free list node) */
+ haddr_t block_addr; /* Address of direct block for free section */
+ size_t sect_size; /* Size of free space section */
+ /* (section size is "object size", without the metadata overhead, since metadata overhead varies from block to block) */
+ size_t block_size; /* Size of direct block */
+ /* (Needed to retrieve direct block) */
+};
+
+
+/********************/
/* Local Prototypes */
/********************/
+/* Doubling table routines */
+static herr_t H5HF_dtable_init(const H5HF_shared_t *shared, H5HF_dtable_t *dtable);
+static herr_t H5HF_dtable_lookup(const H5HF_dtable_t *dtable, hsize_t off,
+ unsigned *row, unsigned *col);
+
+/* Shared heap header routines */
static herr_t H5HF_shared_free(void *_shared);
+
+/* Direct block routines */
+static herr_t H5HF_dblock_section_node_free_cb(void *item, void UNUSED *key,
+ void UNUSED *op_data);
+static herr_t H5HF_man_dblock_inc_size(H5HF_shared_t *shared);
static herr_t H5HF_man_dblock_create(H5RC_t *fh_shared, hid_t dxpl_id,
size_t block_size, hsize_t block_off, haddr_t *addr_p);
-static herr_t H5HF_man_dblock_insert(H5RC_t *fh_shared, hid_t dxpl_id,
- haddr_t block_addr, size_t block_size, size_t obj_size, const void *obj,
- void *id);
+static herr_t H5HF_man_dblock_new(H5RC_t *fh_shared, hid_t dxpl_id,
+ size_t request);
+
+/* Indirect block routines */
+static herr_t H5HF_man_iblock_create(H5RC_t *fh_shared, hid_t dxpl_id,
+ hsize_t block_off, unsigned nrows, haddr_t *addr_p);
/*********************/
/* Package Variables */
@@ -77,6 +109,18 @@ H5FL_DEFINE(H5HF_direct_free_head_t);
/* Declare a free list to manage the H5HF_direct_free_node_t struct */
H5FL_DEFINE(H5HF_direct_free_node_t);
+/* Declare a free list to manage the H5HF_section_free_node_t struct */
+H5FL_DEFINE(H5HF_section_free_node_t);
+
+/* Declare a free list to manage the H5HF_indirect_t struct */
+H5FL_DEFINE(H5HF_indirect_t);
+
+/* Declare a free list to manage the H5HF_indirect_dblock_ent_t sequence information */
+H5FL_SEQ_DEFINE(H5HF_indirect_dblock_ent_t);
+
+/* Declare a free list to manage the H5HF_indirect_iblock_ent_t sequence information */
+H5FL_SEQ_DEFINE(H5HF_indirect_iblock_ent_t);
+
/*****************************/
/* Library Private Variables */
@@ -93,6 +137,101 @@ H5FL_DEFINE_STATIC(H5HF_shared_t);
/*-------------------------------------------------------------------------
+ * Function: H5HF_dtable_init
+ *
+ * Purpose: Initialize values for doubling table
+ *
+ * Return: Non-negative on success/Negative on failure
+ *
+ * Programmer: Quincey Koziol
+ * koziol@ncsa.uiuc.edu
+ * Mar 6 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5HF_dtable_init(const H5HF_shared_t *shared, H5HF_dtable_t *dtable)
+{
+ hsize_t tmp_block_size; /* Temporary block size */
+ size_t u; /* Local index variable */
+ herr_t ret_value = SUCCEED; /* Return value */
+
+ FUNC_ENTER_NOAPI_NOINIT(H5HF_dtable_init)
+
+ /*
+ * Check arguments.
+ */
+ HDassert(shared);
+ HDassert(dtable);
+
+ /* Compute/cache some values */
+ dtable->first_row_bits = H5V_log2_of2(dtable->cparam.start_block_size) +
+ H5V_log2_of2(dtable->cparam.width);
+ dtable->max_root_indirect_rows = (dtable->cparam.max_index - dtable->first_row_bits) + 1;
+ dtable->max_direct_rows = (H5V_log2_of2(dtable->cparam.max_direct_size) -
+ H5V_log2_of2(dtable->cparam.start_block_size)) + 2;
+ dtable->num_id_first_row = dtable->cparam.start_block_size * dtable->cparam.width;
+ dtable->max_dir_blk_off_size = H5HF_SIZEOF_OFFSET_LEN(dtable->cparam.max_direct_size);
+ dtable->next_dir_size = dtable->cparam.start_block_size;
+
+ /* Build table of block sizes for each row */
+ if(NULL == (dtable->row_block_size = H5MM_malloc(dtable->max_root_indirect_rows * sizeof(hsize_t))))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't create doubling table block size table")
+ tmp_block_size = dtable->cparam.start_block_size;
+ dtable->row_block_size[0] = dtable->cparam.start_block_size;
+ for(u = 1; u < dtable->max_root_indirect_rows; u++) {
+ dtable->row_block_size[u] = tmp_block_size;
+ tmp_block_size *= 2;
+ } /* end for */
+
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5HF_dtable_init() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5HF_dtable_lookup
+ *
+ * Purpose: Compute the row & col of an offset in a doubling-table
+ *
+ * Return: Non-negative on success/Negative on failure
+ *
+ * Programmer: Quincey Koziol
+ * koziol@ncsa.uiuc.edu
+ * Mar 6 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5HF_dtable_lookup(const H5HF_dtable_t *dtable, hsize_t off, unsigned *row, unsigned *col)
+{
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_lookup)
+
+ /*
+ * Check arguments.
+ */
+ HDassert(dtable);
+ HDassert(row);
+ HDassert(col);
+
+ /* Check for offset in first row */
+ if(off < dtable->num_id_first_row) {
+ *row = 0;
+ *col = off / dtable->cparam.start_block_size;
+ } /* end if */
+ else {
+ unsigned high_bit = H5V_log2_gen(off); /* Determine the high bit in the offset */
+ hsize_t off_mask = 1 << high_bit; /* Compute mask for determining column */
+
+ *row = (high_bit - dtable->first_row_bits) + 1;
+ *col = (off - off_mask) / dtable->row_block_size[*row];
+ } /* end else */
+
+ FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5HF_dtable_lookup() */
+
+
+/*-------------------------------------------------------------------------
* Function: H5HF_shared_alloc
*
* Purpose: Allocate shared fractal heap info
@@ -153,7 +292,7 @@ done:
herr_t
H5HF_shared_own(H5HF_t *fh, H5HF_shared_t *shared)
{
- herr_t ret_value = SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_shared_own)
@@ -164,9 +303,14 @@ H5HF_shared_own(H5HF_t *fh, H5HF_shared_t *shared)
HDassert(shared);
/* Compute/cache some values */
- shared->fixed_len_obj = (shared->fixed_len_size > 0);
shared->ref_count_obj = (shared->ref_count_size > 0);
- shared->heap_off_size = H5HF_SIZEOF_OFFSET_BITS(shared->man_dtable_info.cparam.max_index);
+ shared->heap_off_size = H5HF_SIZEOF_OFFSET_BITS(shared->man_dtable.cparam.max_index);
+ if(H5HF_dtable_init(shared, &shared->man_dtable) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize doubling table info")
+
+ /* Create the free-list structure for the heap */
+ if(NULL == (shared->flist = H5HF_flist_create(shared->man_dtable.cparam.max_direct_size, H5HF_dblock_section_node_free_cb)))
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize free list info")
/* Make shared heap info reference counted */
if(NULL == (fh->shared = H5RC_create(shared, H5HF_shared_free)))
@@ -214,6 +358,8 @@ H5HF_shared_create(H5F_t *f, H5HF_t *fh, haddr_t fh_addr, H5HF_create_t *cparam)
if(!POWER_OF_TWO(cparam->managed.max_direct_size) ||
(cparam->managed.max_direct_size == 0 || cparam->managed.max_direct_size > H5HL_MAX_DIRECT_SIZE_LIMIT))
HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, FAIL, "max. direct block size not power of two")
+ if(cparam->managed.max_direct_size < cparam->standalone_size)
+ HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, FAIL, "max. direct block size not large enough to hold all managed blocks")
if(cparam->managed.max_index > (8 * H5F_SIZEOF_SIZE(f)) || cparam->managed.max_index == 0)
HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, FAIL, "max. direct block size not power of two")
#endif /* NDEBUG */
@@ -226,9 +372,11 @@ H5HF_shared_create(H5F_t *f, H5HF_t *fh, haddr_t fh_addr, H5HF_create_t *cparam)
shared->heap_addr = fh_addr;
shared->addrmap = cparam->addrmap;
shared->standalone_size = cparam->standalone_size;
- shared->fixed_len_size = cparam->fixed_len_size;
shared->ref_count_size = cparam->ref_count_size;
- HDmemcpy(&(shared->man_dtable_info.cparam), &(cparam->managed), sizeof(H5HF_dtable_cparam_t));
+ HDmemcpy(&(shared->man_dtable.cparam), &(cparam->managed), sizeof(H5HF_dtable_cparam_t));
+
+ /* Note that the shared info is dirty (it's not written to the file yet) */
+ shared->dirty = TRUE;
/* Make shared heap info reference counted */
if(H5HF_shared_own(fh, shared) < 0)
@@ -266,6 +414,13 @@ H5HF_shared_free(void *_shared)
/* Sanity check */
HDassert(shared);
+ /* Free the free list information for the heap */
+ if(shared->flist)
+ H5HF_flist_free(shared->flist);
+
+ /* Free the block size lookup table for the doubling table */
+ H5MM_xfree(shared->man_dtable.row_block_size);
+
/* Free the shared info itself */
H5FL_FREE(H5HF_shared_t, shared);
@@ -274,84 +429,49 @@ H5HF_shared_free(void *_shared)
/*-------------------------------------------------------------------------
- * Function: H5HF_man_alloc_end
+ * Function: H5HF_man_dblock_inc_size
*
- * Purpose: Allocate space for an object at the end of the managed obj. heap
+ * Purpose: Increment size of next direct block
*
- * Return: Non-negative on success (with heap ID of new object
- * filled in), negative on failure
+ * Return: SUCCEED/FAIL
*
* Programmer: Quincey Koziol
* koziol@ncsa.uiuc.edu
- * Feb 27 2006
+ * Mar 6 2006
*
*-------------------------------------------------------------------------
*/
-herr_t
-H5HF_man_alloc_end(H5RC_t *fh_shared, hid_t dxpl_id, unsigned *fh_flags_ptr,
- size_t size, const void *obj, void *id/*out*/)
+static herr_t
+H5HF_man_dblock_inc_size(H5HF_shared_t *shared)
{
- H5HF_shared_t *shared; /* Shared heap information */
- herr_t ret_value = SUCCEED;
-
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_alloc_end)
-HDfprintf(stderr, "%s: size = %Zu\n", FUNC, size);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_dblock_inc_size)
/*
* Check arguments.
*/
- HDassert(fh_shared);
- HDassert(fh_flags_ptr);
- HDassert(size > 0);
- HDassert(obj);
- HDassert(id);
-
- /* Get the pointer to the shared heap info */
- shared = H5RC_GET_OBJ(fh_shared);
HDassert(shared);
- /* Check if this is the first object in the heap */
- if(shared->next_man_block == 0) {
- /* Check if the object can fit in a direct block of the starting block size */
-#ifndef QAK
-HDfprintf(stderr, "%s: H5HF_MAN_ABS_DIRECT_OVERHEAD_SIZE = %u\n", FUNC, H5HF_MAN_ABS_DIRECT_OVERHEAD_SIZE(shared, shared->man_dtable_info.cparam.start_block_size));
-HDfprintf(stderr, "%s: H5HF_MAN_ABS_DIRECT_OBJ_PREFIX_LEN_SIZE = %u\n", FUNC, H5HF_MAN_ABS_DIRECT_OBJ_PREFIX_LEN_SIZE(shared, shared->man_dtable_info.cparam.start_block_size));
-#endif /* QAK */
- if((size + H5HF_MAN_ABS_DIRECT_OVERHEAD_SIZE(shared, shared->man_dtable_info.cparam.start_block_size)
- + H5HF_MAN_ABS_DIRECT_OBJ_PREFIX_LEN_SIZE(shared, shared->man_dtable_info.cparam.start_block_size))
- <= shared->man_dtable_info.cparam.start_block_size) {
- haddr_t dblock_addr; /* Address of new direct block */
- size_t dblock_size; /* Size of new direct block */
-
- /* Allocate initial direct block */
- dblock_size = shared->man_dtable_info.cparam.start_block_size;
- if(H5HF_man_dblock_create(fh_shared, dxpl_id, dblock_size, (hsize_t)0, &dblock_addr) < 0)
- HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate fractal heap direct block")
-HDfprintf(stderr, "%s: dblock_addr = %a\n", FUNC, dblock_addr);
-
- /* Point root at new direct block */
- shared->next_man_block = dblock_size;
- shared->man_dtable_info.curr_root_rows = 0;
- shared->man_dtable_info.table_addr = dblock_addr;
-
- /* Mark heap header as modified */
- *fh_flags_ptr |= H5AC__DIRTIED_FLAG;
-
- /* Attempt to insert object into direct block */
- if(H5HF_man_dblock_insert(fh_shared, dxpl_id, dblock_addr, dblock_size, size, obj, id) < 0)
- HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't insert object into fractal heap direct block")
- } /* end if */
- else {
-HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "first object doesn't fit into starting direct block")
- } /* end else */
+ /* Check for another block of the same size, in the same row */
+ if(shared->man_dtable.next_dir_col < shared->man_dtable.cparam.width) {
+ /* Move to next column in doubling table */
+ shared->man_dtable.next_dir_col++;
} /* end if */
else {
-HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "allocating objects at end of heap not supported yet")
+ /* Check for "doubling" block to next row or resetting to initial size */
+/* XXX: The maximum size will vary for different indirect blocks... */
+ if(shared->man_dtable.next_dir_size < shared->man_dtable.cparam.max_direct_size)
+ /* Double block size */
+ shared->man_dtable.next_dir_size *= 2;
+ else
+ /* Reset to starting block size */
+ shared->man_dtable.next_dir_size = shared->man_dtable.cparam.start_block_size;
+
+ /* Set next column */
+ shared->man_dtable.next_dir_col = 0;
} /* end else */
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5HF_man_alloc_end() */
+ FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5HF_man_dblock_inc_size() */
/*-------------------------------------------------------------------------
@@ -368,10 +488,11 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5HF_man_dblock_create(H5RC_t *fh_shared, hid_t dxpl_id, size_t block_size,
- hsize_t block_off, haddr_t *addr_p)
+H5HF_man_dblock_create(H5RC_t *fh_shared, hid_t dxpl_id,
+ size_t block_size, hsize_t block_off, haddr_t *addr_p)
{
H5HF_direct_free_node_t *node; /* Pointer to free list node for block */
+ H5HF_section_free_node_t *sec_node; /* Pointer to free list section for block */
H5HF_shared_t *shared; /* Pointer to shared heap info */
H5HF_direct_t *dblock = NULL; /* Pointer to direct block */
herr_t ret_value = SUCCEED; /* Return value */
@@ -389,7 +510,7 @@ H5HF_man_dblock_create(H5RC_t *fh_shared, hid_t dxpl_id, size_t block_size,
* Allocate file and memory data structures.
*/
if(NULL == (dblock = H5FL_MALLOC(H5HF_direct_t)))
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fractal heap header")
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fractal heap direct block")
/* Reset the metadata cache info for the heap header */
HDmemset(&dblock->cache_info, 0, sizeof(H5AC_info_t));
@@ -403,7 +524,9 @@ H5HF_man_dblock_create(H5RC_t *fh_shared, hid_t dxpl_id, size_t block_size,
HDassert(shared);
/* Set info for direct block */
+#ifdef QAK
HDfprintf(stderr, "%s: size = %Zu, block_off = %Hu\n", FUNC, block_size, block_off);
+#endif /* QAK */
dblock->size = block_size;
dblock->block_off = block_off;
dblock->blk_off_size = H5HF_SIZEOF_OFFSET_LEN(block_size);
@@ -434,15 +557,39 @@ HDmemset(dblock->blk, 0, dblock->size);
node->prev = node->next = NULL;
/* Attach to free list head */
+/* XXX: Convert this list to a skip list? */
dblock->free_list->first = node;
/* Allocate space for the header on disk */
if(HADDR_UNDEF == (*addr_p = H5MF_alloc(shared->f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)block_size)))
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap header")
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
- /* Cache the new fractal heap header */
+ /* Create free list section node */
+ if(NULL == (sec_node = H5FL_MALLOC(H5HF_section_free_node_t)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct block free list section")
+
+ /* Set section's information */
+ sec_node->block_addr = *addr_p;
+ sec_node->block_size = block_size;
+ sec_node->sect_addr = *addr_p + node->my_offset;
+ /* (section size is "object size", without the metadata overhead) */
+ sec_node->sect_size = node->size - H5HF_MAN_ABS_DIRECT_OBJ_PREFIX_LEN_DBLOCK(shared, dblock);
+
+ /* Add new free space to the global list of space */
+ if(H5HF_flist_add(shared->flist, sec_node, &sec_node->sect_size, &sec_node->sect_addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add direct block free space to global list")
+
+ /* Update shared heap info */
+ shared->total_man_free += dblock->blk_free_space;
+ shared->total_size += dblock->size;
+ shared->man_size += dblock->size;
+
+ /* Mark heap header as modified */
+ shared->dirty = TRUE;
+
+ /* Cache the new fractal heap direct block */
if(H5AC_set(shared->f, dxpl_id, H5AC_FHEAP_DBLOCK, *addr_p, dblock, H5AC__NO_FLAGS_SET) < 0)
- HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap header to cache")
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap direct block to cache")
done:
if(ret_value < 0)
@@ -454,6 +601,34 @@ done:
/*-------------------------------------------------------------------------
+ * Function: H5HF_dblock_section_node_free_cb
+ *
+ * Purpose: Free a section node for a block
+ *
+ * Return: Success: non-negative
+ *
+ * Failure: negative
+ *
+ * Programmer: Quincey Koziol
+ * Monday, March 13, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5HF_dblock_section_node_free_cb(void *item, void UNUSED *key, void UNUSED *op_data)
+{
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dblock_section_node_free_cb)
+
+ HDassert(item);
+
+ /* Release the sections */
+ H5FL_FREE(H5HF_section_free_node_t, item);
+
+ FUNC_LEAVE_NOAPI(0)
+} /* H5HF_dblock_section_node_free_cb() */
+
+
+/*-------------------------------------------------------------------------
* Function: H5HF_man_dblock_build_freelist
*
* Purpose: Parse the free list information for a direct block and build
@@ -468,9 +643,10 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5HF_man_dblock_build_freelist(H5HF_direct_t *dblock)
+H5HF_man_dblock_build_freelist(H5HF_direct_t *dblock, haddr_t dblock_addr)
{
H5HF_direct_free_head_t *head = NULL; /* Pointer to free list head for block */
+ H5HF_shared_t *shared; /* Pointer to shared heap info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_build_freelist)
@@ -489,6 +665,7 @@ H5HF_man_dblock_build_freelist(H5HF_direct_t *dblock)
if(dblock->free_list_head == 0)
head->first = NULL;
else {
+ H5HF_section_free_node_t *sec_node; /* Pointer to free list section for block */
H5HF_direct_free_node_t *node = NULL; /* Pointer to free list node for block */
H5HF_direct_free_node_t *prev_node; /* Pointer to previous free list node for block */
hsize_t free_len; /* Length of free list info */
@@ -496,6 +673,10 @@ H5HF_man_dblock_build_freelist(H5HF_direct_t *dblock)
hsize_t prev_off; /* Prev node offset in block */
uint8_t *p; /* Temporary pointer to free node info */
+ /* Get the pointer to the shared B-tree info */
+ shared = H5RC_GET_OBJ(dblock->shared);
+ HDassert(shared);
+
/* Point to first node in free list */
p = dblock->blk + dblock->free_list_head;
@@ -516,6 +697,21 @@ H5HF_man_dblock_build_freelist(H5HF_direct_t *dblock)
/* Attach to free list head */
head->first = node;
+ /* Create free list section node */
+ if(NULL == (sec_node = H5FL_MALLOC(H5HF_section_free_node_t)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct block free list section")
+
+ /* Set section's information */
+ sec_node->block_addr = dblock_addr;
+ sec_node->block_size = dblock->size;
+ sec_node->sect_addr = dblock_addr + node->my_offset;
+ /* (section size is "object size", without the metadata overhead) */
+ sec_node->sect_size = node->size - H5HF_MAN_ABS_DIRECT_OBJ_PREFIX_LEN_DBLOCK(shared, dblock);
+
+ /* Add new free space to the global list of space */
+ if(H5HF_flist_add(shared->flist, sec_node, &sec_node->sect_size, &sec_node->sect_addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add direct block free space to global list")
+
/* Set up trailing node pointer */
prev_node = node;
prev_off = next_off;
@@ -540,6 +736,21 @@ H5HF_man_dblock_build_freelist(H5HF_direct_t *dblock)
node->prev = prev_node;
node->next = NULL;
+ /* Create free list section node */
+ if(NULL == (sec_node = H5FL_MALLOC(H5HF_section_free_node_t)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct block free list section")
+
+ /* Set section's information */
+ sec_node->block_addr = dblock_addr;
+ sec_node->block_size = dblock->size;
+ sec_node->sect_addr = dblock_addr + node->my_offset;
+ /* (section size is "object size", without the metadata overhead) */
+ sec_node->sect_size = node->size - H5HF_MAN_ABS_DIRECT_OBJ_PREFIX_LEN_DBLOCK(shared, dblock);
+
+ /* Add new free space to the global list of space */
+ if(H5HF_flist_add(shared->flist, sec_node, &sec_node->sect_size, &sec_node->sect_addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add direct block free space to global list")
+
/* Update trailing info */
prev_node->next = node;
prev_off = next_off;
@@ -559,34 +770,260 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5HF_man_dblock_insert
+ * Function: H5HF_man_dblock_new
*
- * Purpose: Allocate space in a managed direct block
+ * Purpose: Create a direct block large enough to hold an object of
+ * the requested size
*
* Return: SUCCEED/FAIL
*
* Programmer: Quincey Koziol
* koziol@ncsa.uiuc.edu
- * Feb 28 2006
+ * Mar 13 2006
*
*-------------------------------------------------------------------------
*/
static herr_t
-H5HF_man_dblock_insert(H5RC_t *fh_shared, hid_t dxpl_id, haddr_t block_addr,
- size_t block_size, size_t obj_size, const void *obj, void *id)
+H5HF_man_dblock_new(H5RC_t *fh_shared, hid_t dxpl_id, size_t request)
+{
+ size_t min_dblock_size; /* Min. size of direct block to allocate */
+ H5HF_shared_t *shared; /* Shared heap information */
+ herr_t ret_value = SUCCEED; /* Return value */
+
+ FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_new)
+#ifdef QAK
+HDfprintf(stderr, "%s: request = %Zu\n", FUNC, request);
+#endif /* QAK */
+
+ /*
+ * Check arguments.
+ */
+ HDassert(fh_shared);
+ HDassert(request > 0);
+
+ /* Get the pointer to the shared heap info */
+ shared = H5RC_GET_OBJ(fh_shared);
+ HDassert(shared);
+
+ /* Compute the min. size of the direct block needed to fulfill the request */
+ if(request < shared->man_dtable.cparam.start_block_size)
+ min_dblock_size = shared->man_dtable.cparam.start_block_size;
+ else {
+ min_dblock_size = 2 * H5V_log2_gen((hsize_t)request);
+ HDassert(min_dblock_size <= shared->man_dtable.cparam.max_direct_size);
+ } /* end else */
+
+ /* Adjust the size of block needed to fulfill request, with overhead */
+#ifdef QAK
+HDfprintf(stderr, "%s: H5HF_MAN_ABS_DIRECT_OVERHEAD_SIZE = %u\n", FUNC, H5HF_MAN_ABS_DIRECT_OVERHEAD_SIZE(shared, shared->man_dtable.cparam.start_block_size));
+HDfprintf(stderr, "%s: H5HF_MAN_ABS_DIRECT_OBJ_PREFIX_LEN_SIZE = %u\n", FUNC, H5HF_MAN_ABS_DIRECT_OBJ_PREFIX_LEN_SIZE(shared, shared->man_dtable.cparam.start_block_size));
+#endif /* QAK */
+ if((min_dblock_size - request) < (H5HF_MAN_ABS_DIRECT_OVERHEAD_SIZE(shared, min_dblock_size)
+ + H5HF_MAN_ABS_DIRECT_OBJ_PREFIX_LEN_SIZE(shared, min_dblock_size)))
+ min_dblock_size *= 2;
+#ifdef QAK
+HDfprintf(stderr, "%s: min_dblock_size = %Zu\n", FUNC, min_dblock_size);
+HDfprintf(stderr, "%s: shared->man_dtable.next_dir_size = %Zu\n", FUNC, shared->man_dtable.next_dir_size);
+#endif /* QAK */
+
+ /* Add direct block to heap */
+ if(min_dblock_size <= shared->man_dtable.next_dir_size) {
+ haddr_t dblock_addr; /* Address of new direct block */
+ size_t dblock_size; /* SIze of new direct block */
+
+ /* Create new direct block */
+ dblock_size = shared->man_dtable.next_dir_size;
+ if(H5HF_man_dblock_create(fh_shared, dxpl_id, dblock_size, shared->man_dtable.next_dir_block, &dblock_addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap direct block")
+#ifdef QAK
+HDfprintf(stderr, "%s: dblock_addr = %a\n", FUNC, dblock_addr);
+HDfprintf(stderr, "%s: shared->man_dtable.next_dir_block = %Hu\n", FUNC, shared->man_dtable.next_dir_block);
+#endif /* QAK */
+
+ /* Check if this is the first block in the heap */
+ if(shared->man_dtable.next_dir_block == 0) {
+ /* Point root at new direct block */
+ shared->man_dtable.curr_root_rows = 0;
+ shared->man_dtable.table_addr = dblock_addr;
+ } /* end if */
+ /* Check for the second block in the heap */
+ else if(shared->man_dtable.curr_root_rows == 0) {
+ H5HF_indirect_t *iblock = NULL; /* Pointer to indirect block to create */
+ H5HF_direct_t *dblock = NULL; /* Pointer to direct block to query */
+ haddr_t iblock_addr; /* Indirect block's address */
+ unsigned nrows; /* Number of rows for root indirect block */
+
+ /* Check for allocating entire root indirect block initially */
+ if(shared->man_dtable.cparam.start_root_rows == 0)
+ nrows = shared->man_dtable.max_root_indirect_rows;
+ else
+ nrows = shared->man_dtable.cparam.start_root_rows;
+
+ /* Allocate root indirect block */
+ if(H5HF_man_iblock_create(fh_shared, dxpl_id, (hsize_t)0, nrows, &iblock_addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap indirect block")
+#ifdef QAK
+HDfprintf(stderr, "%s: iblock_addr = %a\n", FUNC, iblock_addr);
+#endif /* QAK */
+
+ /* Lock indirect block */
+ if(NULL == (iblock = H5AC_protect(shared->f, dxpl_id, H5AC_FHEAP_IBLOCK, iblock_addr, &nrows, fh_shared, H5AC_WRITE)))
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
+
+ /* Lock first (root) direct block */
+ if(NULL == (dblock = H5AC_protect(shared->f, dxpl_id, H5AC_FHEAP_DBLOCK, shared->man_dtable.table_addr, &shared->man_dtable.cparam.start_block_size, fh_shared, H5AC_READ)))
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
+
+ /* Point indirect block at direct block to add */
+ iblock->dblock_ents[0].addr = shared->man_dtable.table_addr;
+ iblock->dblock_ents[0].free_space = dblock->blk_free_space;
+
+ /* Unlock first (root) direct block */
+ if(H5AC_unprotect(shared->f, dxpl_id, H5AC_FHEAP_DBLOCK, shared->man_dtable.table_addr, dblock, H5AC__NO_FLAGS_SET) < 0)
+ HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
+ dblock = NULL;
+
+ /* Lock new direct block */
+ if(NULL == (dblock = H5AC_protect(shared->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, &shared->man_dtable.cparam.start_block_size, fh_shared, H5AC_READ)))
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
+
+ /* Point indirect block at new direct block */
+ iblock->dblock_ents[1].addr = dblock_addr;
+ iblock->dblock_ents[1].free_space = dblock->blk_free_space;
+
+ /* Unlock new direct block */
+ if(H5AC_unprotect(shared->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET) < 0)
+ HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
+ dblock = NULL;
+
+ /* Point heap header at new indirect block */
+ shared->man_dtable.curr_root_rows = nrows;
+ shared->man_dtable.table_addr = iblock_addr;
+
+ /* Mark heap header as modified */
+ shared->dirty = TRUE;
+
+ /* Release the indirect block (marked as dirty) */
+ if(H5AC_unprotect(shared->f, dxpl_id, H5AC_FHEAP_IBLOCK, iblock_addr, iblock, H5AC__DIRTIED_FLAG) < 0)
+ HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+ } /* end if */
+ else {
+HDfprintf(stderr, "%s: Adding >2nd direct block to heap not supported\n", FUNC);
+HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "allocating objects from non root block not supported yet")
+ } /* end else */
+
+ /* Update shared info */
+ shared->man_dtable.next_dir_block += dblock_size;
+
+ /* Increment size of next block */
+ H5HF_man_dblock_inc_size(shared);
+ } /* end if */
+ else {
+HDfprintf(stderr, "%s: Skipping direct block sizes not supported\n", FUNC);
+HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "allocating objects from non root block not supported yet")
+ } /* end else */
+
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5HF_man_dblock_new() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5HF_man_find
+ *
+ * Purpose: Find space for an object in a managed obj. heap
+ *
+ * Return: Non-negative on success (with direct block info
+ * filled in), negative on failure
+ *
+ * Programmer: Quincey Koziol
+ * koziol@ncsa.uiuc.edu
+ * Mar 13 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5HF_man_find(H5RC_t *fh_shared, hid_t dxpl_id, size_t request,
+ H5HF_section_free_node_t **sec_node/*out*/)
+{
+ H5HF_shared_t *shared; /* Shared heap information */
+ htri_t node_found; /* Whether an existing free list node was found */
+ herr_t ret_value = SUCCEED; /* Return value */
+
+ FUNC_ENTER_NOAPI_NOINIT(H5HF_man_find)
+#ifdef QAK
+HDfprintf(stderr, "%s: request = %Zu\n", FUNC, request);
+#endif /* QAK */
+
+ /*
+ * Check arguments.
+ */
+ HDassert(fh_shared);
+ HDassert(request > 0);
+ HDassert(sec_node);
+
+ /* Get the pointer to the shared heap info */
+ shared = H5RC_GET_OBJ(fh_shared);
+ HDassert(shared);
+
+ /* Look for free space in global free list */
+ if((node_found = H5HF_flist_find(shared->flist, request, (void **)sec_node)) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't locate free space in fractal heap direct block")
+
+/* XXX: Make certain we've loaded all the direct blocks in the heap */
+
+ /* If we didn't find a node, go make one big enough to hold the requested block */
+ if(!node_found) {
+ /* Allocate direct block big enough to hold requested size */
+ if(H5HF_man_dblock_new(fh_shared, dxpl_id, request) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTCREATE, FAIL, "can't create fractal heap direct block")
+
+ /* Request space from the free list */
+ /* (Ought to be able to be filled, now) */
+ if(H5HF_flist_find(shared->flist, request, (void **)sec_node) <= 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't locate free space in fractal heap direct block")
+ } /* end if */
+ HDassert(*sec_node);
+#ifdef QAK
+HDfprintf(stderr, "%s: (*sec_node)->block_addr = %a\n", FUNC, (*sec_node)->block_addr);
+HDfprintf(stderr, "%s: (*sec_node)->block_size = %Zu\n", FUNC, (*sec_node)->block_size);
+HDfprintf(stderr, "%s: (*sec_node)->sect_addr = %a\n", FUNC, (*sec_node)->sect_addr);
+HDfprintf(stderr, "%s: (*sec_node)->sect_size = %Zu\n", FUNC, (*sec_node)->sect_size);
+#endif /* QAK */
+
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5HF_man_find() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5HF_man_insert
+ *
+ * Purpose: Insert an object in a managed direct block
+ *
+ * Return: SUCCEED/FAIL
+ *
+ * Programmer: Quincey Koziol
+ * koziol@ncsa.uiuc.edu
+ * Mar 13 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5HF_man_insert(H5RC_t *fh_shared, hid_t dxpl_id, H5HF_section_free_node_t *sec_node,
+ size_t obj_size, const void *obj, void *id)
{
- H5HF_direct_t *dblock = NULL; /* Pointer to direct block to modify */
H5HF_shared_t *shared; /* Pointer to shared heap info */
+ H5HF_direct_t *dblock = NULL; /* Pointer to direct block to modify */
+ haddr_t dblock_addr; /* Direct block address */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_insert)
+ FUNC_ENTER_NOAPI_NOINIT(H5HF_man_insert)
/*
* Check arguments.
*/
HDassert(fh_shared);
- HDassert(H5F_addr_defined(block_addr));
- HDassert(block_size > 0);
HDassert(obj_size > 0);
HDassert(obj);
HDassert(id);
@@ -596,127 +1033,268 @@ H5HF_man_dblock_insert(H5RC_t *fh_shared, hid_t dxpl_id, haddr_t block_addr,
HDassert(shared);
/* Lock direct block */
- if(NULL == (dblock = H5AC_protect(shared->f, dxpl_id, H5AC_FHEAP_DBLOCK, block_addr, &block_size, fh_shared, H5AC_WRITE)))
+ dblock_addr = sec_node->block_addr;
+ if(NULL == (dblock = H5AC_protect(shared->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, &sec_node->block_size, fh_shared, H5AC_WRITE)))
HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap direct block")
+ /* Insert object into block */
+
/* Check for address mapping type */
if(shared->addrmap == H5HF_ABSOLUTE) {
- H5HF_direct_free_node_t *node; /* Pointer to free list node for block */
- size_t full_obj_size; /* Size of object including metadata */
- size_t obj_off; /* Offset of object within block */
- hbool_t found; /* Flag to indicate we found a node with enough free space */
+ H5HF_direct_free_node_t *node; /* Block's free list node */
+ uint8_t *p; /* Temporary pointer to obj info in block */
+ size_t obj_off; /* Offset of object within block */
+ size_t full_obj_size; /* Size of object including metadata */
+ size_t alloc_obj_size; /* Size of object including metadata & any free space fragment */
+ unsigned char free_frag_size; /* Size of free space fragment */
+
+ /* Locate "local" free list node for section */
+/* XXX: Change to using skip list */
+ obj_off = sec_node->sect_addr - sec_node->block_addr;
+ node = dblock->free_list->first;
+ while(node->my_offset != obj_off)
+ node = node->next;
/* Compute full object size, with metadata for object */
full_obj_size = obj_size + H5HF_MAN_ABS_DIRECT_OBJ_PREFIX_LEN_DBLOCK(shared, dblock);
- /* Sanity check */
+ /* Sanity checks */
HDassert(dblock->blk_free_space >= full_obj_size);
-
- /* Check for valid free list */
- if(!dblock->free_list)
- if(H5HF_man_dblock_build_freelist(dblock) < 0)
- HGOTO_ERROR(H5E_HEAP, H5E_CANTDECODE, FAIL, "can't decode free list for block")
HDassert(dblock->free_list);
-
- /* Search free list for block large enough to fit object */
- node = dblock->free_list->first;
- found = FALSE;
- while(node) {
- /* Check if this node is large enough to hold object */
- if(node->size >= full_obj_size) {
- /* Check for using exact free space available */
- if(node->size == full_obj_size) {
- /* Set the offset of the object within the block */
- obj_off = node->my_offset;
-
- /* Check for allocating from first node in list */
- if(node->prev == NULL) {
- /* Make the next node in the free list the list head */
- dblock->free_list->first = node->next;
- dblock->free_list_head = node->next_offset;
- } /* end if */
- else {
- H5HF_direct_free_node_t *prev_node; /* Pointer to previous free list node for block */
-
- /* Excise node from list */
- prev_node = node->prev;
- prev_node->next = node->next;
- if(node->next) {
- H5HF_direct_free_node_t *next_node; /* Pointer to next free list node for block */
-
- next_node = node->next;
- next_node->prev = prev_node;
- prev_node->next_offset = next_node->my_offset;
- } /* end if */
- else
- prev_node->next_offset = 0;
- } /* end if */
-
- /* Release the memory for the free list node */
- H5FL_FREE(H5HF_direct_free_node_t, node);
+ HDassert(node->size >= full_obj_size);
+
+ /* Check for using entire node */
+ free_frag_size = 0;
+ if(node->size <= (full_obj_size + H5HF_MAN_ABS_DIRECT_FREE_NODE_SIZE(dblock))) {
+ /* Set the offset of the object within the block */
+ obj_off = node->my_offset;
+
+ /* Check for allocating from first node in list */
+ if(node->prev == NULL) {
+ /* Make the next node in the free list the list head */
+ dblock->free_list->first = node->next;
+ dblock->free_list_head = node->next_offset;
+ } /* end if */
+ else {
+ H5HF_direct_free_node_t *prev_node; /* Pointer to previous free list node for block */
+
+ /* Excise node from list */
+ prev_node = node->prev;
+ prev_node->next = node->next;
+ if(node->next) {
+ H5HF_direct_free_node_t *next_node; /* Pointer to next free list node for block */
+
+ next_node = node->next;
+ next_node->prev = prev_node;
+ prev_node->next_offset = next_node->my_offset;
} /* end if */
- else {
- /* Allocate object from end of free space node */
- /* (so we don't have to play with the other node's info */
- obj_off = (node->my_offset + node->size) - full_obj_size;
- node->size -= full_obj_size;
- } /* end else */
-
- /* Reduce space available in block */
- dblock->blk_free_space -= full_obj_size;
-
- /* Mark free list as dirty */
- dblock->free_list->dirty = TRUE;
- found = TRUE;
+ else
+ prev_node->next_offset = 0;
} /* end if */
- /* Avance to next node */
- node = node->next;
- } /* end while */
+ /* Set the free fragment size */
+ free_frag_size = (unsigned char )(node->size - full_obj_size);
+
+ /* Release the memory for the free list node & section */
+ H5FL_FREE(H5HF_direct_free_node_t, node);
+ H5FL_FREE(H5HF_section_free_node_t, sec_node);
+ } /* end if */
+ else {
+ /* Allocate object from end of free space node */
+ /* (so we don't have to adjust with any other node's info */
+ obj_off = (node->my_offset + node->size) - full_obj_size;
+ node->size -= full_obj_size;
+
+ /* Adjust information for section node */
+ sec_node->sect_size -= full_obj_size;
+
+ /* Re-insert section node onto global list */
+ if(H5HF_flist_add(shared->flist, sec_node, &sec_node->sect_size, &sec_node->sect_addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add direct block free space to global list")
+ } /* end else */
+
+ /* Compute the size of the space to actually allocate */
+ /* (includes the metadata for the object & the free space fragment) */
+ alloc_obj_size = full_obj_size + free_frag_size;
- /* Encode metadata & copy object into block */
- if(found) {
- uint8_t *p; /* Temporary pointer to obj info */
+ /* Reduce space available in block */
+ dblock->blk_free_space -= alloc_obj_size;
- /* Point to location for object */
+ /* Mark free list as dirty */
+ dblock->free_list->dirty = TRUE;
+
+ /* Point to location for object */
+#ifdef QAK
HDfprintf(stderr, "%s: obj_off = %Zu\n", FUNC, obj_off);
+HDfprintf(stderr, "%s: free_frag_size = %Zu\n", FUNC, free_frag_size);
HDfprintf(stderr, "%s: full_obj_size = %Zu\n", FUNC, full_obj_size);
- p = dblock->blk + obj_off;
+HDfprintf(stderr, "%s: alloc_obj_size = %Zu\n", FUNC, alloc_obj_size);
+#endif /* QAK */
+ p = dblock->blk + obj_off;
+
+ /* Encode the length */
+ UINT64ENCODE_VAR(p, obj_size, dblock->blk_off_size);
- /* Encode the length, if required */
- if(!shared->fixed_len_obj)
- UINT64ENCODE_VAR(p, obj_size, dblock->blk_off_size);
+ /* Encode the free fragment size */
+ *p++ = free_frag_size;
- /* Encode a ref. count (of 1), if required */
- if(shared->ref_count_obj)
- UINT64ENCODE_VAR(p, 1, shared->ref_count_size);
+ /* Encode a ref. count (of 1), if required */
+ if(shared->ref_count_obj)
+ UINT64ENCODE_VAR(p, 1, shared->ref_count_size);
- /* Copy the object's data into the heap */
- HDmemcpy(p, obj, obj_size);
+ /* Copy the object's data into the heap */
+ HDmemcpy(p, obj, obj_size);
+ p += obj_size;
+
+#ifdef H5_USING_PURIFY
+ /* Zero out the free space fragment */
+ HDmemset(p, 0, free_frag_size);
+#endif /* H5_USING_PURIFY */
#ifndef NDEBUG
- p += obj_size;
+ p += free_frag_size;
#endif /* NDEBUG */
- /* Sanity check */
- HDassert((size_t)(p - (dblock->blk + obj_off)) == full_obj_size);
+ /* Sanity check */
+ HDassert((size_t)(p - (dblock->blk + obj_off)) == alloc_obj_size);
- /* Set the head ID for the new object */
+ /* Set the heap ID for the new object */
+#ifdef QAK
HDfprintf(stderr, "%s: dblock->block_off = %Hu\n", FUNC, dblock->block_off);
- UINT64ENCODE_VAR(id, (dblock->block_off + obj_off), shared->heap_off_size);
- } /* end if */
- else
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "no space for object in block")
+#endif /* QAK */
+ UINT64ENCODE_VAR(id, (dblock->block_off + obj_off), shared->heap_off_size);
+
+ /* Update shared heap info */
+ shared->total_man_free -= alloc_obj_size;
} /* end if */
else {
HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "inserting within mapped managed blocks not supported yet")
} /* end else */
+ /* Update statistics about heap */
+ shared->nobjs++;
+
+ /* Mark heap header as modified */
+ shared->dirty = TRUE;
+
done:
/* Release the direct block (marked as dirty) */
- if(dblock && H5AC_unprotect(shared->f, dxpl_id, H5AC_FHEAP_DBLOCK, block_addr, dblock, H5AC__DIRTIED_FLAG) < 0)
+ if(dblock && H5AC_unprotect(shared->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, H5AC__DIRTIED_FLAG) < 0)
HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5HF_man_dblock_insert() */
+} /* end H5HF_man_insert() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5HF_man_iblock_create
+ *
+ * Purpose: Allocate & initialize a managed indirect block
+ *
+ * Return: Pointer to new direct block on success, NULL on failure
+ *
+ * Programmer: Quincey Koziol
+ * koziol@ncsa.uiuc.edu
+ * Mar 6 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5HF_man_iblock_create(H5RC_t *fh_shared, hid_t dxpl_id,
+ hsize_t block_off, unsigned nrows, haddr_t *addr_p)
+{
+ H5HF_shared_t *shared; /* Pointer to shared heap info */
+ H5HF_indirect_t *iblock = NULL; /* Pointer to indirect block */
+ size_t u; /* Local index variable */
+ herr_t ret_value = SUCCEED; /* Return value */
+
+ FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_create)
+
+ /*
+ * Check arguments.
+ */
+ HDassert(fh_shared);
+ HDassert(nrows > 0);
+ HDassert(addr_p);
+
+ /*
+ * Allocate file and memory data structures.
+ */
+ if(NULL == (iblock = H5FL_MALLOC(H5HF_indirect_t)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fractal heap indirect block")
+
+ /* Reset the metadata cache info for the heap header */
+ HDmemset(&iblock->cache_info, 0, sizeof(H5AC_info_t));
+
+ /* Share common heap information */
+ iblock->shared = fh_shared;
+ H5RC_INC(iblock->shared);
+
+ /* Get the pointer to the shared B-tree info */
+ shared = H5RC_GET_OBJ(iblock->shared);
+ HDassert(shared);
+
+#ifdef QAK
+HDfprintf(stderr, "%s: nrows = %u\n", FUNC, nrows);
+#endif /* QAK */
+ /* Set info for direct block */
+ iblock->block_off = block_off;
+ iblock->nrows = nrows;
+ if(iblock->nrows > shared->man_dtable.max_direct_rows) {
+ iblock->ndir_rows = shared->man_dtable.max_direct_rows;
+ iblock->nindir_rows = iblock->nrows - iblock->ndir_rows;
+ } /* end if */
+ else {
+ iblock->ndir_rows = iblock->nrows;
+ iblock->nindir_rows = 0;
+ } /* end else */
+
+ /* Compute size of buffer needed for indirect block */
+ iblock->size = H5HF_MAN_INDIRECT_SIZE(shared, iblock);
+
+ /* Allocate indirect block entry tables */
+ if(NULL == (iblock->dblock_ents = H5FL_SEQ_MALLOC(H5HF_indirect_dblock_ent_t, (iblock->ndir_rows * shared->man_dtable.cparam.width))))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct entries")
+ if(iblock->nindir_rows > 0) {
+ if(NULL == (iblock->iblock_ents = H5FL_SEQ_MALLOC(H5HF_indirect_iblock_ent_t, (iblock->nindir_rows * shared->man_dtable.cparam.width))))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for indirect entries")
+ } /* end if */
+ else
+ iblock->iblock_ents = NULL;
+
+ /* Initialize indirect block entry tables */
+ for(u = 0; u < (iblock->ndir_rows * shared->man_dtable.cparam.width); u++) {
+ iblock->dblock_ents[u].addr = HADDR_UNDEF;
+ iblock->dblock_ents[u].free_space = 0;
+ } /* end for */
+ for(u = 0; u < (iblock->nindir_rows * shared->man_dtable.cparam.width); u++)
+ iblock->iblock_ents[u].addr = HADDR_UNDEF;
+
+ /* Allocate space for the header on disk */
+ if(HADDR_UNDEF == (*addr_p = H5MF_alloc(shared->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap header")
+
+/* XXX: Update indirect statistics when they are added */
+#ifdef LATER
+ /* Update shared heap info */
+ shared->total_man_free += dblock->blk_free_space;
+ shared->man_dtable.next_dir_block += dblock->size;
+ shared->total_size += dblock->size;
+ shared->man_size += dblock->size;
+
+ /* Mark heap header as modified */
+ shared->dirty = TRUE;
+#endif /* LATER */
+
+ /* Cache the new fractal heap header */
+ if(H5AC_set(shared->f, dxpl_id, H5AC_FHEAP_IBLOCK, *addr_p, iblock, H5AC__NO_FLAGS_SET) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap indirect block to cache")
+
+done:
+ if(ret_value < 0)
+ if(iblock)
+ (void)H5HF_cache_iblock_dest(shared->f, iblock);
+
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5HF_man_iblock_create() */