Skip to content

Commit 45fe4a0

Browse files
cchambreauhppritcha
cchambreau
authored and
hppritcha
committed
Remove non-conformant event_get_info extent argument and internal tracking.
Signed-off-by: Chris Chambreau <chambreau1@llnl.gov>
1 parent 1564ea4 commit 45fe4a0

File tree

6 files changed

+39
-51
lines changed

6 files changed

+39
-51
lines changed

‎ompi/include/mpi.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2994,7 +2994,7 @@ OMPI_DECLSPEC int PMPI_T_event_get_num (int *num_events);
29942994
OMPI_DECLSPEC int PMPI_T_event_get_info (int event_index, char *name, int *name_len,
29952995
int *verbosity, MPI_Datatype *array_of_datatypes,
29962996
MPI_Aint *array_of_displacements, int *num_elements,
2997-
MPI_Aint *extent, MPI_T_enum *enumtype, MPI_Info *info,
2997+
MPI_T_enum *enumtype, MPI_Info *info,
29982998
char *desc, int *desc_len, int *bind);
29992999
OMPI_DECLSPEC int PMPI_T_event_get_index (const char *name, int *event_index);
30003000
OMPI_DECLSPEC int PMPI_T_event_handle_alloc (int event_index, void *obj_handle,
@@ -3107,7 +3107,7 @@ OMPI_DECLSPEC int MPI_T_event_get_num (int *num_events);
31073107
OMPI_DECLSPEC int MPI_T_event_get_info (int event_index, char *name, int *name_len,
31083108
int *verbosity, MPI_Datatype *array_of_datatypes,
31093109
MPI_Aint *array_of_displacements, int *num_elements,
3110-
MPI_Aint *extent, MPI_T_enum *enumtype, MPI_Info *info,
3110+
MPI_T_enum *enumtype, MPI_Info *info,
31113111
char *desc, int *desc_len, int *bind);
31123112
OMPI_DECLSPEC int MPI_T_event_get_index (const char *name, int *event_index);
31133113
OMPI_DECLSPEC int MPI_T_event_handle_alloc (int event_index, void *obj_handle,

‎ompi/mca/osc/rdma/osc_rdma_component.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,62 +106,62 @@ mca_base_event_list_item_t mca_osc_rdma_events[] = {
106106
[OMPI_OSC_RDMA_EVENT_LOCK_ACQUIRED] = {.name = "lock_acquired", .desc = "Passive-target lock aquired",
107107
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_int.dt.super},
108108
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_osc_rdma_target_element,
109-
.extent = sizeof (int), .bind = MCA_BASE_VAR_BIND_MPI_WIN},
109+
.bind = MCA_BASE_VAR_BIND_MPI_WIN},
110110

111111
[OMPI_OSC_RDMA_EVENT_LOCK_RELEASED] = {.name = "lock_released", .desc = "Passive-target lock required",
112112
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_int.dt.super},
113113
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_osc_rdma_target_element,
114-
.extent = sizeof (int), .bind = MCA_BASE_VAR_BIND_MPI_WIN},
114+
.bind = MCA_BASE_VAR_BIND_MPI_WIN},
115115

116116
[OMPI_OSC_RDMA_EVENT_PUT_STARTED] = {.name = "put_started", .desc = "Put started to target. Complete event may not exist.",
117117
.verbosity = OPAL_INFO_LVL_5, .datatypes = mca_osc_rdma_rdma_event_types,
118118
.offsets = mca_osc_rdma_rdma_event_offsets, .num_datatypes = 3,
119-
.elements = mca_osc_rdma_rdma_event_elements, .extent = 24, .bind = MCA_BASE_VAR_BIND_MPI_WIN},
119+
.elements = mca_osc_rdma_rdma_event_elements, .bind = MCA_BASE_VAR_BIND_MPI_WIN},
120120

121121
[OMPI_OSC_RDMA_EVENT_PUT_COMPLETE] = {.name = "put_complete", .desc = "Put completed on target",
122122
.verbosity = OPAL_INFO_LVL_5, .datatypes = mca_osc_rdma_rdma_event_types,
123123
.offsets = mca_osc_rdma_rdma_event_offsets, .num_datatypes = 3,
124-
.elements = mca_osc_rdma_rdma_event_elements, .extent = 24, .bind = MCA_BASE_VAR_BIND_MPI_WIN},
124+
.elements = mca_osc_rdma_rdma_event_elements, .bind = MCA_BASE_VAR_BIND_MPI_WIN},
125125

