Skip to content

Commit

Permalink
perf record: Move 'group' to perf_event_ops
Browse files Browse the repository at this point in the history
Will be used in other tools to share the command line parsing code.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-8x0yr77r6lrd2t699s499m8n@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Nov 28, 2011
1 parent b424eba commit ed80f58
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
9 changes: 4 additions & 5 deletions tools/perf/builtin-record.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ struct perf_record_opts record_opts = {
static unsigned int page_size;
static int output;
static const char *output_name = NULL;
static bool group = false;
static int realtime_prio = 0;
static enum write_mode_t write_mode = WRITE_FORCE;
static bool no_buildid = false;
Expand Down Expand Up @@ -202,13 +201,13 @@ static void open_counters(struct perf_evlist *evlist)
*/
bool time_needed = attr->sample_type & PERF_SAMPLE_TIME;

if (group && pos != first)
if (record_opts.group && pos != first)
group_fd = first->fd;
retry_sample_id:
attr->sample_id_all = record_opts.sample_id_all_avail ? 1 : 0;
try_again:
if (perf_evsel__open(pos, evlist->cpus, evlist->threads, group,
group_fd) < 0) {
if (perf_evsel__open(pos, evlist->cpus, evlist->threads,
record_opts.group, group_fd) < 0) {
int err = errno;

if (err == EPERM || err == EACCES) {
Expand Down Expand Up @@ -649,7 +648,7 @@ const struct option record_options[] = {
OPT_UINTEGER('F', "freq", &record_opts.user_freq, "profile at this frequency"),
OPT_UINTEGER('m', "mmap-pages", &record_opts.mmap_pages,
"number of mmap data pages"),
OPT_BOOLEAN(0, "group", &group,
OPT_BOOLEAN(0, "group", &record_opts.group,
"put the counters into a counter group"),
OPT_BOOLEAN('g', "call-graph", &record_opts.call_graph,
"do call-graph (stack chain/backtrace) recording"),
Expand Down
1 change: 1 addition & 0 deletions tools/perf/perf.h
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ struct perf_record_opts {
pid_t target_pid;
pid_t target_tid;
bool call_graph;
bool group;
bool inherit_stat;
bool no_delay;
bool no_inherit;
Expand Down

0 comments on commit ed80f58

Please sign in to comment.