Skip to content

Commit

Permalink
perf record: Enable the enable_on_exec flag if record forks the target
Browse files Browse the repository at this point in the history
When forking its target, perf record can capture data from
before the target application is started.  Perf stat uses the
enable_on_exec flag in the event attributes to keep from
displaying events from before the target program starts, this
patch adds the same functionality to perf record when it is will
fork the target process.

Signed-off-by: Eric B Munson <ebmunson@us.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <1268664418-28328-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Eric B Munson authored and Ingo Molnar committed Mar 15, 2010
1 parent e449526 commit bedbfde
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions tools/perf/builtin-record.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ static struct perf_header_attr *get_header_attr(struct perf_event_attr *a, int n
return h_attr;
}

static void create_counter(int counter, int cpu, pid_t pid)
static void create_counter(int counter, int cpu, pid_t pid, bool forks)
{
char *filter = filters[counter];
struct perf_event_attr *attr = attrs + counter;
Expand Down Expand Up @@ -277,6 +277,9 @@ static void create_counter(int counter, int cpu, pid_t pid)
attr->inherit = inherit;
attr->disabled = 1;

if (forks)
attr->enable_on_exec = 1;

try_again:
fd[nr_cpu][counter] = sys_perf_event_open(attr, pid, cpu, group_fd, 0);

Expand Down Expand Up @@ -381,13 +384,13 @@ static void create_counter(int counter, int cpu, pid_t pid)
ioctl(fd[nr_cpu][counter], PERF_EVENT_IOC_ENABLE);
}

static void open_counters(int cpu, pid_t pid)
static void open_counters(int cpu, pid_t pid, bool forks)
{
int counter;

group_fd = -1;
for (counter = 0; counter < nr_counters; counter++)
create_counter(counter, cpu, pid);
create_counter(counter, cpu, pid, forks);

nr_cpu++;
}
Expand Down Expand Up @@ -547,11 +550,11 @@ static int __cmd_record(int argc, const char **argv)


if ((!system_wide && !inherit) || profile_cpu != -1) {
open_counters(profile_cpu, target_pid);
open_counters(profile_cpu, target_pid, forks);
} else {
nr_cpus = read_cpu_map();
for (i = 0; i < nr_cpus; i++)
open_counters(cpumap[i], target_pid);
open_counters(cpumap[i], target_pid, forks);
}

if (file_new) {
Expand Down

0 comments on commit bedbfde

Please sign in to comment.