[mpich2-commits] r4216 - mpich2/trunk/test/mpi/perf

[gropp at mcs.anl.gov]

Author: gropp
Date: 2009-03-28 16:33:35 -0500 (Sat, 28 Mar 2009)
New Revision: 4216

Modified:
   mpich2/trunk/test/mpi/perf/dtpack.c
Log:
Ensure dtpack frees created datatypes

Modified: mpich2/trunk/test/mpi/perf/dtpack.c
===================================================================
--- mpich2/trunk/test/mpi/perf/dtpack.c	2009-03-27 23:36:32 UTC (rev 4215)
+++ mpich2/trunk/test/mpi/perf/dtpack.c	2009-03-28 21:33:35 UTC (rev 4216)
@@ -131,9 +131,10 @@
 		*avgTimeMPI = 0;
 		if (verbose)
 			printf("Too much noise; discarding measurement\n");
-		return 0;
 	}
-	*avgTimeMPI = mean(t, NTRIALS) / N_REPS;
+	else {
+	    *avgTimeMPI = mean(t, NTRIALS) / N_REPS;
+	}
 
 	MPI_Type_free( &vectype );
 
@@ -203,9 +204,10 @@
 		*avgTimeMPI = 0;
 		if (verbose)
 			printf("Too much noise; discarding measurement\n");
-		return 0;
 	}
-	*avgTimeMPI = mean(t, NTRIALS) / N_REPS;
+	else {
+	    *avgTimeMPI = mean(t, NTRIALS) / N_REPS;
+	}
 
 	MPI_Type_free( &vectype );
 
@@ -276,10 +278,10 @@
 		*avgTimeMPI = 0;
 		if (verbose)
 			printf("Too much noise; discarding measurement\n");
-		return 0;
 	}
-	*avgTimeMPI = mean(t, NTRIALS) / N_REPS;
-
+	else {
+	    *avgTimeMPI = mean(t, NTRIALS) / N_REPS;
+	}
 	MPI_Type_free( &vectype );
 
 	return 0;
@@ -357,10 +359,10 @@
 		*avgTimeMPI = 0;
 		if (verbose)
 			printf("Too much noise; discarding measurement\n");
-		return 0;
 	}
-	*avgTimeMPI = mean(t, NTRIALS) / N_REPS;
-
+	else {
+	    *avgTimeMPI = mean(t, NTRIALS) / N_REPS;
+	}
 	MPI_Type_free( &indextype );
 
 	return 0;