Rename time to event in Soong metrics system.

Several structs and files are named time which records the total
execution of a traceable event. Soon, resource information of an
executed process is collected during a build event so a more generic
name is applied.

Bug: b/169453825
Test: go test and m nothing. Checked the soong_metrics protobuf.
Change-Id: I65a782603530d51018d6cc1192c18cfeef7566a0
This commit is contained in:
Patrice Arruda
2020-10-19 11:20:21 -07:00
parent fec3bf2e2c
commit 457c5d3426
5 changed files with 19 additions and 19 deletions

View File

@@ -48,7 +48,7 @@ func (c ContextImpl) BeginTrace(name, desc string) {
c.Tracer.Begin(desc, c.Thread)
}
if c.Metrics != nil {
c.Metrics.TimeTracer.Begin(name, desc, c.Thread)
c.Metrics.EventTracer.Begin(name, desc, c.Thread)
}
}
@@ -58,7 +58,7 @@ func (c ContextImpl) EndTrace() {
c.Tracer.End(c.Thread)
}
if c.Metrics != nil {
c.Metrics.SetTimeMetrics(c.Metrics.TimeTracer.End(c.Thread))
c.Metrics.SetTimeMetrics(c.Metrics.EventTracer.End(c.Thread))
}
}

View File

@@ -23,10 +23,10 @@ bootstrap_go_package {
],
srcs: [
"metrics.go",
"time.go",
"event.go",
],
testSrcs: [
"time_test.go",
"event_test.go",
],
}

View File

@@ -25,7 +25,7 @@ import (
// for testing purpose only
var _now = now
type timeEvent struct {
type event struct {
desc string
name string
@@ -33,26 +33,26 @@ type timeEvent struct {
start time.Time
}
type TimeTracer interface {
type EventTracer interface {
Begin(name, desc string, thread tracer.Thread)
End(thread tracer.Thread) soong_metrics_proto.PerfInfo
}
type timeTracerImpl struct {
activeEvents []timeEvent
type eventTracerImpl struct {
activeEvents []event
}
var _ TimeTracer = &timeTracerImpl{}
var _ EventTracer = &eventTracerImpl{}
func now() time.Time {
return time.Now()
}
func (t *timeTracerImpl) Begin(name, desc string, _ tracer.Thread) {
t.activeEvents = append(t.activeEvents, timeEvent{name: name, desc: desc, start: _now()})
func (t *eventTracerImpl) Begin(name, desc string, _ tracer.Thread) {
t.activeEvents = append(t.activeEvents, event{name: name, desc: desc, start: _now()})
}
func (t *timeTracerImpl) End(tracer.Thread) soong_metrics_proto.PerfInfo {
func (t *eventTracerImpl) End(tracer.Thread) soong_metrics_proto.PerfInfo {
if len(t.activeEvents) < 1 {
panic("Internal error: No pending events for endAt to end!")
}

View File

@@ -28,14 +28,14 @@ func TestEnd(t *testing.T) {
_now = func() time.Time { return startTime.Add(dur) }
defer func() { _now = initialNow }()
timeTracer := &timeTracerImpl{}
timeTracer.activeEvents = append(timeTracer.activeEvents, timeEvent{
eventTracer := &eventTracerImpl{}
eventTracer.activeEvents = append(eventTracer.activeEvents, event{
desc: "test",
name: "test",
start: startTime,
})
perf := timeTracer.End(tracer.Thread(0))
perf := eventTracer.End(tracer.Thread(0))
if perf.GetRealTime() != uint64(dur.Nanoseconds()) {
t.Errorf("got %d, want %d nanoseconds for event duration", perf.GetRealTime(), dur.Nanoseconds())
}

View File

@@ -36,14 +36,14 @@ const (
)
type Metrics struct {
metrics soong_metrics_proto.MetricsBase
TimeTracer TimeTracer
metrics soong_metrics_proto.MetricsBase
EventTracer EventTracer
}
func New() (metrics *Metrics) {
m := &Metrics{
metrics: soong_metrics_proto.MetricsBase{},
TimeTracer: &timeTracerImpl{},
metrics: soong_metrics_proto.MetricsBase{},
EventTracer: &eventTracerImpl{},
}
return m
}