Merge pull request #7204 from devreal/shmwin_contig

awlauria · web-flow · commit dd5991f513ba · 2020-02-20T13:22:40.000-05:00
Correctly set baseptr in contiguous shared memory window with local size zero
diff --git a/ompi/mca/osc/sm/osc_sm_component.c b/ompi/mca/osc/sm/osc_sm_component.c
@@ -341,7 +341,7 @@ component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit
             }
 
             module->sizes[i] = rbuf[i];
-            if (module->sizes[i]) {
+            if (module->sizes[i] || !module->noncontig) {
                 module->bases[i] = ((char *) module->segment_base) + total;
                 total += rbuf[i];
             } else {

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ component_select(struct ompi_win_t win, void *base, size_t size, int disp_unit`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`module->sizes[i] = rbuf[i];`
`344`		`- if (module->sizes[i]) {`
	`344`	`+ if (module->sizes[i] \|\| !module->noncontig) {`
`345`	`345`	`module->bases[i] = ((char *) module->segment_base) + total;`
`346`	`346`	`total += rbuf[i];`
`347`	`347`	`} else {`