rtc/hwloc/shmem: fix "libs" hole search kind

bgoglin · bgoglin · commit b8b46b253bb7 · 2017-08-21T15:40:36.000+02:00
We want the biggest hole *between* heap and stack, not outside.

Signed-off-by: Brice Goglin &lt;Brice.Goglin@inria.fr&gt;
diff --git a/orte/mca/rtc/hwloc/rtc_hwloc.c b/orte/mca/rtc/hwloc/rtc_hwloc.c
@@ -594,15 +594,18 @@ static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind,
                     break;
 
                 case VM_HOLE_IN_LIBS:
+                    /* see if we are between heap and stack */
                     if (prevmkind == VM_MAP_HEAP) {
                         in_libs = 1;
                     }
                     if (mkind == VM_MAP_STACK) {
                         in_libs = 0;
                     }
-                    if (in_libs) {
+                    if (!in_libs) {
+                        /* we're not in libs, ignore this entry */
                         break;
                     }
+                    /* we're in libs, consider this entry for searching the biggest hole below */
                     /* fallthrough */
 
                 case VM_HOLE_BIGGEST:

Original file line number	Diff line number	Diff line change
`@@ -594,15 +594,18 @@ static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind,`
`594`	`594`	`break;`
`595`	`595`
`596`	`596`	`case VM_HOLE_IN_LIBS:`
	`597`	`+ /* see if we are between heap and stack */`
`597`	`598`	`if (prevmkind == VM_MAP_HEAP) {`
`598`	`599`	`in_libs = 1;`
`599`	`600`	`}`
`600`	`601`	`if (mkind == VM_MAP_STACK) {`
`601`	`602`	`in_libs = 0;`
`602`	`603`	`}`
`603`		`- if (in_libs) {`
	`604`	`+ if (!in_libs) {`
	`605`	`+ /* we're not in libs, ignore this entry */`
`604`	`606`	`break;`
`605`	`607`	`}`
	`608`	`+ /* we're in libs, consider this entry for searching the biggest hole below */`
`606`	`609`	`/* fallthrough */`
`607`	`610`
`608`	`611`	`case VM_HOLE_BIGGEST:`