126126
[OMPI_OSC_RDMA_EVENT_GET_STARTED] = {.name = "get_started", .desc = "Put started to target. Complete event may not exist.",
127127
.verbosity = OPAL_INFO_LVL_5, .datatypes = mca_osc_rdma_rdma_event_types,
128128
.offsets = mca_osc_rdma_rdma_event_offsets, .num_datatypes = 3,
129-
.elements = mca_osc_rdma_rdma_event_elements, .extent = 24, .bind = MCA_BASE_VAR_BIND_MPI_WIN},
129+
.elements = mca_osc_rdma_rdma_event_elements, .bind = MCA_BASE_VAR_BIND_MPI_WIN},
130130

131131
[OMPI_OSC_RDMA_EVENT_GET_COMPLETE] = {.name = "get_complete", .desc = "Put completed on target",
132132
.verbosity = OPAL_INFO_LVL_5, .datatypes = mca_osc_rdma_rdma_event_types,
133133
.offsets = mca_osc_rdma_rdma_event_offsets, .num_datatypes = 3,
134-
.elements = mca_osc_rdma_rdma_event_elements, .extent = 24, .bind = MCA_BASE_VAR_BIND_MPI_WIN},
134+
.elements = mca_osc_rdma_rdma_event_elements, .bind = MCA_BASE_VAR_BIND_MPI_WIN},
135135

136136
[OMPI_OSC_RDMA_EVENT_FLUSH_STARTED] = {.name = "flush_started", .desc = "Flush started on target",
137137
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_int.dt.super},
138138
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_osc_rdma_target_element,
139-
.extent = sizeof (int), .bind = MCA_BASE_VAR_BIND_MPI_WIN},
139+
.bind = MCA_BASE_VAR_BIND_MPI_WIN},
140140

141141
[OMPI_OSC_RDMA_EVENT_FLUSH_COMPLETE] = {.name = "flush_complete", .desc = "Flush complete on target",
142142
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_int.dt.super},
143143
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_osc_rdma_target_element,
144-
.extent = sizeof (int), .bind = MCA_BASE_VAR_BIND_MPI_WIN},
144+
.bind = MCA_BASE_VAR_BIND_MPI_WIN},
145145

146146
[OMPI_OSC_RDMA_EVENT_PSCW_EXPOSE_START] = {.name = "pscw_expose_start", .desc = "PSWW exposure started",
147147
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_int.dt.super},
148148
.offsets = &(unsigned long) {0}, .num_datatypes = 0, .elements = mca_osc_rdma_target_element,
149-
.extent = sizeof (int), .bind = MCA_BASE_VAR_BIND_MPI_WIN},
149+
.bind = MCA_BASE_VAR_BIND_MPI_WIN},
150150

151151
[OMPI_OSC_RDMA_EVENT_PSCW_EXPOSE_COMPLETE] = {.name = "pscw_expose_complete", .desc = "PSWW exposure complete",
152152
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_int.dt.super},
153153
.offsets = &(unsigned long) {0}, .num_datatypes = 0, .elements = mca_osc_rdma_target_element,
154-
.extent = sizeof (int), .bind = MCA_BASE_VAR_BIND_MPI_WIN},
154+
.bind = MCA_BASE_VAR_BIND_MPI_WIN},
155155

156156
[OMPI_OSC_RDMA_EVENT_PSCW_ACCESS_START] = {.name = "pscw_access_start", .desc = "PSWW access epoch started",
157157
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_int.dt.super},
158158
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_osc_rdma_target_element,
159-
.extent = sizeof (int), .bind = MCA_BASE_VAR_BIND_MPI_WIN},
159+
.bind = MCA_BASE_VAR_BIND_MPI_WIN},
160160

161161
[OMPI_OSC_RDMA_EVENT_PSCW_ACCESS_COMPLETE] = {.name = "pscw_access_complete", .desc = "PSWW access epoch complete",
162162
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_int.dt.super},
163163
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_osc_rdma_target_element,
164-
.extent = sizeof (int), .bind = MCA_BASE_VAR_BIND_MPI_WIN},
164+
.bind = MCA_BASE_VAR_BIND_MPI_WIN},
165165

166166
[OMPI_OSC_RDMA_EVENT_FENCE] = {.name = "fence", .desc = "Fence called", .verbosity = OPAL_INFO_LVL_5, .bind = MCA_BASE_VAR_BIND_MPI_WIN},
167167
};

