diff options
Diffstat (limited to 'tools/perf/builtin-record.c')
| -rw-r--r-- | tools/perf/builtin-record.c | 23 | 
1 files changed, 5 insertions, 18 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 80dc5b790e4..6b0519f885e 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -30,8 +30,6 @@  #include <sched.h>  #include <sys/mman.h> -#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y)) -  enum write_mode_t {  	WRITE_FORCE,  	WRITE_APPEND @@ -47,7 +45,7 @@ static int			freq				=   1000;  static int			output;  static int			pipe_output			=      0;  static const char		*output_name			= NULL; -static int			group				=      0; +static bool			group				=  false;  static int			realtime_prio			=      0;  static bool			nodelay				=  false;  static bool			raw_samples			=  false; @@ -438,7 +436,6 @@ static void mmap_read_all(void)  static int __cmd_record(int argc, const char **argv)  { -	int i;  	struct stat st;  	int flags;  	int err; @@ -682,7 +679,6 @@ static int __cmd_record(int argc, const char **argv)  	for (;;) {  		int hits = samples; -		int thread;  		mmap_read_all(); @@ -693,19 +689,8 @@ static int __cmd_record(int argc, const char **argv)  			waking++;  		} -		if (done) { -			for (i = 0; i < evsel_list->cpus->nr; i++) { -				struct perf_evsel *pos; - -				list_for_each_entry(pos, &evsel_list->entries, node) { -					for (thread = 0; -						thread < evsel_list->threads->nr; -						thread++) -						ioctl(FD(pos, i, thread), -							PERF_EVENT_IOC_DISABLE); -				} -			} -		} +		if (done) +			perf_evlist__disable(evsel_list);  	}  	if (quiet || signr == SIGUSR1) @@ -768,6 +753,8 @@ const struct option record_options[] = {  		    "child tasks do not inherit counters"),  	OPT_UINTEGER('F', "freq", &user_freq, "profile at this frequency"),  	OPT_UINTEGER('m', "mmap-pages", &mmap_pages, "number of mmap data pages"), +	OPT_BOOLEAN(0, "group", &group, +		    "put the counters into a counter group"),  	OPT_BOOLEAN('g', "call-graph", &call_graph,  		    "do call-graph (stack chain/backtrace) recording"),  	OPT_INCR('v', "verbose", &verbose,  |