summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/builtin-annotate.c2
-rw-r--r--tools/perf/builtin-report.c7
-rw-r--r--tools/perf/builtin-trace.c2
-rw-r--r--tools/perf/util/event.c6
-rw-r--r--tools/perf/util/event.h5
-rw-r--r--tools/perf/util/session.h3
6 files changed, 10 insertions, 15 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 1f1341f1dd84..fa833f50763e 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -487,7 +487,7 @@ static int __cmd_annotate(void)
dsos__fprintf(stdout);
perf_session__collapse_resort(session);
- perf_session__output_resort(session, event__total[0]);
+ perf_session__output_resort(session, session->event_total[0]);
perf_session__find_annotations(session);
out_delete:
perf_session__delete(session);
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 142c475f9918..d12ea4ab0d21 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -619,8 +619,7 @@ static int process_sample_event(event_t *event, struct perf_session *session)
return -1;
}
- event__stats.total += data.period;
-
+ session->events_stats.total += data.period;
return 0;
}
@@ -731,8 +730,8 @@ static int __cmd_report(void)
dsos__fprintf(stdout);
perf_session__collapse_resort(session);
- perf_session__output_resort(session, event__stats.total);
- perf_session__fprintf_hist_entries(session, event__stats.total, stdout);
+ perf_session__output_resort(session, session->events_stats.total);
+ perf_session__fprintf_hist_entries(session, session->events_stats.total, stdout);
if (show_threads)
perf_read_values_destroy(&show_threads_values);
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 9ee976dc395b..07da66511bd5 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -96,8 +96,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
data.raw_size,
data.time, thread->comm);
}
- event__stats.total += data.period;
+ session->events_stats.total += data.period;
return 0;
}
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 222efb1fc3bd..375fb6dca1cf 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -187,8 +187,6 @@ void event__synthesize_threads(int (*process)(event_t *event,
closedir(proc);
}
-struct events_stats event__stats;
-
int event__process_comm(event_t *self, struct perf_session *session)
{
struct thread *thread = perf_session__findnew(session, self->comm.pid);
@@ -203,10 +201,10 @@ int event__process_comm(event_t *self, struct perf_session *session)
return 0;
}
-int event__process_lost(event_t *self, struct perf_session *session __used)
+int event__process_lost(event_t *self, struct perf_session *session)
{
dump_printf(": id:%Ld: lost:%Ld\n", self->lost.id, self->lost.lost);
- event__stats.lost += self->lost.lost;
+ session->events_stats.lost += self->lost.lost;
return 0;
}
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 035ecf3c25cc..a92e0b039a6a 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -168,11 +168,6 @@ void event__synthesize_threads(int (*process)(event_t *event,
struct perf_session *session),
struct perf_session *session);
-extern char *event__cwd;
-extern int event__cwdlen;
-extern struct events_stats event__stats;
-extern unsigned long event__total[PERF_RECORD_MAX];
-
int event__process_comm(event_t *self, struct perf_session *session);
int event__process_lost(event_t *self, struct perf_session *session);
int event__process_mmap(event_t *self, struct perf_session *session);
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 4e8a21c5304c..bdfc4b8eee7a 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -5,6 +5,7 @@
#include "header.h"
#include "thread.h"
#include <linux/rbtree.h>
+#include "../../../include/linux/perf_event.h"
struct ip_callchain;
struct thread;
@@ -18,6 +19,8 @@ struct perf_session {
struct map_groups kmaps;
struct rb_root threads;
struct thread *last_match;
+ struct events_stats events_stats;
+ unsigned long event_total[PERF_RECORD_MAX];
struct rb_root hists;
u64 sample_type;
int fd;