Skip to content

Commit ef7edca

Browse files
committed
#2387: trace: remove callback and refactor reduce call
1 parent 722a457 commit ef7edca

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

src/vt/pipe/callback/cb_union/cb_raw_base.fwd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ using CallbackU = pipe::callback::cbunion::CallbackRawBaseSingle;
5959

6060
} // end namespace vt
6161

62-
#endif /*INCLUDED_VT_PIPE_CALLBACK_CB_UNION_CB_RAW_BASE_FWD_H*/
62+
#endif /*INCLUDED_VT_PIPE_CALLBACK_CB_UNION_CB_RAW_BASE_FWD_H*/

src/vt/trace/trace.cc

+6-3
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,13 @@ void Trace::addUserData(int32_t data) {
210210
);
211211
}
212212

213+
void Trace::reducedEventsHan(UserEventRegistry gathered_user_events) {
214+
vtAssert(theContext()->getNode() == 0, "Must be node 0");
215+
user_event_ = gathered_user_events;
216+
}
217+
213218
void Trace::gatherUserEvents() {
214-
vt::runInEpochCollective([&]{
215-
proxy_.reduce<vt::collective::PlusOp>(0, std::move(user_event_));
216-
});
219+
proxy_.reduce<&Trace::reducedEventsHan, vt::collective::PlusOp>(0, std::move(user_event_));
217220
}
218221

219222
UserEventIDType Trace::registerUserEventRoot(std::string const& name) {

src/vt/trace/trace.h

+6
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,12 @@ struct Trace : runtime::component::Component<Trace>, TraceLite {
291291
*/
292292
void addUserData(int32_t data);
293293

294+
/**
295+
* \brief Update event registry on Node 0 with all gathered events
296+
* \param[in] gathered_user_events summed registry of user events from all nodes
297+
*/
298+
void reducedEventsHan(UserEventRegistry gathered_user_events);
299+
294300
/**
295301
* \brief Gathers all user-defined event hashes onto node 0.
296302
*/

0 commit comments

Comments
 (0)