Skip to content

Commit 04ff86e

Browse files
cchambreaucchambreau
committed
Remove non-conformant event_get_info extent argument and internal tracking.
Signed-off-by: Chris Chambreau <[email protected]>
1 parent 2400b8a commit 04ff86e

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
@@ -2870,7 +2870,7 @@ OMPI_DECLSPEC int PMPI_T_event_get_num (int *num_events);
28702870
OMPI_DECLSPEC int PMPI_T_event_get_info (int event_index, char *name, int *name_len,
28712871
int *verbosity, MPI_Datatype *array_of_datatypes,
28722872
MPI_Aint *array_of_displacements, int *num_elements,
2873-
MPI_Aint *extent, MPI_T_enum *enumtype, MPI_Info *info,
2873+
MPI_T_enum *enumtype, MPI_Info *info,
28742874
char *desc, int *desc_len, int *bind);
28752875
OMPI_DECLSPEC int PMPI_T_event_get_index (const char *name, int *event_index);
28762876
OMPI_DECLSPEC int PMPI_T_event_handle_alloc (int event_index, void *obj_handle,
@@ -2970,7 +2970,7 @@ OMPI_DECLSPEC int MPI_T_event_get_num (int *num_events);
29702970
OMPI_DECLSPEC int MPI_T_event_get_info (int event_index, char *name, int *name_len,
29712971
int *verbosity, MPI_Datatype *array_of_datatypes,
29722972
MPI_Aint *array_of_displacements, int *num_elements,
2973-
MPI_Aint *extent, MPI_T_enum *enumtype, MPI_Info *info,
2973+
MPI_T_enum *enumtype, MPI_Info *info,
29742974
char *desc, int *desc_len, int *bind);
29752975
OMPI_DECLSPEC int MPI_T_event_get_index (const char *name, int *event_index);
29762976
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
@@ -108,62 +108,62 @@ mca_base_event_list_item_t mca_osc_rdma_events[] = {
108108
[OMPI_OSC_RDMA_EVENT_LOCK_ACQUIRED] = {.name = "lock_acquired", .desc = "Passive-target lock aquired",
109109
.verbosity = OPAL_INFO_LVL_5, .datatypes = &(opal_datatype_t *) {&ompi_mpi_int.dt.super},
110110
.offsets = &(unsigned long) {0}, .num_datatypes = 1, .elements = mca_osc_rdma_target_element,
111-
.extent = sizeof (int), .bind = MCA_BASE_VAR_BIND_MPI_WIN},
111+
.bind = MCA_BASE_VAR_BIND_MPI_WIN},
112112

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

170169
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)