Merge pull request #4653 from aravindksg/ofi_regression_fix

matcabral · web-flow · commit a60052583631 · 2017-12-21T10:55:40.000-08:00
MTL OFI: Allow retries in MTL progress for interrupted syscalls
diff --git a/ompi/mca/mtl/ofi/mtl_ofi.h b/ompi/mca/mtl/ofi/mtl_ofi.h
@@ -117,7 +117,7 @@ ompi_mtl_ofi_progress(void)
                 exit(1);
             }
         } else {
-            if (ret == -FI_EAGAIN) {
+            if (ret == -FI_EAGAIN || ret == -EINTR) {
                 break;
             } else {
                 opal_output(0, "%s:%d: Error returned from fi_cq_read: %s(%zd).\n"

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ ompi_mtl_ofi_progress(void)`
`117`	`117`	`exit(1);`
`118`	`118`	`}`
`119`	`119`	`} else {`
`120`		`- if (ret == -FI_EAGAIN) {`
	`120`	`+ if (ret == -FI_EAGAIN \|\| ret == -EINTR) {`
`121`	`121`	`break;`
`122`	`122`	`} else {`
`123`	`123`	`opal_output(0, "%s:%d: Error returned from fi_cq_read: %s(%zd).\n"`