Skip to content

Commit 779e46d

Browse files
committed
#2387: store event id instead of msg (wip)
1 parent e28e7ef commit 779e46d

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

src/vt/trace/trace.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ void insertNewUserEvent(
220220
#endif
221221
}
222222

223-
void Trace::addHashedEventMsg(Message event_msg) {
224-
theTrace()->user_hashed_events_.push_back(event_msg);
223+
void Trace::addHashedEvent(UserEventIDType event_id) {
224+
theTrace()->user_hashed_events_.push_back(event_id);
225225
}
226226

227227
void Trace::addUserEvent(UserEventIDType event) {

src/vt/trace/trace.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,11 @@ struct Trace : runtime::component::Component<Trace>, TraceLite {
221221
void registerUserEventManual(std::string const& name, UserSpecEventIDType id);
222222

223223
/**
224-
* \brief Store a hashed event
224+
* \brief Store a hashed event ID
225225
*
226-
* \param[in] event_msg the hashed event message
226+
* \param[in] event_id the hashed event ID
227227
*/
228-
void addHashedEventMsg(Message event_msg);
228+
void addHashedEvent(UserEventIDType event_id);
229229

230230
/**
231231
* \brief Log a user event

src/vt/trace/trace_lite.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -545,11 +545,11 @@ void TraceLite::writeTracesFile(int flush, bool is_incremental_flush) {
545545

546546
// Allreduce the hashed events to rank 0 before writing sts file
547547
auto const root = 0;
548-
std::vector<Message> all_hashed_events;
549-
auto msg = makeMessage<ReduceVecMsg<Message>>(
548+
std::vector<UserEventIDType> all_hashed_events;
549+
auto msg = makeMessage<ReduceVecMsg<UserEventIDType>>(
550550
theTrace()->user_hashed_events_);
551551
theCollective()->global()->reduce<
552-
PlusOp<std::vector<Message>>, Verify<ReduceOP::Plus>
552+
PlusOp<std::vector<UserEventIDType>>, Verify<ReduceOP::Plus>
553553
>(root, msg.get());
554554

555555
size_t to_write = traces_.size();

src/vt/trace/trace_lite.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ struct TraceLite {
427427
int incremental_flush_mode_ = 0;
428428

429429
UserEventRegistry user_event_ = {};
430-
std::vector<Message> user_hashed_events_;
430+
std::vector<UserEventIDType> user_hashed_events_;
431431
EventHoldStackType event_holds_;
432432
TraceStackType open_events_;
433433
TraceContainerType traces_;

src/vt/trace/trace_user_event.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ UserEventIDType UserEventRegistry::hash(std::string const& in_event_name) {
8484
auto id = std::get<0>(ret);
8585
auto inserted = std::get<1>(ret);
8686
if (inserted) {
87-
auto msg = makeMessage<NewUserEventMsg>(false, id, in_event_name);
88-
theTrace->addHashedEventMsg(msg);
87+
theTrace->addHashedEvent(id);
8988
}
9089
return id;
9190
}

0 commit comments

Comments
 (0)