projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf: Do the big rename: Performance Counters -> Performance Events
[deliverable/linux.git]
/
tools
/
perf
/
builtin-stat.c
diff --git
a/tools/perf/builtin-stat.c
b/tools/perf/builtin-stat.c
index 61b828236c11520e9833df8d688f0263d701f116..16af2d82e85810f4e8d3dec2ff15016ab8d31b30 100644
(file)
--- a/
tools/perf/builtin-stat.c
+++ b/
tools/perf/builtin-stat.c
@@
-48,7
+48,7
@@
#include <sys/prctl.h>
#include <math.h>
#include <sys/prctl.h>
#include <math.h>
-static struct perf_
counter
_attr default_attrs[] = {
+static struct perf_
event
_attr default_attrs[] = {
{ .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_TASK_CLOCK },
{ .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_CONTEXT_SWITCHES},
{ .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_TASK_CLOCK },
{ .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_CONTEXT_SWITCHES},
@@
-130,11
+130,11
@@
struct stats runtime_cycles_stats;
attrs[counter].config == PERF_COUNT_##c)
#define ERR_PERF_OPEN \
attrs[counter].config == PERF_COUNT_##c)
#define ERR_PERF_OPEN \
-"Error: counter %d, sys_perf_
counter
_open() syscall returned with %d (%s)\n"
+"Error: counter %d, sys_perf_
event
_open() syscall returned with %d (%s)\n"
static void create_perf_stat_counter(int counter, int pid)
{
static void create_perf_stat_counter(int counter, int pid)
{
- struct perf_
counter
_attr *attr = attrs + counter;
+ struct perf_
event
_attr *attr = attrs + counter;
if (scale)
attr->read_format = PERF_FORMAT_TOTAL_TIME_ENABLED |
if (scale)
attr->read_format = PERF_FORMAT_TOTAL_TIME_ENABLED |
@@
-144,7
+144,7
@@
static void create_perf_stat_counter(int counter, int pid)
unsigned int cpu;
for (cpu = 0; cpu < nr_cpus; cpu++) {
unsigned int cpu;
for (cpu = 0; cpu < nr_cpus; cpu++) {
- fd[cpu][counter] = sys_perf_
counter
_open(attr, -1, cpu, -1, 0);
+ fd[cpu][counter] = sys_perf_
event
_open(attr, -1, cpu, -1, 0);
if (fd[cpu][counter] < 0 && verbose)
fprintf(stderr, ERR_PERF_OPEN, counter,
fd[cpu][counter], strerror(errno));
if (fd[cpu][counter] < 0 && verbose)
fprintf(stderr, ERR_PERF_OPEN, counter,
fd[cpu][counter], strerror(errno));
@@
-154,7
+154,7
@@
static void create_perf_stat_counter(int counter, int pid)
attr->disabled = 1;
attr->enable_on_exec = 1;
attr->disabled = 1;
attr->enable_on_exec = 1;
- fd[0][counter] = sys_perf_
counter
_open(attr, pid, -1, -1, 0);
+ fd[0][counter] = sys_perf_
event
_open(attr, pid, -1, -1, 0);
if (fd[0][counter] < 0 && verbose)
fprintf(stderr, ERR_PERF_OPEN, counter,
fd[0][counter], strerror(errno));
if (fd[0][counter] < 0 && verbose)
fprintf(stderr, ERR_PERF_OPEN, counter,
fd[0][counter], strerror(errno));
This page took
0.024119 seconds
and
5
git commands to generate.