[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

1 files changed, 49 insertions, 49 deletions

diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index e910e95..e7db92b 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -17,7 +17,7 @@
  * Programmer: John Mainzer -- 10/12/04
  *
  * Purpose:     This file contains declarations which are normally visible
- *              only within the H5C package (just H5C.c at present).
+ *              only within the H5C package.
  *
  *		Source files outside the H5C package should include
  *		H5Cprivate.h instead.
@@ -50,6 +50,8 @@
  * #define is used to set an upper limit on the number of passes.
  * The current value was obtained via personal communication with
  * Quincey.  I have applied a fudge factor of 2.
+ *
+ *						-- JRM
  */
 
 #define H5C__MAX_PASSES_ON_FLUSH	4
@@ -94,10 +96,11 @@
  *
  *						JRM - 9/26/05
  *
- * magic:	Unsigned 32 bit integer always set to H5C__H5C_T_MAGIC.  This
- *		field is used to validate pointers to instances of H5C_t.
+ * magic:	Unsigned 32 bit integer always set to H5C__H5C_T_MAGIC.  
+ * 		This field is used to validate pointers to instances of 
+ * 		H5C_t.
  *
- * flush_in_progress: Boolean flag indicating whether a flush is in
+ * flush_in_progress: Boolean flag indicating whether a flush is in 
  * 		progress.
  *
  * trace_file_ptr:  File pointer pointing to the trace file, which is used
@@ -106,7 +109,7 @@
  *              no trace file should be recorded.
  *
  *              Since much of the code supporting the parallel metadata
- *              cache is in H5AC, we don't write the trace file from
+ *              cache is in H5AC, we don't write the trace file from 
  *              H5C.  Instead, H5AC reads the trace_file_ptr as needed.
  *
  *              When we get to using H5C in other places, we may add
@@ -123,9 +126,9 @@
  *		indexed by the ids.
  *
  * type_name_table_ptr: Pointer to an array of pointer to char of length
- *		max_type_id + 1.  The strings pointed to by the entries
- *		in the array are the names of the entry types associated
- *		with the indexing type IDs.
+ *              max_type_id + 1.  The strings pointed to by the entries
+ *              in the array are the names of the entry types associated
+ *              with the indexing type IDs.
  *
  * max_cache_size:  Nominal maximum number of bytes that may be stored in the
  *              cache.  This value should be viewed as a soft limit, as the
@@ -179,10 +182,10 @@
  * writes.  The following field is used to implement this.
  *
  * evictions_enabled:  Boolean flag that is initialized to TRUE.  When
- * 		this flag is set to FALSE, the metadata cache will not
+ * 		this flag is set to FALSE, the metadata cache will not 
  * 		attempt to evict entries to make space for newly protected
  * 		entries, and instead the will grow without limit.
- *
+ * 		
  * 		Needless to say, this feature must be used with care.
  *
  *
@@ -285,7 +288,7 @@
  * following two fields have been added.  They are only compiled in when
  * H5C_DO_SANITY_CHECKS is TRUE.
  *
- * slist_len_increase: Number of entries that have been added to the
+ * slist_len_increase: Number of entries that have been added to the 
  * 		slist since the last time this field was set to zero.
  *
  * slist_size_increase: Total size of all entries that have been added
@@ -496,16 +499,16 @@
  *		we receive a new configuration.
  *
  * flash_size_increase_possible: Depending on the configuration data given
- * 		in the resize_ctl field, it may or may not be possible
- * 		for a flash size increase to occur.  We set this flag
- * 		whenever we receive a new configuration so as to avoid
- * 		repeated calculations.
+ *              in the resize_ctl field, it may or may not be possible
+ *              for a flash size increase to occur.  We set this flag
+ *              whenever we receive a new configuration so as to avoid
+ *              repeated calculations.
  *
  * flash_size_increase_threshold: If a flash cache size increase is possible,
- * 		this field is used to store the minimum size of a new entry
- * 		or size increase needed to trigger a flash cache size
- * 		increase.  Note that this field must be updated whenever
- * 		the size of the cache is changed.
+ *              this field is used to store the minimum size of a new entry
+ *              or size increase needed to trigger a flash cache size
+ *              increase.  Note that this field must be updated whenever
+ *              the size of the cache is changed.
  *
  * size_decrease_possible:  Depending on the configuration data given
  *              in the resize_ctl field, it may or may not be possible
@@ -622,23 +625,23 @@
  *		equal to the array index has not been in cache when
  *		requested in the current epoch.
  *
- * write_protects:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The
- *		cells are used to record the number of times an entry with
- *		type id equal to the array index has been write protected
- *		in the current epoch.
+ * write_protects:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The 
+ * 		cells are used to record the number of times an entry with 
+ * 		type id equal to the array index has been write protected 
+ * 		in the current epoch.
  *
  * 		Observe that (hits + misses) = (write_protects + read_protects).
  *
- * read_protects: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
- *              are used to record the number of times an entry with type id
- *              equal to the array index has been read protected in the
- *              current epoch.
+ * read_protects: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The 
+ * 		cells are used to record the number of times an entry with 
+ * 		type id equal to the array index has been read protected in 
+ * 		the current epoch.
  *
  *              Observe that (hits + misses) = (write_protects + read_protects).
  *
- * max_read_protects:  Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1.
- * 		The cells are used to maximum number of simultaneous read
- * 		protects on any entry with type id equal to the array index
+ * max_read_protects:  Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1. 
+ * 		The cells are used to maximum number of simultaneous read 
+ * 		protects on any entry with type id equal to the array index 
  * 		in the current epoch.
  *
  * insertions:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
@@ -646,9 +649,9 @@
  *		id equal to the array index has been inserted into the
  *		cache in the current epoch.
  *
- * pinned_insertions:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.
- * 		The cells are used to record the number of times an entry
- * 		with type id equal to the array index has been inserted
+ * pinned_insertions:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  
+ * 		The cells are used to record the number of times an entry 
+ * 		with type id equal to the array index has been inserted 
  * 		pinned into the cache in the current epoch.
  *
  * clears:      Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
@@ -671,13 +674,13 @@
  *		id equal to the array index has been renamed in the current
  *		epoch.
  *
- * entry_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.
- * 		The cells are used to record the number of times an entry
+ * entry_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  
+ * 		The cells are used to record the number of times an entry 
  * 		with type id equal to the array index has been renamed
  * 		during its flush callback in the current epoch.
  *
- * cache_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.
- * 		The cells are used to record the number of times an entry
+ * cache_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  
+ * 		The cells are used to record the number of times an entry 
  * 		with type id equal to the array index has been renamed
  * 		during a cache flush in the current epoch.
  *
@@ -716,14 +719,14 @@
  *		with type id equal to the array index has decreased in
  *		size in the current epoch.
  *
- * entry_flush_size_changes:  Array of int64 of length
- * 		H5C__MAX_NUM_TYPE_IDS + 1.  The cells are used to record
- * 		the number of times an entry with type id equal to the
+ * entry_flush_size_changes:  Array of int64 of length 
+ * 		H5C__MAX_NUM_TYPE_IDS + 1.  The cells are used to record 
+ * 		the number of times an entry with type id equal to the 
  * 		array index has changed size while in its flush callback.
  *
- * cache_flush_size_changes:  Array of int64 of length
- * 		H5C__MAX_NUM_TYPE_IDS + 1.  The cells are used to record
- * 		the number of times an entry with type id equal to the
+ * cache_flush_size_changes:  Array of int64 of length 
+ * 		H5C__MAX_NUM_TYPE_IDS + 1.  The cells are used to record 
+ * 		the number of times an entry with type id equal to the 
  * 		array index has changed size during a cache flush
  *
  * total_ht_insertions: Number of times entries have been inserted into the
@@ -966,10 +969,8 @@ struct H5C_t
     int64_t                     pinned_clears[H5C__MAX_NUM_TYPE_IDS + 1];
     int64_t                     size_increases[H5C__MAX_NUM_TYPE_IDS + 1];
     int64_t                     size_decreases[H5C__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     entry_flush_size_changes
-	    				[H5C__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     cache_flush_size_changes
-	    				[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     entry_flush_size_changes[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     cache_flush_size_changes[H5C__MAX_NUM_TYPE_IDS + 1];
 
     int64_t			total_ht_insertions;
     int64_t			total_ht_deletions;
@@ -1022,7 +1023,6 @@ struct H5C_t
 /***************************** Macro Definitions ****************************/
 /****************************************************************************/
 
-
 /****************************************************************************
  *
  * We maintain doubly linked lists of instances of H5C_cache_entry_t for a
@@ -1449,7 +1449,7 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
  * 	More pinned entry stats related updates.
  *
  * 	JRM -- 3/31/07
- * 	Updated H5C__UPDATE_STATS_FOR_PROTECT() to keep stats on
+ * 	Updated H5C__UPDATE_STATS_FOR_PROTECT() to keep stats on 
  * 	read and write protects.
  *
  *      MAM -- 1/15/09