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

[svn-r28616] Normalization of H5HL package with revise_chunks.

Browse Source 
NOTE: Flush dependency code was not moved.

Tested on:
    Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1 w/ CMake 3.3.2
    serial only (Autotools and CMake since new files were added)
    (these changes have been in revise_chunks for a long time)
This commit is contained in:
Dana Robinson
2015-12-14 00:34:41 -05:00
parent 91f01bd702
commit 3cdcdbc03e
11 changed files with 1028 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/H5HLpkg.h
View File

@@ -14,7 +14,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@ncsa.uiuc.edu>
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
* Wednesday, July 9, 2003
*
* Purpose: This file contains declarations which are visible
@@ -32,7 +32,7 @@
#include "H5HLprivate.h"
/* Other private headers needed by this file */
#include "H5FLprivate.h" /* Free lists */
#include "H5FLprivate.h" /* Free lists */
/*****************************/
@@ -56,16 +56,26 @@ H5FL_BLK_EXTERN(lheap_chunk);
/* Package Private Macros */
/**************************/
#define H5HL_SIZEOF_HDR(F) \
H5HL_ALIGN(H5_SIZEOF_MAGIC + /*heap signature */ \
1 + /*version */ \
3 + /*reserved */ \
H5F_SIZEOF_SIZE(F) + /*data size */ \
H5F_SIZEOF_SIZE(F) + /*free list head */ \
H5F_SIZEOF_ADDR(F)) /*data address */
/* If this package header is being included in one of the H5HL source files,
* define the proper control macros for the generic FUNC_ENTER/LEAVE and
* error reporting macros.
*/
#ifdef H5HL_PACKAGE
#define H5_MY_PKG H5HL
#define H5_MY_PKG_ERR H5E_HEAP
#define H5_MY_PKG_INIT NO
#endif /* H5HL_PACKAGE */
#define H5HL_SIZEOF_HDR(F) \
H5HL_ALIGN(H5_SIZEOF_MAGIC + /* heap signature */ \
1 + /* version */ \
3 + /* reserved */ \
H5F_SIZEOF_SIZE(F) + /* data size */ \
H5F_SIZEOF_SIZE(F) + /* free list head */ \
H5F_SIZEOF_ADDR(F)) /* data address */
/* Value indicating end of free list on disk */
#define H5HL_FREE_NULL 1
#define H5HL_FREE_NULL 1
/****************************/
@@ -73,10 +83,10 @@ H5FL_BLK_EXTERN(lheap_chunk);
/****************************/
typedef struct H5HL_free_t {
size_t offset; /*offset of free block */
size_t size; /*size of free block */
struct H5HL_free_t *prev; /*previous entry in free list */
struct H5HL_free_t *next; /*next entry in free list */
size_t offset; /* offset of free block */
size_t size; /* size of free block */
struct H5HL_free_t *prev; /* previous entry in free list */
struct H5HL_free_t *next; /* next entry in free list */
} H5HL_free_t;
/* Forward declarations */
@@ -85,38 +95,38 @@ typedef struct H5HL_prfx_t H5HL_prfx_t;
struct H5HL_t {
/* General heap-management fields */
size_t rc; /* Ref. count for prefix & data block using this struct */
size_t prots; /* # of times the heap has been protected */
size_t sizeof_size; /* Size of file sizes */
size_t sizeof_addr; /* Size of file addresses */
hbool_t single_cache_obj; /* Indicate if the heap is a single object in the cache */
H5HL_free_t *freelist; /*the free list */
size_t rc; /* Ref. count for prefix & data block using this struct */
size_t prots; /* # of times the heap has been protected */
size_t sizeof_size; /* Size of file sizes */
size_t sizeof_addr; /* Size of file addresses */
hbool_t single_cache_obj; /* Indicate if the heap is a single object in the cache */
H5HL_free_t *freelist; /* the free list */
/* Prefix-specific fields */
H5HL_prfx_t *prfx; /* The prefix object for the heap */
haddr_t prfx_addr; /* address of heap prefix */
size_t prfx_size; /* size of heap prefix */
hsize_t free_block; /* Address of first free block */
H5HL_prfx_t *prfx; /* The prefix object for the heap */
haddr_t prfx_addr; /* address of heap prefix */
size_t prfx_size; /* size of heap prefix */
hsize_t free_block; /* Address of first free block */
/* Data block-specific fields */
H5HL_dblk_t *dblk; /* The data block object for the heap */
haddr_t dblk_addr; /* address of data block */
size_t dblk_size; /* size of heap data block on disk and in mem */
uint8_t *dblk_image; /* The data block image */
H5HL_dblk_t *dblk; /* The data block object for the heap */
haddr_t dblk_addr; /* address of data block */
size_t dblk_size; /* size of heap data block on disk and in mem */
uint8_t *dblk_image; /* The data block image */
};
/* Struct for heap data block */
struct H5HL_dblk_t {
H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
/* first field in structure */
H5HL_t *heap; /* Pointer to heap for data block */
H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
/* first field in structure */
H5HL_t *heap; /* Pointer to heap for data block */
};
/* Struct for heap prefix */
struct H5HL_prfx_t {
H5AC_info_t cache_info; /* Information for H5AC cache functions, */
/* _must_ be first field in structure */
H5HL_t *heap; /* Pointer to heap for prefix */
H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
/* first field in structure */
H5HL_t *heap; /* Pointer to heap for prefix */
};
/* Callback information for loading local heap prefix from disk */
@@ -137,10 +147,10 @@ typedef struct H5HL_cache_prfx_ud_t {
/* Callback information for loading local heap data block from disk */
typedef struct H5HL_cache_dblk_ud_t {
/* Downwards */
H5HL_t *heap; /* Local heap */
H5HL_t *heap; /* Local heap */
/* Upwards */
hbool_t loaded; /* Whether data block was loaded from file */
hbool_t loaded; /* Whether data block was loaded from file */
} H5HL_cache_dblk_ud_t;
@@ -149,16 +159,18 @@ typedef struct H5HL_cache_dblk_ud_t {
/******************************/
/* Heap routines */
H5_DLL H5HL_t *H5HL_new(size_t sizeof_size, size_t sizeof_addr, size_t prfx_size);
H5_DLL herr_t H5HL_dest(H5HL_t *heap);
H5_DLL H5HL_t *H5HL__new(size_t sizeof_size, size_t sizeof_addr, size_t prfx_size);
H5_DLL herr_t H5HL__dest(H5HL_t *heap);
H5_DLL herr_t H5HL__inc_rc(H5HL_t *heap);
H5_DLL herr_t H5HL__dec_rc(H5HL_t *heap);
/* Heap prefix routines */
H5_DLL H5HL_prfx_t *H5HL_prfx_new(H5HL_t *heap);
H5_DLL herr_t H5HL_prfx_dest(H5HL_prfx_t *prfx);
H5_DLL H5HL_prfx_t *H5HL__prfx_new(H5HL_t *heap);
H5_DLL herr_t H5HL__prfx_dest(H5HL_prfx_t *prfx);
/* Heap data block routines */
H5_DLL H5HL_dblk_t *H5HL_dblk_new(H5HL_t *heap);
H5_DLL herr_t H5HL_dblk_dest(H5HL_dblk_t *dblk);
H5_DLL H5HL_dblk_t *H5HL__dblk_new(H5HL_t *heap);
H5_DLL herr_t H5HL__dblk_dest(H5HL_dblk_t *dblk);
H5_DLL herr_t H5HL__dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size);
#endif /* _H5HLpkg_H */