Merge pull request #313 from sourceryinstitute/vehre/sync_images_fix_new

zbeekman · web-flow · commit bb1b8ee03193 · 2017-01-16T14:30:38.000-05:00
Fix sync images to take the syncer's id from mpi_status.
diff --git a/src/mpi/mpi_caf.c b/src/mpi/mpi_caf.c
@@ -3098,7 +3098,7 @@ sync_images_internal (int count, int images[], int *stat, char *errmsg,
 	  if (i != MPI_UNDEFINED)
 	    {
 	      ++done_count;
-	      if (ierr == MPI_SUCCESS && arrived[i] == STAT_STOPPED_IMAGE)
+	      if (ierr == MPI_SUCCESS && arrived[s.MPI_SOURCE] == STAT_STOPPED_IMAGE)
 		{
 		  /* Possible future extension: Abort pending receives.  At the
 		     moment the receives are discarded by the program

Original file line number	Diff line number	Diff line change
`@@ -3098,7 +3098,7 @@ sync_images_internal (int count, int images[], int stat, char errmsg,`
`3098`	`3098`	`if (i != MPI_UNDEFINED)`
`3099`	`3099`	`{`
`3100`	`3100`	`++done_count;`
`3101`		`- if (ierr == MPI_SUCCESS && arrived[i] == STAT_STOPPED_IMAGE)`
	`3101`	`+ if (ierr == MPI_SUCCESS && arrived[s.MPI_SOURCE] == STAT_STOPPED_IMAGE)`
`3102`	`3102`	`{`
`3103`	`3103`	`/* Possible future extension: Abort pending receives. At the`
`3104`	`3104`	`moment the receives are discarded by the program`