summaryrefslogtreecommitdiffstats
path: root/src/H5ACprivate.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/H5ACprivate.h')
-rw-r--r--src/H5ACprivate.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 85ff692..05d1904 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -22,10 +22,6 @@
* Purpose: Constants and typedefs available to the rest of the
* library.
*
- * Modifications: JRM - 6/4/04
- * Complete re-write for a new caching algorithm
- * located in H5C.c
- *
*-------------------------------------------------------------------------
*/
@@ -36,8 +32,8 @@
/* Pivate headers needed by this header */
#include "H5private.h" /* Generic Functions */
+#include "H5Cprivate.h" /* Cache */
#include "H5Fprivate.h" /* File access */
-#include "H5Cprivate.h" /* cache */
#ifdef H5_METADATA_TRACE_FILE
#define H5AC__TRACE_FILE_ENABLED 1
@@ -146,7 +142,7 @@ typedef H5C_clear_func_t H5AC_clear_func_t;
typedef H5C_notify_func_t H5AC_notify_func_t;
typedef H5C_size_func_t H5AC_size_func_t;
-typedef H5C_class_t H5AC_class_t;
+typedef H5C_class_t H5AC_class_t;
/* The H5AC_NSLOTS #define is now obsolete, as the metadata cache no longer
@@ -165,7 +161,7 @@ typedef H5C_class_t H5AC_class_t;
#define H5AC_NSLOTS 10330 /* The library "likes" this number... */
-typedef H5C_cache_entry_t H5AC_info_t;
+typedef H5C_cache_entry_t H5AC_info_t;
/*===----------------------------------------------------------------------===
@@ -216,7 +212,7 @@ extern hid_t H5AC_ind_dxpl_id;
#ifdef H5_HAVE_PARALLEL
#define H5AC__DEFAULT_CACHE_CONFIG \
{ \
- /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER, \
+ /* int version = */ H5AC__CURR_CACHE_CONFIG_VERSION, \
/* hbool_t rpt_fcn_enabled = */ FALSE, \
/* hbool_t open_trace_file = */ FALSE, \
/* hbool_t close_trace_file = */ FALSE, \
@@ -226,7 +222,7 @@ extern hid_t H5AC_ind_dxpl_id;
/* size_t initial_size = */ ( 2 * 1024 * 1024), \
/* double min_clean_fraction = */ 0.3, \
/* size_t max_size = */ (32 * 1024 * 1024), \
- /* size_t min_size = */ ( 1 * 1024 * 1024), \
+ /* size_t min_size = */ (1 * 1024 * 1024), \
/* long int epoch_length = */ 50000, \
/* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold, \
/* double lower_hr_threshold = */ 0.9, \
@@ -237,7 +233,7 @@ extern hid_t H5AC_ind_dxpl_id;
/* flash_incr_mode = */ H5C_flash_incr__add_space, \
/* double flash_multiple = */ 1.0, \
/* double flash_threshold = */ 0.25, \
- /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,\
+ /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold, \
/* double upper_hr_threshold = */ 0.999, \
/* double decrement = */ 0.9, \
/* hbool_t apply_max_decrement = */ TRUE, \
@@ -324,7 +320,7 @@ extern hid_t H5AC_ind_dxpl_id;
H5_DLL herr_t H5AC_init(void);
H5_DLL herr_t H5AC_create(const H5F_t *f, H5AC_cache_config_t *config_ptr);
-H5_DLL herr_t H5AC_get_entry_status(const H5F_t * f, haddr_t addr,
+H5_DLL herr_t H5AC_get_entry_status(const H5F_t *f, haddr_t addr,
unsigned * status_ptr);
H5_DLL herr_t H5AC_set(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type,
haddr_t addr, void *thing, unsigned int flags);