Skip to content

Commit cd1f857

Browse files
hppritchajsquyres
hppritcha
authored and
jsquyres
committed
pr review feedback
Signed-off-by: Howard Pritchard <howardp@lanl.gov>
1 parent 5c396a5 commit cd1f857

21 files changed

+196
-189
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ static void ompi_osc_rdma_handle_post (ompi_osc_rdma_module_t *module, int rank,
182182
rank, (int) (npeers - state->num_post_msgs - 1));
183183
/* an atomic is not really necessary as this function is currently used but it doesn't hurt */
184184
ompi_osc_rdma_counter_add (&state->num_post_msgs, 1);
185-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_ACCESS_START].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
185+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_ACCESS_START].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
186186
module->win, NULL, &rank);
187187
return;
188188
}
@@ -309,7 +309,7 @@ int ompi_osc_rdma_post_atomic (ompi_group_t *group, int mpi_assert, ompi_win_t *
309309
return OMPI_SUCCESS;
310310
}
311311

312-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_EXPOSE_START].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
312+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_EXPOSE_START].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
313313
module->win, NULL, NULL);
314314

315315
/* translate group ranks into the communicator */
@@ -399,7 +399,7 @@ int ompi_osc_rdma_start_atomic (ompi_group_t *group, int mpi_assert, ompi_win_t
399399
"from %d processes", peer->rank, (int) (group_size - state->num_post_msgs - 1));
400400
opal_list_remove_item (&module->pending_posts, &pending_post->super);
401401
OBJ_RELEASE(pending_post);
402-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_ACCESS_START].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
402+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_ACCESS_START].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
403403
module->win, NULL, &peer->rank);
404404
ompi_osc_rdma_counter_add (&state->num_post_msgs, 1);
405405
break;
@@ -471,7 +471,7 @@ int ompi_osc_rdma_complete_atomic (ompi_win_t *win)
471471
ompi_osc_rdma_peer_t *peer = peers[i];
472472
intptr_t target = (intptr_t) peer->state + offsetof (ompi_osc_rdma_state_t, num_complete_msgs);
473473

474-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_ACCESS_COMPLETE].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
474+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_ACCESS_COMPLETE].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
475475
module->win, NULL, &peer->rank);
476476

477477
if (!ompi_osc_rdma_peer_local_state (peer)) {
@@ -517,7 +517,7 @@ int ompi_osc_rdma_wait_atomic (ompi_win_t *win)
517517
opal_atomic_mb ();
518518
}
519519

520-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_EXPOSE_COMPLETE].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
520+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_EXPOSE_COMPLETE].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
521521
module->win, NULL, NULL);
522522

523523
OPAL_THREAD_LOCK(&module->lock);
@@ -569,7 +569,7 @@ int ompi_osc_rdma_test_atomic (ompi_win_t *win, int *flag)
569569
module->pw_group = NULL;
570570
OPAL_THREAD_UNLOCK(&(module->lock));
571571

572-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_EXPOSE_COMPLETE].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
572+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PSCW_EXPOSE_COMPLETE].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
573573
module->win, NULL, NULL);
574574

575575
OBJ_RELEASE(group);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ static int ompi_osc_rdma_put_real (ompi_osc_rdma_sync_t *sync, ompi_osc_rdma_pee
457457
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "initiating btl put of %lu bytes to remote address %" PRIx64 ", sync "
458458
"object %p...", (unsigned long) size, target_address, (void *) sync);
459459

460-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PUT_STARTED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
460+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_PUT_STARTED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
461461
module->win, NULL, &((mca_osc_rdma_rdma_event_t){.target = peer->rank, .address = target_address, .size = size}));
462462

463463
/* flag outstanding rma requests */
@@ -716,7 +716,7 @@ static int ompi_osc_rdma_get_contig (ompi_osc_rdma_sync_t *sync, ompi_osc_rdma_p
716716
ompi_osc_rdma_sync_rdma_inc (sync);
717717
}
718718

719-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_GET_STARTED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
719+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_GET_STARTED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
720720
module->win, NULL, &((mca_osc_rdma_rdma_event_t){.target = peer->rank, .address = source_address, .size = size}));
721721

722722
do {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ int ompi_osc_rdma_flush (int target, struct ompi_win_t *win)
5656
}
5757
OPAL_THREAD_UNLOCK(&module->lock);
5858

59-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_FLUSH_STARTED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
59+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_FLUSH_STARTED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
6060
module->win, NULL, &target);
6161

6262
/* finish all outstanding fragments */
6363
ompi_osc_rdma_sync_rdma_complete (lock);
6464

65-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_FLUSH_COMPLETE].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
65+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_FLUSH_COMPLETE].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
6666
module->win, NULL, &target);
6767

6868
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "flush on target %d complete", target);
@@ -91,7 +91,7 @@ int ompi_osc_rdma_flush_all (struct ompi_win_t *win)
9191
ompi_osc_rdma_sync_rdma_complete (&module->all_sync);
9292
}
9393

94-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_FLUSH_STARTED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
94+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_FLUSH_STARTED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
9595
module->win, NULL, &(int) {-1});
9696

9797
/* flush all locks */
@@ -103,7 +103,7 @@ int ompi_osc_rdma_flush_all (struct ompi_win_t *win)
103103
node, &node);
104104
}
105105

106-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_FLUSH_COMPLETE].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
106+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_FLUSH_COMPLETE].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
107107
module->win, NULL, &(int) {-1});
108108

109109
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "flush_all complete");
@@ -171,7 +171,7 @@ static inline int ompi_osc_rdma_lock_atomic_internal (ompi_osc_rdma_module_t *mo
171171
} while (1);
172172
}
173173

174-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_LOCK_ACQUIRED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
174+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_LOCK_ACQUIRED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
175175
module->win, NULL, &peer->rank);
176176