‎ompi/mca/pml/ob1/pml_ob1_component.c

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -98,74 +98,73 @@ mca_base_event_list_item_t mca_pml_ob1_events[] = {
9898
[MCA_PML_OB1_EVENT_MESSAGE_ARRIVED] = {.name = "message_arrived", .desc = "Message arrived for match",
9999
.verbosity = OPAL_INFO_LVL_5, .datatypes = mca_pml_ob1_match_hdr_types,
100100
.offsets = mca_pml_ob1_match_hdr_offsets, .num_datatypes = 4,
101-
.elements = mca_pml_ob1_match_hdr_names, .extent = 12, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
101+
.elements = mca_pml_ob1_match_hdr_names, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
102102

103103
[MCA_PML_OB1_EVENT_SEARCH_POSTED_BEGIN] = {.name = "search_posted_begin", .desc = "Begin searching posted message queue",
104104
.verbosity = OPAL_INFO_LVL_5, .datatypes = &mca_pml_ob1_match_hdr_types[1],
105105
.offsets = &mca_pml_ob1_match_hdr_offsets[1], .num_datatypes = 3,
106-
.elements = &mca_pml_ob1_match_hdr_names[1], .extent = 8, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
106+
.elements = &mca_pml_ob1_match_hdr_names[1], .bind = MCA_BASE_VAR_BIND_MPI_COMM},
107107

108108
[MCA_PML_OB1_EVENT_SEARCH_POSTED_END] = {.name = "search_posted_end", .desc = "Finished searching posted message queue",
109109
.verbosity = OPAL_INFO_LVL_5, .datatypes = &mca_pml_ob1_match_hdr_types[1],
110110
.offsets = &mca_pml_ob1_match_hdr_offsets[1], .num_datatypes = 3,
111-
.elements = &mca_pml_ob1_match_hdr_names[1], .extent = 8, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
111+
.elements = &mca_pml_ob1_match_hdr_names[1], .bind = MCA_BASE_VAR_BIND_MPI_COMM},
112112

113113
[MCA_PML_OB1_EVENT_SEARCH_UNEX_BEGIN] = {.name = "search_unexpected_begin", .desc = "Begin searching unexpected message queue",
114114
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_aint.dt.super},
115115
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_pml_ob1_request_element,
116-
.extent = sizeof (MPI_Aint), .bind = MCA_BASE_VAR_BIND_MPI_COMM},
116+
.bind = MCA_BASE_VAR_BIND_MPI_COMM},
117117

118118
[MCA_PML_OB1_EVENT_SEARCH_UNEX_END] = {.name = "search_unexpected_end", .desc = "Finished searching unexpected message queue",
119119
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_aint.dt.super},
120120
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_pml_ob1_request_element,
121-
.extent = sizeof (MPI_Aint), .bind = MCA_BASE_VAR_BIND_MPI_COMM},
121+
.bind = MCA_BASE_VAR_BIND_MPI_COMM},
122122

123123
[MCA_PML_OB1_EVENT_POSTED_INSERT] = {.name = "posted_insert", .desc = "Added request to the posted message queue",
124124
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_aint.dt.super},
125125
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_pml_ob1_request_element,
126-
.extent = sizeof (MPI_Aint), .bind = MCA_BASE_VAR_BIND_MPI_COMM},
126+
.bind = MCA_BASE_VAR_BIND_MPI_COMM},
127127

128128
[MCA_PML_OB1_EVENT_POSTED_REMOVE] = {.name = "posted_remove", .desc = "Remove request from the posted message queue",
129129
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_aint.dt.super},
130130
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_pml_ob1_request_element,
131-
.extent = sizeof (MPI_Aint), .bind = MCA_BASE_VAR_BIND_MPI_COMM},
131+
.bind = MCA_BASE_VAR_BIND_MPI_COMM},
132132

133133
[MCA_PML_OB1_EVENT_UNEX_INSERT] = {.name = "unex_insert", .desc = "Unexpected message inserted in queue", .verbosity = OPAL_INFO_LVL_5,
134134
.datatypes = &mca_pml_ob1_match_hdr_types[1], .offsets = &mca_pml_ob1_match_hdr_offsets[1],
135-
.num_datatypes = 2, .elements = &mca_pml_ob1_match_hdr_names[1], .extent = 8, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
135+
.num_datatypes = 2, .elements = &mca_pml_ob1_match_hdr_names[1], .bind = MCA_BASE_VAR_BIND_MPI_COMM},
136136

137137
[MCA_PML_OB1_EVENT_UNEX_REMOVE] = {.name = "unex_remove", .desc = "Unexpected message removed from queue", .verbosity = OPAL_INFO_LVL_5,
138138
.datatypes = &mca_pml_ob1_match_hdr_types[1], .offsets = &mca_pml_ob1_match_hdr_offsets[1],
139-
.num_datatypes = 2, .elements = &mca_pml_ob1_match_hdr_names[1], .extent = 8, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
139+
.num_datatypes = 2, .elements = &mca_pml_ob1_match_hdr_names[1], .bind = MCA_BASE_VAR_BIND_MPI_COMM},
140140

141141
[MCA_PML_OB1_EVENT_TRANSFER_BEGIN] = {.name = "transfer_begin", .desc = "Transfer has begun", .verbosity = OPAL_INFO_LVL_5,
142142
.datatypes = &(opal_datatype_t *) {&ompi_mpi_aint.dt.super}, .offsets = &(unsigned long) {0}, .num_datatypes = 1,
143-
.elements = mca_pml_ob1_request_element, .extent = sizeof (MPI_Aint), .bind = MCA_BASE_VAR_BIND_MPI_COMM},
143+
.elements = mca_pml_ob1_request_element, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
144144

