Use perf Profiler pointers instead

jdamato-fsly · jdamato-fsly · commit 573cf020fe6f · 2019-10-16T13:35:41.000-07:00
Signed-off-by: Joe Damato &lt;jdamato@fastly.com&gt;
diff --git a/collector/perf_linux.go b/collector/perf_linux.go
@@ -45,9 +45,9 @@ type perfCollector struct {
 	hwProfilerCpuMap    map[*perf.HardwareProfiler]int
 	swProfilerCpuMap    map[*perf.SoftwareProfiler]int
 	cacheProfilerCpuMap map[*perf.CacheProfiler]int
-	perfHwProfilers     map[int]perf.HardwareProfiler
-	perfSwProfilers     map[int]perf.SoftwareProfiler
-	perfCacheProfilers  map[int]perf.CacheProfiler
+	perfHwProfilers     map[int]*perf.HardwareProfiler
+	perfSwProfilers     map[int]*perf.SoftwareProfiler
+	perfCacheProfilers  map[int]*perf.CacheProfiler
 	desc                map[string]*prometheus.Desc
 }
 
@@ -63,9 +63,9 @@ func isValidCPUString(cpus *string) bool {
 // per CPU.
 func NewPerfCollector() (Collector, error) {
 	collector := &perfCollector{
-		perfHwProfilers:     map[int]perf.HardwareProfiler{},
-		perfSwProfilers:     map[int]perf.SoftwareProfiler{},
-		perfCacheProfilers:  map[int]perf.CacheProfiler{},
+		perfHwProfilers:     map[int]*perf.HardwareProfiler{},
+		perfSwProfilers:     map[int]*perf.SoftwareProfiler{},
+		perfCacheProfilers:  map[int]*perf.CacheProfiler{},
 		hwProfilerCpuMap:    map[*perf.HardwareProfiler]int{},
 		swProfilerCpuMap:    map[*perf.SoftwareProfiler]int{},
 		cacheProfilerCpuMap: map[*perf.CacheProfiler]int{},
@@ -97,24 +97,24 @@ func NewPerfCollector() (Collector, error) {
 		// Use -1 to profile all processes on the CPU, see:
 		// man perf_event_open
 		p := perf.NewHardwareProfiler(-1, i)
-		collector.perfHwProfilers[idx] = p
-		if err := collector.perfHwProfilers[idx].Start(); err != nil {
+		collector.perfHwProfilers[idx] = &p
+		if err := p.Start(); err != nil {
 			return collector, err
 		} else {
 			collector.hwProfilerCpuMap[&p] = i
 		}
 
 		p2 := perf.NewSoftwareProfiler(-1, i)
-		collector.perfSwProfilers[i] = p2
-		if err := collector.perfSwProfilers[i].Start(); err != nil {
+		collector.perfSwProfilers[i] = &p2
+		if err := p2.Start(); err != nil {
 			return collector, err
 		} else {
 			collector.swProfilerCpuMap[&p2] = i
 		}
 
 		p3 := perf.NewCacheProfiler(-1, i)
-		collector.perfCacheProfilers[i] = p3
-		if err := collector.perfCacheProfilers[i].Start(); err != nil {
+		collector.perfCacheProfilers[i] = &p3
+		if err := p3.Start(); err != nil {
 			return collector, err
 		} else {
 			collector.cacheProfilerCpuMap[&p3] = i
@@ -386,9 +386,9 @@ func (c *perfCollector) Update(ch chan<- prometheus.Metric) error {
 
 func (c *perfCollector) updateHardwareStats(ch chan<- prometheus.Metric) error {
 	for _, profiler := range c.perfHwProfilers {
-		cpuid := c.hwProfilerCpuMap[&profiler]
+		cpuid := c.hwProfilerCpuMap[profiler]
 		cpuStr := fmt.Sprintf("%d", cpuid)
-		hwProfile, err := profiler.Profile()
+		hwProfile, err := (*profiler).Profile()
 		if err != nil {
 			return err
 		}
@@ -458,9 +458,9 @@ func (c *perfCollector) updateHardwareStats(ch chan<- prometheus.Metric) error {
 
 func (c *perfCollector) updateSoftwareStats(ch chan<- prometheus.Metric) error {
 	for _, profiler := range c.perfSwProfilers {
-		cpuid := c.swProfilerCpuMap[&profiler]
+		cpuid := c.swProfilerCpuMap[profiler]
 		cpuStr := fmt.Sprintf("%d", cpuid)
-		swProfile, err := profiler.Profile()
+		swProfile, err := (*profiler).Profile()
 		if err != nil {
 			return err
 		}
@@ -514,9 +514,9 @@ func (c *perfCollector) updateSoftwareStats(ch chan<- prometheus.Metric) error {
 
 func (c *perfCollector) updateCacheStats(ch chan<- prometheus.Metric) error {
 	for _, profiler := range c.perfCacheProfilers {
-		cpuid := c.cacheProfilerCpuMap[&profiler]
+		cpuid := c.cacheProfilerCpuMap[profiler]
 		cpuStr := fmt.Sprintf("%d", cpuid)
-		cacheProfile, err := profiler.Profile()
+		cacheProfile, err := (*profiler).Profile()
 		if err != nil {
 			return err
 		}
