Sync with develop

1 files changed, 87 insertions, 66 deletions

diff --git a/test/use_append_mchunks.c b/test/use_append_mchunks.c
index 41d355e..2eb5a1d 100644
--- a/test/use_append_mchunks.c
+++ b/test/use_append_mchunks.c
@@ -61,43 +61,42 @@
 
 #include "use.h"
 
-/* Global Variable definitions */
-options_t UC_opts;	/* Use Case Options */
-const char *progname_g="use_append_mchunks";	/* program name */
+#define USE_APPEND_MCHUNKS_PROGNAME "use_append_mchunks"
+
+static options_t UC_opts; /* Use Case Options */
 
 /* Setup parameters for the use case.
  * Return: 0 succeed; -1 fail.
  */
-int setup_parameters(int argc, char * const argv[])
+int
+setup_parameters(int argc, char * const argv[], options_t * opts)
 {
     /* use case defaults */
-    HDmemset(&UC_opts, 0, sizeof(options_t));
-    UC_opts.chunksize = Chunksize_DFT;
-    UC_opts.use_swmr = 1;	/* use swmr open */
-    UC_opts.iterations = 1;
-    UC_opts.chunkplanes = 1;
-
-    /* parse options */
-    if (parse_option(argc, argv) < 0){
-	return(-1);
+    HDmemset(opts, 0, sizeof(options_t));
+    opts->chunksize = Chunksize_DFT;
+    opts->use_swmr = 1; /* use swmr open */
+    opts->iterations = 1;
+    opts->chunkplanes = 1;
+    opts->progname = USE_APPEND_MCHUNKS_PROGNAME;
+    opts->fapl_id = H5I_INVALID_HID;
+
+    if (parse_option(argc, argv, opts) < 0) {
+        return(-1);
     }
-    /* set chunk dims */
-    UC_opts.chunkdims[0] = (hsize_t)UC_opts.chunkplanes;
-    UC_opts.chunkdims[1] = UC_opts.chunkdims[2] = (hsize_t)UC_opts.chunksize;
 
-    /* set dataset initial and max dims */
-    UC_opts.dims[0] = 0;
-    UC_opts.max_dims[0] = H5S_UNLIMITED;
-    UC_opts.dims[1] = UC_opts.dims[2] = UC_opts.max_dims[1] = UC_opts.max_dims[2] = 2 * (hsize_t)UC_opts.chunksize;
+    opts->chunkdims[0] = (hsize_t)opts->chunkplanes;
+    opts->chunkdims[1] = opts->chunkdims[2] = (hsize_t)opts->chunksize;
+
+    opts->dims[0] = 0;
+    opts->max_dims[0] = H5S_UNLIMITED;
+    opts->dims[1] = opts->dims[2] = opts->max_dims[1] = opts->max_dims[2] = 2 * (hsize_t)opts->chunksize;
 
-    /* set nplanes */
-    if (UC_opts.nplanes == 0)
-        UC_opts.nplanes = 2 * (hsize_t)UC_opts.chunksize;
+    if (opts->nplanes == 0)
+        opts->nplanes = 2 * (hsize_t)opts->chunksize;
 
-    /* show parameters and return */
-    show_parameters();
+    show_parameters(opts);
     return(0);
-}
+} /* end setup_parameters() */
 
 
 /* Overall Algorithm:
@@ -119,10 +118,8 @@ main(int argc, char *argv[])
     hbool_t send_wait = 0;
     hid_t fapl = -1;        /* File access property list */
     hid_t fid = -1;         /* File ID */
-    char *name;             /* Test file name */
 
