Commit b9f616bb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

parents 636f0c70 cc5a91e9

tools/perf/Documentation/perf-list.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ EVENT MODIFIERS 
Events can optionally have a modifer by appending a colon and one or

Events can optionally have a modifer by appending a colon and one or

more modifiers.  Modifiers allow the user to restrict when events are

more modifiers.  Modifiers allow the user to restrict when events are

counted with 'u' for user-space, 'k' for kernel, 'h' for hypervisor.

counted with 'u' for user-space, 'k' for kernel, 'h' for hypervisor.

Additional modifiers are 'G' for guest counting (in KVM guests) and 'H'

for host counting (not in KVM guests).





The 'p' modifier can be used for specifying how precise the instruction

The 'p' modifier can be used for specifying how precise the instruction

address should be. The 'p' modifier is currently only implemented for

address should be. The 'p' modifier is currently only implemented for

tools/perf/MANIFEST

+1 −0
Original line number Original line Diff line number Diff line 
tools/perf

tools/perf

include/linux/const.h

include/linux/perf_event.h

include/linux/perf_event.h

include/linux/rbtree.h

include/linux/rbtree.h

include/linux/list.h

include/linux/list.h

tools/perf/builtin-kvm.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -22,9 +22,6 @@ 
static const char		*file_name;

static const char		*file_name;

static char			name_buffer[256];

static char			name_buffer[256];





bool				perf_host = 1;

bool				perf_guest;



static const char * const kvm_usage[] = {

static const char * const kvm_usage[] = {

	"perf kvm [<options>] {top|record|report|diff|buildid-list}",

	"perf kvm [<options>] {top|record|report|diff|buildid-list}",

	NULL

	NULL
@@ -107,7 +104,8 @@ static int __cmd_buildid_list(int argc, const char **argv) 




int cmd_kvm(int argc, const char **argv, const char *prefix __used)

int cmd_kvm(int argc, const char **argv, const char *prefix __used)

{

{

	perf_host = perf_guest = 0;

	perf_host  = 0;

	perf_guest = 1;





	argc = parse_options(argc, argv, kvm_options, kvm_usage,

	argc = parse_options(argc, argv, kvm_options, kvm_usage,

			PARSE_OPT_STOP_AT_NON_OPTION);

			PARSE_OPT_STOP_AT_NON_OPTION);

tools/perf/builtin-top.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -235,7 +235,6 @@ static struct hist_entry *perf_evsel__add_hist_entry(struct perf_evsel *evsel, 
	if (he == NULL)

	if (he == NULL)

		return NULL;

		return NULL;





	evsel->hists.stats.total_period += sample->period;

	hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);

	hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);

	return he;

	return he;

}

}

tools/perf/util/evlist.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -111,8 +111,11 @@ int perf_evlist__add_default(struct perf_evlist *evlist) 
		.type = PERF_TYPE_HARDWARE,

		.type = PERF_TYPE_HARDWARE,

		.config = PERF_COUNT_HW_CPU_CYCLES,

		.config = PERF_COUNT_HW_CPU_CYCLES,

	};

	};

	struct perf_evsel *evsel = perf_evsel__new(&attr, 0);

	struct perf_evsel *evsel;



	event_attr_init(&attr);





	evsel = perf_evsel__new(&attr, 0);

	if (evsel == NULL)

	if (evsel == NULL)

		goto error;

		goto error;