Skip to content

Apply patch from @bgoglin #4075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2017
+13 −2
Merged

Apply patch from @bgoglin #4075

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions opal/mca/hwloc/hwloc2a/hwloc/hwloc/topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,7 @@ hwloc__duplicate_object(struct hwloc_topology *newtopology,
{
struct hwloc_tma *tma = newtopology->tma;
hwloc_obj_t *level;
unsigned level_width;
size_t len;
unsigned i;
hwloc_obj_t child;
Expand Down Expand Up @@ -700,20 +701,30 @@ hwloc__duplicate_object(struct hwloc_topology *newtopology,
if ((int) src->depth < 0) {
i = HWLOC_SLEVEL_FROM_DEPTH(src->depth);
level = newtopology->slevels[i].objs;
level_width = newtopology->slevels[i].nbobjs;
/* deal with first/last pointers of special levels, even if not really needed */
if (!newobj->logical_index)
newtopology->slevels[i].first = newobj;
if (newobj->logical_index == newtopology->slevels[i].nbobjs - 1)
newtopology->slevels[i].last = newobj;
} else {
level = newtopology->levels[src->depth];
level_width = newtopology->level_nbobjects[src->depth];
}
/* place us for real and link to previous cousin */
/* place us for real */
assert(newobj->logical_index < level_width);
level[newobj->logical_index] = newobj;
if (newobj->logical_index) {
/* link to already-inserted cousins
* (hwloc_pci_belowroot_apply_locality() can cause out-of-order logical indexes)
*/
if (newobj->logical_index > 0 && level[newobj->logical_index-1]) {
newobj->prev_cousin = level[newobj->logical_index-1];
level[newobj->logical_index-1]->next_cousin = newobj;
}
if (newobj->logical_index < level_width-1 && level[newobj->logical_index+1]) {
newobj->next_cousin = level[newobj->logical_index+1];
level[newobj->logical_index+1]->prev_cousin = newobj;
}

/* prepare for children */
if (src->arity) {
Expand Down