-    /* initialization */
-    if (setup_parameters(argc, argv) < 0){
+    if (setup_parameters(argc, argv, &UC_opts) < 0) {
         Hgoto_error(1);
     }
 
@@ -137,25 +134,42 @@ main(int argc, char *argv[])
     /* UC_WRITER:    create datafile, skip reader, launch writer.    */
     /* UC_READER:    skip create, launch reader, exit.               */
     /* ==============================================================*/
-    /* ============*/
+    /* =========== */
     /* Create file */
-    /* ============*/
-    if (UC_opts.launch != UC_READER){
+    /* =========== */
+    if (UC_opts.launch != UC_READER) {
         HDprintf("Creating skeleton data file for test...\n");
-	if (create_uc_file() < 0){
-	    HDfprintf(stderr, "***encounter error\n");
-	    Hgoto_error(1);
-	}else
-	    HDprintf("File created.\n");
+        if ((UC_opts.fapl_id = h5_fileaccess()) < 0) {
+            HDfprintf(stderr, "can't create creation FAPL\n");
+            Hgoto_error(1);
+        }
+        if (H5Pset_libver_bounds(UC_opts.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
+            HDfprintf(stderr, "can't set creation FAPL libver bounds\n");
+            Hgoto_error(1);
+        }
+        if (create_uc_file(&UC_opts) < 0) {
+            HDfprintf(stderr, "***encounter error\n");
+            Hgoto_error(1);
+        } else {
+            HDprintf("File created.\n");
+        }
+        /* Close FAPL to prevent issues with forking later */
+        if (H5Pclose(UC_opts.fapl_id) < 0) {
+            HDfprintf(stderr, "can't close creation FAPL\n");
+            Hgoto_error(1);
+        }
+        UC_opts.fapl_id = H5I_INVALID_HID;
     }
 
-    if (UC_opts.launch==UC_READWRITE){
-        /* fork process */
-        if((childpid = fork()) < 0) {
+    /* ============ */
+    /* Fork process */
+    /* ============ */
+    if (UC_opts.launch==UC_READWRITE) {
+        if ((childpid = fork()) < 0) {
             perror("fork");
             Hgoto_error(1);
-        };
-    };
+        }
+    }
     mypid = getpid();
 
     /* ============= */
@@ -165,10 +179,18 @@ main(int argc, char *argv[])
         /* child process launch the reader */
         if (0 == childpid) {
             HDprintf("%d: launch reader process\n", mypid);
-            if (read_uc_file(send_wait) < 0){
+            if ((UC_opts.fapl_id = h5_fileaccess()) < 0) {
+                HDfprintf(stderr, "can't create read FAPL\n");
+                HDexit(EXIT_FAILURE);
+            }
+            if (read_uc_file(send_wait, &UC_opts) < 0) {
                 HDfprintf(stderr, "read_uc_file encountered error\n");
                 HDexit(EXIT_FAILURE);
             }
+            if (H5Pclose(UC_opts.fapl_id) < 0) {
+                HDfprintf(stderr, "can't close read FAPL\n");
+                HDexit(EXIT_FAILURE);
+            }
             HDexit(EXIT_SUCCESS);
         }
     }
@@ -179,27 +201,38 @@ main(int argc, char *argv[])
     /* this process continues to launch the writer */
     HDprintf("%d: continue as the writer process\n", mypid);
 
-    name = UC_opts.filename;
-
     /* Set the file access property list */
-    if((fapl = h5_fileaccess()) < 0)
+    if ((fapl = h5_fileaccess()) < 0) {
+        HDfprintf(stderr, "can't get write FAPL\n");
         Hgoto_error(1);
+    }
 
-    if(UC_opts.use_swmr)
-        if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+    if (UC_opts.use_swmr) {
+        if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
+            HDfprintf(stderr, "can't set write FAPL libver bounds\n");
             Hgoto_error(1);
+        }
+    }
 
-    /* Open the file */
-    if((fid = H5Fopen(name, H5F_ACC_RDWR | (UC_opts.use_swmr ? H5F_ACC_SWMR_WRITE : 0), fapl)) < 0) {
+    if ((fid = H5Fopen(UC_opts.filename, H5F_ACC_RDWR | (UC_opts.use_swmr ? H5F_ACC_SWMR_WRITE : 0), fapl)) < 0) {
         HDfprintf(stderr, "H5Fopen failed\n");
         Hgoto_error(1);
     }
 
-    if(write_uc_file(send_wait, fid) < 0) {
+    if (write_uc_file(send_wait, fid, &UC_opts) < 0) {
         HDfprintf(stderr, "write_uc_file encountered error\n");
         Hgoto_error(1);
     }
 
+    if (H5Fclose(fid) < 0) {
+        HDfprintf(stderr, "Failed to close file id\n");
+        Hgoto_error(1);
+    }
+
+    if (H5Pclose(fapl) < 0) {
+        HDfprintf(stderr, "can't close write FAPL\n");
+        Hgoto_error(1);
+    }
 
     /* ================================================ */
     /* If readwrite, collect exit code of child process */
@@ -210,20 +243,8 @@ main(int argc, char *argv[])
             Hgoto_error(1);
         }
 
-        /* Close the file  */
-        if(H5Fclose(fid) < 0) {
-            HDfprintf(stderr, "Failed to close file id\n");
-            Hgoto_error(1);
-        }
-
-        /* Close the property list */
-        if(H5Pclose(fapl) < 0) {
-            HDfprintf(stderr, "Failed to close the property list\n");
-            Hgoto_error(1);
-        }
-
-        if (WIFEXITED(child_status)){
-            if ((child_ret_value=WEXITSTATUS(child_status)) != 0){
+        if (WIFEXITED(child_status)) {
+            if ((child_ret_value=WEXITSTATUS(child_status)) != 0) {
                 HDprintf("%d: child process exited with non-zero code (%d)\n",
                     mypid, child_ret_value);
                 Hgoto_error(1);
@@ -242,7 +263,7 @@ done:
     }
 
     return(ret_value);
-}
+} /* end main() */
 
 #else /* H5_HAVE_FORK */