145145
[MCA_PML_OB1_EVENT_TRANSFER] = {.name = "transfer", .desc = "Transfer event", .verbosity = OPAL_INFO_LVL_5,
146146
.datatypes = mca_pml_ob1_request_size_types, .offsets = mca_pml_ob1_request_size_offsets, .num_datatypes = 2,
147-
.elements = mca_pml_ob1_request_size_elements, .extent = sizeof (mca_pml_ob1_transfer_event_t),
148-
.bind = MCA_BASE_VAR_BIND_MPI_COMM},
147+
.elements = mca_pml_ob1_request_size_elements, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
149148

150149
[MCA_PML_OB1_EVENT_TRANSFER_END] = {.name = "transfer_end", .desc = "Transfer has completed", .verbosity = OPAL_INFO_LVL_5,
151150
.datatypes = &(opal_datatype_t *) {&ompi_mpi_aint.dt.super}, .offsets = &(unsigned long) {0}, .num_datatypes = 1,
152-
.elements = mca_pml_ob1_request_element, .extent = sizeof (MPI_Aint), .bind = MCA_BASE_VAR_BIND_MPI_COMM},
151+
.elements = mca_pml_ob1_request_element, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
153152

154153
[MCA_PML_OB1_EVENT_RECEIVE_CANCELED] = {.name = "cancel", .desc = "Receive request canceled", .verbosity = OPAL_INFO_LVL_5,
155154
.datatypes = &(opal_datatype_t *) {&ompi_mpi_aint.dt.super}, .offsets = &(unsigned long) {0}, .num_datatypes = 1,
156-
.elements = mca_pml_ob1_request_element, .extent = sizeof (MPI_Aint), .bind = MCA_BASE_VAR_BIND_MPI_COMM},
155+
.elements = mca_pml_ob1_request_element, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
157156

158157
[MCA_PML_OB1_EVENT_REQUEST_FREE] = {.name = "free", .desc = "Request object freed", .verbosity = OPAL_INFO_LVL_5,
159158
.datatypes = &(opal_datatype_t *) {&ompi_mpi_aint.dt.super}, .offsets = &(unsigned long) {0}, .num_datatypes = 1,
160-
.elements = mca_pml_ob1_request_element, .extent = sizeof (MPI_Aint), .bind = MCA_BASE_VAR_BIND_MPI_COMM},
159+
.elements = mca_pml_ob1_request_element, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
161160

162161
[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE] = {.name = "request_activate", .desc = "Request activated", .verbosity = OPAL_INFO_LVL_5,
163162
.datatypes = &(opal_datatype_t *) {&ompi_mpi_aint.dt.super}, .offsets = &(unsigned long) {0}, .num_datatypes = 1,
164-
.elements = mca_pml_ob1_request_element, .extent = sizeof (MPI_Aint), .bind = MCA_BASE_VAR_BIND_MPI_COMM},
163+
.elements = mca_pml_ob1_request_element, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
165164

166165
[MCA_PML_OB1_EVENT_REQUEST_COMPLETE] = {.name = "request_complete", .desc = "Request completed", .verbosity = OPAL_INFO_LVL_5,
167166
.datatypes = &(opal_datatype_t *) {&ompi_mpi_aint.dt.super}, .offsets = &(unsigned long) {0}, .num_datatypes = 1,
168-
.elements = mca_pml_ob1_request_element, .extent = sizeof (MPI_Aint), .bind = MCA_BASE_VAR_BIND_MPI_COMM},
167+
.elements = mca_pml_ob1_request_element, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
169168
};
170169

171170
mca_pml_base_component_2_1_0_t mca_pml_ob1_component = {

‎ompi/mpi/tool/event_get_info.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
int MPI_T_event_get_info (int event_index, char *name, int *name_len,
3131
int *verbosity, MPI_Datatype *array_of_datatypes,
3232
MPI_Aint *array_of_displacements, int *num_elements,
33-
MPI_Aint *extent, MPI_T_enum *enumtype, MPI_Info *info,
33+
MPI_T_enum *enumtype, MPI_Info *info,
3434
char *desc, int *desc_len, int *bind)
3535
{
3636
mca_base_event_t * const event;
@@ -125,10 +125,6 @@ int MPI_T_event_get_info (int event_index, char *name, int *name_len,
125125
*bind = event->event_bind;
126126
}
127127

128-
if (NULL != extent) {
129-
*extent = event->event_extent;
130-
}
131-
132128
if (NULL != info) {
133129
*info = OBJ_NEW(ompi_info_t);
134130
}

0 commit comments

Comments
 (0)