summaryrefslogtreecommitdiffstats
path: root/src/H5ACpublic.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-03-26 03:17:42 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-03-26 03:17:42 (GMT)
commit49cd4a1f3affeaff363242114ca89f9c61876e0e (patch)
tree624777f4ef5f28e5a3e010e4397c75e52f7cd02f /src/H5ACpublic.h
parent9a359c82243eb630ab4338dba08796d2d7e43e1a (diff)
downloadhdf5-49cd4a1f3affeaff363242114ca89f9c61876e0e.zip
hdf5-49cd4a1f3affeaff363242114ca89f9c61876e0e.tar.gz
hdf5-49cd4a1f3affeaff363242114ca89f9c61876e0e.tar.bz2
[svn-r18460] Description:
Fold metadata journaling changes into the trunk: mostly tweaky small stuff, also removed the H5F_t* field from the H5G_entry_t struct. 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, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5ACpublic.h')
-rw-r--r--src/H5ACpublic.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/H5ACpublic.h b/src/H5ACpublic.h
index 3c62fbf..02941b6 100644
--- a/src/H5ACpublic.h
+++ b/src/H5ACpublic.h
@@ -36,8 +36,6 @@
extern "C" {
#endif
-#define H5AC__MAX_TRACE_FILE_NAME_LEN 1024
-
/****************************************************************************
*
* structure H5AC_cache_config_t
@@ -240,8 +238,8 @@ extern "C" {
* stay within max_size.
*
* With a little thought, it should be obvious that the above flash
- * cache size increase algorithm is not sufficient for all circumstances --
- * for example, suppose the user round robins through
+ * cache size increase algorithm is not sufficient for all circumstances
+ * -- for example, suppose the user round robins through
* (1/flash_threshold) +1 groups, adding one data set to each on each
* pass. Then all will increase in size at about the same time, requiring
* the max cache size to at least double to maintain acceptable
@@ -257,13 +255,12 @@ extern "C" {
* flash_incr_mode section. This field is ignored unless flash_incr_mode
* is H5C_flash_incr__add_space.
*
- * flash_threshold: Double containing the factor by which current max cache size
- * is multiplied to obtain the size threshold for the add_space flash
+ * flash_threshold: Double containing the factor by which current max cache
+ * size is multiplied to obtain the size threshold for the add_space flash
* increment algorithm. The field is ignored unless flash_incr_mode is
* H5C_flash_incr__add_space.
*
*
- *
* Cache size decrease control fields:
*
* decr_mode: Instance of the H5C_cache_decr_mode enumerated type whose
@@ -383,7 +380,8 @@ extern "C" {
*
****************************************************************************/
-#define H5AC__CURR_CACHE_CONFIG_VERSION 1
+#define H5AC__CURR_CACHE_CONFIG_VERSION 1
+#define H5AC__MAX_TRACE_FILE_NAME_LEN 1024
typedef struct H5AC_cache_config_t
{