Skip to content

Commit 1771158

Browse files
committed
#2388: move write_stats_event to lb manager
1 parent 5744127 commit 1771158

File tree

4 files changed

+31
-28
lines changed

4 files changed

+31
-28
lines changed

src/vt/trace/trace.cc

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ void Trace::initialize() /*override*/ {
8484

8585
// Register a trace user event to demarcate flushes that occur
8686
flush_event_ = trace::registerEventCollective("trace_flush");
87-
write_stats_event_ = trace::registerEventCollective("write_lb_stats");
8887
#endif
8988
}
9089

src/vt/trace/trace_lite.h

+14-24
Original file line numberDiff line numberDiff line change
@@ -295,15 +295,6 @@ struct TraceLite {
295295
return traces_.size();
296296
}
297297

298-
/**
299-
* @brief Get the LB Stats Write event
300-
*
301-
* @return the LB stats write event
302-
*/
303-
UserEventIDType getWriteStatsEvent() const {
304-
return write_stats_event_;
305-
}
306-
307298
/**
308299
* @brief Get the last recorded trace event
309300
*
@@ -439,21 +430,20 @@ struct TraceLite {
439430
EventHoldStackType event_holds_;
440431
TraceStackType open_events_;
441432
TraceContainerType traces_;
442-
TraceEventIDType cur_event_ = 1;
443-
UserEventIDType write_stats_event_ = no_user_event_id;
444-
UserEventIDType flush_event_ = no_user_event_id;
445-
bool enabled_ = true;
446-
TimeType start_time_ = TimeType{0.0};
447-
std::string prog_name_ = "";
448-
std::string trace_name_ = "";
449-
std::string full_trace_name_ = "";
450-
std::string full_sts_name_ = "";
451-
std::string full_dir_name_ = "";
452-
bool wrote_sts_file_ = false;
453-
size_t trace_write_count_ = 0;
454-
bool standalone_initalized_ = false;
455-
bool trace_enabled_cur_phase_ = true;
456-
bool idle_begun_ = false;
433+
TraceEventIDType cur_event_ = 1;
434+
UserEventIDType flush_event_ = no_user_event_id;
435+
bool enabled_ = true;
436+
TimeType start_time_ = TimeType{0.0};
437+
std::string prog_name_ = "";
438+
std::string trace_name_ = "";
439+
std::string full_trace_name_ = "";
440+
std::string full_sts_name_ = "";
441+
std::string full_dir_name_ = "";
442+
bool wrote_sts_file_ = false;
443+
size_t trace_write_count_ = 0;
444+
bool standalone_initalized_ = false;
445+
bool trace_enabled_cur_phase_ = true;
446+
bool idle_begun_ = false;
457447
std::unique_ptr<vt_gzFile> log_file_;
458448
std::unordered_map<TraceEventIDType, std::stack<Log*>> incomplete_notes_ = {};
459449
};

src/vt/vrt/collection/balance/lb_invoke/lb_manager.cc

+6-3
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,10 @@ void LBManager::startup() {
463463
thePhase()->printSummary(last_phase_info_.get());
464464
theLBManager()->finishedLB(phase);
465465
});
466+
467+
#if vt_check_enabled(trace_enabled)
468+
write_stats_event_ = theTrace()->registerUserEventColl("write_lb_stats");
469+
#endif
466470
}
467471

468472
void LBManager::destroyLB() {
@@ -667,8 +671,7 @@ void LBManager::commitPhaseStatistics(PhaseType phase) {
667671
}
668672

669673
#if vt_check_enabled(trace_enabled)
670-
auto write_lb_stats_event = theTrace()->getWriteStatsEvent();
671-
theTrace()->addUserEventBracketedBegin(write_lb_stats_event);
674+
theTrace()->addUserEventBracketedBegin(write_stats_event_);
672675
#endif
673676

674677
vt_debug_print(
@@ -689,7 +692,7 @@ void LBManager::commitPhaseStatistics(PhaseType phase) {
689692
writer->commitStaged();
690693

691694
#if vt_check_enabled(trace_enabled)
692-
theTrace()->addUserEventBracketedEnd(write_lb_stats_event);
695+
theTrace()->addUserEventBracketedEnd(write_stats_event_);
693696
#endif
694697
}
695698

src/vt/vrt/collection/balance/lb_invoke/lb_manager.h

+11
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
#include "vt/vrt/collection/balance/lb_invoke/phase_info.h"
5656
#include "vt/utils/json/base_appender.h"
5757

58+
#if vt_check_enabled(trace_enabled)
59+
#include "vt/trace/trace_common.h"
60+
#endif
61+
5862
#include <functional>
5963
#include <map>
6064
#include <unordered_map>
@@ -213,6 +217,9 @@ struct LBManager : runtime::component::Component<LBManager> {
213217
| model_
214218
| lb_instances_
215219
| stats
220+
#if vt_check_enabled(trace_enabled)
221+
| write_stats_event_
222+
#endif
216223
| created_lbstats_dir_;
217224
}
218225

@@ -305,6 +312,10 @@ struct LBManager : runtime::component::Component<LBManager> {
305312
bool before_lb_stats_ = true;
306313
/// The appender for outputting statistics in JSON format
307314
std::unique_ptr<util::json::BaseAppender> statistics_writer_ = nullptr;
315+
/// Event ID for writing out the LB stats
316+
#if vt_check_enabled(trace_enabled)
317+
trace::UserEventIDType write_stats_event_ = trace::no_user_event_id;
318+
#endif
308319
/// Whether the LB statistics directory has been created
309320
bool created_lbstats_dir_ = false;
310321
};

0 commit comments

Comments
 (0)