177177
return OMPI_SUCCESS;
@@ -198,7 +198,7 @@ static inline int ompi_osc_rdma_unlock_atomic_internal (ompi_osc_rdma_module_t *
198198
peer->flags &= ~OMPI_OSC_RDMA_PEER_DEMAND_LOCKED;
199199
}
200200

201-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_LOCK_RELEASED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
201+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_LOCK_RELEASED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
202202
module->win, NULL, &peer->rank);
203203

204204

@@ -375,7 +375,7 @@ int ompi_osc_rdma_lock_all_atomic (int mpi_assert, struct ompi_win_t *win)
375375
offsetof(ompi_osc_rdma_state_t, global_lock),
376376
0x00000000ffffffffUL);
377377

378-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_LOCK_ACQUIRED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
378+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_LOCK_ACQUIRED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
379379
module->win, NULL, &(int) {-1});
380380
} else {
381381
/* always lock myself */
@@ -433,7 +433,7 @@ int ompi_osc_rdma_unlock_all_atomic (struct ompi_win_t *win)
433433
(void) ompi_osc_rdma_lock_release_shared (module, module->leader, -0x0000000100000000UL,
434434
offsetof (ompi_osc_rdma_state_t, global_lock));
435435

436-
mca_base_event_raise(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_LOCK_RELEASED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
436+
MCA_BASE_EVENT_RAISE(mca_osc_rdma_events[OMPI_OSC_RDMA_EVENT_LOCK_RELEASED].event, MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
437437
module->win, NULL, &(int) {-1});
438438
}
439439
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ int mca_pml_ob1_add_comm(ompi_communicator_t* comm)
302302
* figure out if the messages are not received in the correct
303303
* order (if multiple network interfaces).
304304
*/
305-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_MESSAGE_ARRIVED].event,
305+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_MESSAGE_ARRIVED].event,
306306
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, hdr);
307307

308308
/* There is no matching to be done, and no lock to be held on the communicator as
@@ -319,7 +319,7 @@ int mca_pml_ob1_add_comm(ompi_communicator_t* comm)
319319
#else
320320
custom_match_umq_append(pml_comm->umq, hdr->hdr_tag, hdr->hdr_src, frag);
321321
#endif
322-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_UNEX_INSERT].event,
322+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_UNEX_INSERT].event,
323323
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, hdr);
324324
continue;
325325
}
@@ -334,7 +334,7 @@ int mca_pml_ob1_add_comm(ompi_communicator_t* comm)
334334
#else
335335
custom_match_umq_append(pml_comm->umq, hdr->hdr_tag, hdr->hdr_src, frag);
336336
#endif
337-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_UNEX_INSERT].event,
337+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_UNEX_INSERT].event,
338338
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, hdr);
339339

340340
/* And now the ugly part. As some fragments can be inserted in the cant_match list,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ int mca_pml_ob1_irecv_init(void *addr,
6060
addr,
6161
count, datatype, src, tag, comm, true);
6262

63-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
63+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
6464
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, &recvreq);
6565

6666
/* Work around a leak in start by marking this request as complete. The
@@ -91,7 +91,7 @@ int mca_pml_ob1_irecv(void *addr,
9191
addr,
9292
count, datatype, src, tag, comm, false);
9393

94-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
94+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
9595
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, &recvreq);
9696

9797
MCA_PML_OB1_RECV_REQUEST_START(recvreq);
@@ -126,7 +126,7 @@ int mca_pml_ob1_recv(void *addr,
126126
MCA_PML_OB1_RECV_REQUEST_INIT(recvreq, addr, count, datatype,
127127
src, tag, comm, false);
128128

129-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
129+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
130130
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, &recvreq);
131131

132132
MCA_PML_OB1_RECV_REQUEST_START(recvreq);
@@ -218,7 +218,7 @@ mca_pml_ob1_imrecv( void *buf,
218218
src, tag, comm, false);
219219
OBJ_RELEASE(comm);
220220

221-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
221+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
222222
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, &recvreq);
223223

224224
/* init/re-init the request */
@@ -310,7 +310,7 @@ mca_pml_ob1_mrecv( void *buf,
310310
src, tag, comm, false);
311311
OBJ_RELEASE(comm);
312312

313-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
313+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
314314
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, &recvreq);
315315

316316
/* init/re-init the request */

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int mca_pml_ob1_isend_init(const void *buf,
5757
MCA_PML_OB1_SEND_REQUEST_INIT(sendreq, buf, count, datatype, dst, tag,
5858
comm, sendmode, true, ob1_proc);
5959

60-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
60+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
6161
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, &sendreq);
6262

6363
/* Work around a leak in start by marking this request as complete. The
@@ -196,7 +196,7 @@ int mca_pml_ob1_isend(const void *buf,
196196
dst, tag,
197197
comm, sendmode, false, ob1_proc);
198198

199-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
199+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
200200
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, &sendreq);
201201

202202
MCA_PML_OB1_SEND_REQUEST_START_W_SEQ(sendreq, endpoint, seqn, rc);
@@ -306,7 +306,7 @@ int mca_pml_ob1_send(const void *buf,
306306
MCA_PML_OB1_SEND_REQUEST_INIT(sendreq, buf, count, datatype, dst, tag,
307307
comm, sendmode, false, ob1_proc);
308308

309-
mca_base_event_raise (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
309+
MCA_BASE_EVENT_RAISE (mca_pml_ob1_events[MCA_PML_OB1_EVENT_REQUEST_ACTIVATE].event,
310310
MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE, comm, NULL, &sendreq);
311311

312312
MCA_PML_OB1_SEND_REQUEST_START_W_SEQ(sendreq, endpoint, seqn, rc);

0 commit comments

Comments
 (0)