Skip to content

Commit

Permalink
update to new opal_infosubscriber_t structure
Browse files Browse the repository at this point in the history
There was a restructuring of the comm/win/group objects
that shifted the fields down for getting at the class name.
This appears to relate to opal_infosubscriber_t changes from 50aa143.

NOTE: The opal_infosubscriber_t changes were not applied to the
oshmem_group_t structure, so no need for changes there.
  • Loading branch information
naughtont3 committed Jan 4, 2019
1 parent 8dc700d commit 09230a4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ompi/communicator/comm_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ ompi_communicator_t *ompi_comm_allocate ( int local_size, int remote_size )

/* create new communicator element */
new_comm = OBJ_NEW(ompi_communicator_t);
Tau_start_class_allocation(new_comm->c_base.obj_class->cls_name, 0, 0);
Tau_start_class_allocation(new_comm->super.s_base.obj_class->cls_name, 0, 0);
new_comm->super.s_info = NULL;
new_comm->c_local_group = ompi_group_allocate ( local_size );
if ( 0 < remote_size ) {
Expand All @@ -259,7 +259,7 @@ ompi_communicator_t *ompi_comm_allocate ( int local_size, int remote_size )

/* fill in the inscribing hyper-cube dimensions */
new_comm->c_cube_dim = opal_cube_dim(local_size);
Tau_stop_class_allocation(new_comm->c_base.obj_class->cls_name, 0);
Tau_stop_class_allocation(new_comm->super.s_base.obj_class->cls_name, 0);

return new_comm;
}
Expand Down
4 changes: 2 additions & 2 deletions ompi/win/win.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static int alloc_window(struct ompi_communicator_t *comm, opal_info_t *info, int

/* create the object */
win = OBJ_NEW(ompi_win_t);
Tau_start_class_allocation(win->w_base.obj_class->cls_name, 0, 0);
Tau_start_class_allocation(win->super.s_base.obj_class->cls_name, 0, 0);
if (NULL == win) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
Expand Down Expand Up @@ -188,7 +188,7 @@ static int alloc_window(struct ompi_communicator_t *comm, opal_info_t *info, int
}

*win_out = win;
Tau_stop_class_allocation(win->w_base.obj_class->cls_name, 0);
Tau_stop_class_allocation(win->super.s_base.obj_class->cls_name, 0);

return OMPI_SUCCESS;
}
Expand Down

0 comments on commit 09230a4

Please sign in to comment.