1 files changed, 18 insertions, 42 deletions

diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 8f1ea27f976f..fcd54342c04c 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -4,6 +4,7 @@
 #include <math.h>
 #include <string.h>
 #include "counts.h"
+#include "cpumap.h"
 #include "debug.h"
 #include "header.h"
 #include "stat.h"
@@ -161,6 +162,15 @@ static void perf_evsel__free_prev_raw_counts(struct evsel *evsel)
         evsel->prev_raw_counts = NULL;
 }
 
+static void perf_evsel__reset_prev_raw_counts(struct evsel *evsel)
+{
+        if (evsel->prev_raw_counts) {
+                evsel->prev_raw_counts->aggr.val = 0;
+                evsel->prev_raw_counts->aggr.ena = 0;
+                evsel->prev_raw_counts->aggr.run = 0;
+       }
+}
+
 static int perf_evsel__alloc_stats(struct evsel *evsel, bool alloc_raw)
 {
         int ncpus = perf_evsel__nr_cpus(evsel);
@@ -211,6 +221,14 @@ void perf_evlist__reset_stats(struct evlist *evlist)
         }
 }
 
+void perf_evlist__reset_prev_raw_counts(struct evlist *evlist)
+{
+        struct evsel *evsel;
+
+        evlist__for_each_entry(evlist, evsel)
+                perf_evsel__reset_prev_raw_counts(evsel);
+}
+
 static void zero_per_pkg(struct evsel *counter)
 {
         if (counter->per_pkg_mask)
@@ -493,45 +511,3 @@ int create_perf_stat_counter(struct evsel *evsel,
 
         return perf_evsel__open_per_thread(evsel, evsel->core.threads);
 }
-
-int perf_stat_synthesize_config(struct perf_stat_config *config,
-                                struct perf_tool *tool,
-                                struct evlist *evlist,
-                                perf_event__handler_t process,
-                                bool attrs)
-{
-        int err;
-
-        if (attrs) {
-                err = perf_event__synthesize_attrs(tool, evlist, process);
-                if (err < 0) {
-                        pr_err("Couldn't synthesize attrs.\n");
-                        return err;
-                }
-        }
-
-        err = perf_event__synthesize_extra_attr(tool, evlist, process,
-                                                attrs);
-
-        err = perf_event__synthesize_thread_map2(tool, evlist->core.threads,
-                                                 process, NULL);
-        if (err < 0) {
-                pr_err("Couldn't synthesize thread map.\n");
-                return err;
-        }
-
-        err = perf_event__synthesize_cpu_map(tool, evlist->core.cpus,
-                                             process, NULL);
-        if (err < 0) {
-                pr_err("Couldn't synthesize thread map.\n");
-                return err;
-        }
-
-        err = perf_event__synthesize_stat_config(tool, config, process, NULL);
-        if (err < 0) {
-                pr_err("Couldn't synthesize config.\n");
-                return err;
-        }
-
-        return 0;
-}