Skip to content

Commit 83df444

Browse files
committed
Refactor code for improved readability and consistency in Data and TraceData components
1 parent 5cc4984 commit 83df444

4 files changed

Lines changed: 237 additions & 224 deletions

File tree

third_party/proton/csrc/include/Data/Data.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ struct DataEntry {
3737
std::reference_wrapper<std::map<MetricKind, std::unique_ptr<Metric>>> metrics;
3838
/// `flexibleMetrics` is a map from metric name to flexible metric
3939
/// accumulator associated with the entry.
40-
std::reference_wrapper<std::map<std::string, FlexibleMetric>>
41-
flexibleMetrics;
40+
std::reference_wrapper<std::map<std::string, FlexibleMetric>> flexibleMetrics;
4241

4342
explicit DataEntry(size_t id, size_t phase,
4443
std::map<MetricKind, std::unique_ptr<Metric>> &metrics,

third_party/proton/csrc/lib/Data/TraceData.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ struct KernelMetricWithContext {
231231
: kernelMetric(metric), contexts(std::move(ctx)) {}
232232
};
233233

234-
std::vector<KernelTrace> convertToTimelineTrace(
235-
std::vector<CycleMetricWithContext> &cycleEvents) {
234+
std::vector<KernelTrace>
235+
convertToTimelineTrace(std::vector<CycleMetricWithContext> &cycleEvents) {
236236
std::vector<KernelTrace> results;
237237

238238
auto getInt64Value = [](const CycleMetric *metric,
@@ -403,11 +403,11 @@ void dumpCycleMetricTrace(std::vector<CycleMetricWithContext> &cycleEvents,
403403
writer.write(os);
404404
}
405405

406-
void dumpKernelMetricTrace(uint64_t minTimeStamp,
407-
const std::map<size_t,
408-
std::vector<KernelMetricWithContext>>
409-
&streamTraceEvents,
410-
std::ostream &os) {
406+
void dumpKernelMetricTrace(
407+
uint64_t minTimeStamp,
408+
const std::map<size_t, std::vector<KernelMetricWithContext>>
409+
&streamTraceEvents,
410+
std::ostream &os) {
411411
// for each streamId in ascending order, emit one JSON line
412412
for (auto const &[streamId, events] : streamTraceEvents) {
413413
json object = {{"displayTimeUnit", "us"}, {"traceEvents", json::array()}};
@@ -498,7 +498,8 @@ void TraceData::dumpChromeTrace(std::ostream &os, size_t phase) const {
498498
}
499499
if (auto cycleIt = metrics.find(MetricKind::Cycle);
500500
cycleIt != metrics.end()) {
501-
auto *cycleMetric = static_cast<CycleMetric *>(cycleIt->second.get());
501+
auto *cycleMetric =
502+
static_cast<CycleMetric *>(cycleIt->second.get());
502503
cycleEvents.emplace_back(cycleMetric, contexts);
503504
hasCycleMetrics = true;
504505
}

0 commit comments

Comments
 (0)