[svn-r10971] Purpose: Bug fix

Description: See details from Bug #213.  Family member file size wasn't saved
anywhere in file.  When family file is opened, the first member size determine
the member size.

Solution:  Hopefully, this is the last step of checkin for this stage.  This step
mainly enables h5repart tool to be able to convert file driver from family to
sec2.  Because the library saves family information in file, in trying to convert
to sec2 driver, the library simply change the address of driver information to
undefined so that the driver information block can be ignored.  This step also
updates the reference manual of H5Pset_fapl_family() and h5repart.

In the fifth step of checkin, backward compatibility with v1.6
is tested.  A family file created was created with the v1.6 library and opened
with this version of the library.

In the fourth step of checkin, a test suit is added for h5repart,
including a program to generate the test files, a script file to run h5repart,
and a program to verify repartitioned files can be opened by the library.

There's a change from the first step of checkin.  Family name template is no
longer saved in the superblock because different pathname can make the name
different.

In the third step of checkin, h5repart has been modified.  If h5repart is used
to change the size of family member file, the new size(actual member size) is saved
in the superblock.

In the second step of checkin, multi driver is checked against the driver
name saved in superblock.  Wrong driver will result in a failure with an error message
indicating
multi driver should be used.  This change includes split driver because it's a special
case for multi
driver.

In the first step of checkin.  Family member size and name template(unused at this stage) are saved
in file superblock.  When file is reopened,the size passed in thrin superblock.  A different size
will trigger a failure with an error message indicating the right size.  Wrong driver to open family
file will cause a failure, too.


Platforms tested: h5committest and fuss.

Misc. update: doc/html/RM_H5P.html and doc/html/Tools.html

3 files changed, 36 insertions, 4 deletions

diff --git a/src/H5F.c b/src/H5F.c
index 54dee30..63e108b 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -213,6 +213,7 @@ H5F_init_interface(void)
     H5F_close_degree_t close_degree     = H5F_CLOSE_DEGREE_DEF;
     hsize_t         family_offset       = H5F_ACS_FAMILY_OFFSET_DEF;
     hsize_t         family_newsize      = H5F_ACS_FAMILY_NEWSIZE_DEF;
+    hbool_t         family_to_sec2      = H5F_ACS_FAMILY_TO_SEC2_DEF;
     H5FD_mem_t      mem_type            = H5F_ACS_MULTI_TYPE_DEF;
 
     /* File mount property class variable. 
@@ -366,7 +367,11 @@ H5F_init_interface(void)
         /* Register the private property of new family file size. It's used by h5repart only. */
         if(H5P_register(acs_pclass,H5F_ACS_FAMILY_NEWSIZE_NAME,H5F_ACS_FAMILY_NEWSIZE_SIZE, &family_newsize,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
              HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-         
+
+        /* Register the private property of whether convert family to sec2 driver. It's used by h5repart only. */
+        if(H5P_register(acs_pclass,H5F_ACS_FAMILY_TO_SEC2_NAME,H5F_ACS_FAMILY_TO_SEC2_SIZE, &family_to_sec2,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+             HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+        
         /* Register the data type of multi driver info */
         if(H5P_register(acs_pclass,H5F_ACS_MULTI_TYPE_NAME,H5F_ACS_MULTI_TYPE_SIZE, &mem_type,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
              HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
@@ -1789,6 +1794,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d
     hbool_t             driver_has_cmp;     /*`cmp' callback defined?       */
     H5P_genplist_t     *a_plist;            /*file access property list     */
     H5F_close_degree_t  fc_degree;          /*file close degree             */
+    hbool_t             fam_sec2=FALSE;     /*change family to sec2 driver? */
     H5F_t              *ret_value;          /*actual return value           */
 
     FUNC_ENTER_NOAPI(H5F_open, NULL)
@@ -1907,6 +1913,20 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d
     file->intent = flags;
     file->name = H5MM_xstrdup(name);
 
+    if(NULL == (a_plist = H5I_object(fapl_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not file access property list")
+
+    /* This step is for h5repart tool only. If user wants to change file driver from
+     * family to sec2 while using h5repart, this private property should be set so that
+     * in the later step, the library can ignore the family driver information saved 
+     * in the superblock.
+     */ 
+    if(H5P_exist_plist(a_plist, H5F_ACS_FAMILY_TO_SEC2_NAME) > 0)
+        if(H5P_get(a_plist, H5F_ACS_FAMILY_TO_SEC2_NAME, &fam_sec2) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get property of changing family to sec2")
+
+    file->shared->fam_to_sec2 = fam_sec2;
+
     /*
      * Read or write the file superblock, depending on whether the file is
      * empty or not.
@@ -2047,8 +2067,6 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d
      * second time or later, verify the access property list value matches
      * the degree in shared file structure.
      */
-    if(NULL == (a_plist = H5I_object(fapl_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not file access property list")
     if(H5P_get(a_plist, H5F_CLOSE_DEGREE_NAME, &fc_degree) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get file close degree")
 
@@ -2583,6 +2601,13 @@ H5F_read_superblock(H5F_t *f, hid_t dxpl_id, H5G_entry_t *root_ent, haddr_t addr
     /* Set the super block checksum */
     shared->super_chksum = chksum;
 
+    /* This step is for h5repart tool only. If user wants to change file driver from
+     * family to sec2 while using h5repart, set the driver address to undefined to let
+     * the library ignore the family driver information saved in the superblock.
+     */ 
+    if(shared->fam_to_sec2)
+        shared->driver_addr = HADDR_UNDEF;
+            
     /* Decode the optional driver information block */
     if (H5F_addr_defined(shared->driver_addr)) {
         haddr_t drv_addr = shared->base_addr + shared->driver_addr;
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 17dcfdc..c7b9e95 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -92,7 +92,8 @@ typedef struct H5F_file_t {
     haddr_t	base_addr;	/* Absolute base address for rel.addrs. */
     haddr_t	freespace_addr;	/* Relative address of free-space info	*/
     haddr_t	driver_addr;	/* File driver information block address*/
-
+    hbool_t     fam_to_sec2;    /* Is h5repart changing driver from family to sec2 */
+                                   
     unsigned	super_chksum;	/* Superblock checksum                  */
     unsigned	drvr_chksum;	/* Driver info block checksum           */
     H5AC_t      *cache;		/* The object cache			*/
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index b5f9647..0e66d6d 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -398,6 +398,12 @@ typedef struct H5F_t H5F_t;
 #define H5F_ACS_FAMILY_NEWSIZE_SIZE            sizeof(hsize_t)
 #define H5F_ACS_FAMILY_NEWSIZE_DEF             0
     
+/* Definition for whether to conver family to sec2 driver. It's private 
+ * property only used by h5repart */
+#define H5F_ACS_FAMILY_TO_SEC2_NAME            "family_to_sec2"
+#define H5F_ACS_FAMILY_TO_SEC2_SIZE            sizeof(hbool_t)
+#define H5F_ACS_FAMILY_TO_SEC2_DEF             FALSE
+   
 /* Definition for data type in multi file driver */
 #define H5F_ACS_MULTI_TYPE_NAME                 "multi_type"
 #define H5F_ACS_MULTI_TYPE_SIZE                 sizeof(H5FD_mem_t)