Merge remote-tracking branch 'canonical/feature/vfd_swmr' into vfd_sw…

…mr/thg_standards
derobins · Apr 9, 2021 · a2f3915 · a2f3915
2 parents ee655cf + 4fc1dac
commit a2f3915
Show file tree

Hide file tree

Showing 2 changed files with 414 additions and 188 deletions.
diff --git a/test/testvfdswmr.sh.in b/test/testvfdswmr.sh.in
@@ -40,7 +40,8 @@ nsofterrors=0		# soft errors are expected to occur some of the time
 			# on a couple of nondeterministic tests.
 
 ###############################################################################
-## test parameters for vfd_swmr_bigset_writer.c based on HDF5TestExpress:
+## test parameters for vfd_swmr_bigset_writer.c and vfd_swmr_group_writer.c
+## based on HDF5TestExpress:
 ## 0:  Exhaustive run: Tests take a long time to run.
 ## 1:  Default run.
 ## 2+: Quick run
@@ -53,14 +54,17 @@ fi
 BIGSET_n=25                         # -n option: # of iterations
 BIGSET_few_s=20                     # -s option: # of datasets (for few_big test)
 BIGSET_many_s=500                   # -s option: # of datasets (for many_small test)
+GROUP_n=100                         # -n option: # of groups (for vfd_swmr_group_writer.c)
 if [[ "$HDF5TestExpress" -eq 0 ]] ; then         # Setting for exhaustive run
     BIGSET_n=50
     BIGSET_few_s=40
     BIGSET_many_s=1000
+    GROUP_n=400
 elif [[ "$HDF5TestExpress" -gt 1 ]]; then        # Setting for quick run
     BIGSET_n=10
     BIGSET_few_s=10
     BIGSET_many_s=100
+    GROUP_n=40
 fi
 
 ###############################################################################
@@ -610,17 +614,17 @@ if [ ${do_zoo:-no} = yes ]; then
 fi
 
 #
-# Make sure that we can create 10000 groups while a reader waits
-# for each to appear.
+# Make sure that we can create GROUP_n groups (40, 100, or 400 depending on the HDF5TestExpress level)
+# while a reader waits for each to appear.
 #
 if [ ${do_groups:-no} = yes ]; then
 	echo launch vfd_swmr_group_writer
 	catch_out_err_and_rc vfd_swmr_group_writer \
-	    ../vfd_swmr_group_writer -q -c 1000 -n 10000 &
+	    ../vfd_swmr_group_writer -q -c 10 -n $GROUP_n &
 	pid_writer=$!
 
 	catch_out_err_and_rc vfd_swmr_group_reader \
-	    ../vfd_swmr_group_reader -q -c 1000 -n 10000 &
+	    ../vfd_swmr_group_reader -q -c 10 -n $GROUP_n -u 5 &
 	pid_reader=$!
 
 	# Wait for the reader to finish before signalling the