From 09230a4a42689b10805ebed9ee3c38d602b23c37 Mon Sep 17 00:00:00 2001 From: Thomas Naughton Date: Fri, 4 Jan 2019 17:50:49 -0500 Subject: [PATCH] update to new opal_infosubscriber_t structure 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. --- ompi/communicator/comm_init.c | 4 ++-- ompi/win/win.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ompi/communicator/comm_init.c b/ompi/communicator/comm_init.c index 9c1732c58d6..59b559ad450 100644 --- a/ompi/communicator/comm_init.c +++ b/ompi/communicator/comm_init.c @@ -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 ) { @@ -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; } diff --git a/ompi/win/win.c b/ompi/win/win.c index 160b7147bd4..6f36c68ec56 100644 --- a/ompi/win/win.c +++ b/ompi/win/win.c @@ -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; } @@ -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; }