Merge tag 'perf-core-for-mingo-5.7-20200310' of... (fdca7c14) · Commits · 戴 / test

tools/include/uapi/linux/perf_event.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -181,6 +181,8 @@ enum perf_branch_sample_type_shift {

		PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT = 16, /* save branch type */

		PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT = 17, /* save low level index of raw branch records */

		PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */
		};

		@@ -208,6 +210,8 @@ enum perf_branch_sample_type {
		PERF_SAMPLE_BRANCH_TYPE_SAVE =
		1U << PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT,

		PERF_SAMPLE_BRANCH_HW_INDEX = 1U << PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT,

		PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
		};

		@@ -853,7 +857,9 @@ enum perf_event_type {
		* char data[size];}&& PERF_SAMPLE_RAW
		*
		* { u64 nr;
		* { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK
		* { u64 hw_idx; } && PERF_SAMPLE_BRANCH_HW_INDEX
		* { u64 from, to, flags } lbr[nr];
		* } && PERF_SAMPLE_BRANCH_STACK
		*
		* { u64 abi; # enum perf_sample_regs_abi
		* u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER

tools/lib/api/fs/Build

+1 −0

Original line number	Diff line number	Diff line
		libapi-y += fs.o
		libapi-y += tracing_path.o
		libapi-y += cgroup.o

tools/lib/api/fs/cgroup.c

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		#include <linux/stringify.h>
		#include <sys/types.h>
		#include <sys/stat.h>
		#include <fcntl.h>
		#include <stdio.h>
		#include <stdlib.h>
		#include <string.h>
		#include "fs.h"

		int cgroupfs_find_mountpoint(char buf, size_t maxlen, const char subsys)
		{
		FILE *fp;
		char mountpoint[PATH_MAX + 1], tokens[PATH_MAX + 1], type[PATH_MAX + 1];
		char path_v1[PATH_MAX + 1], path_v2[PATH_MAX + 2], *path;
		char token, saved_ptr = NULL;

		fp = fopen("/proc/mounts", "r");
		if (!fp)
		return -1;

		/*
		* in order to handle split hierarchy, we need to scan /proc/mounts
		* and inspect every cgroupfs mount point to find one that has
		* perf_event subsystem
		*/
		path_v1[0] = '\0';
		path_v2[0] = '\0';

		while (fscanf(fp, "%*s %"__stringify(PATH_MAX)"s %"__stringify(PATH_MAX)"s %"
		__stringify(PATH_MAX)"s %d %d\n",
		mountpoint, type, tokens) == 3) {

		if (!path_v1[0] && !strcmp(type, "cgroup")) {

		token = strtok_r(tokens, ",", &saved_ptr);

		while (token != NULL) {
		if (subsys && !strcmp(token, subsys)) {
		strcpy(path_v1, mountpoint);
		break;
		}
		token = strtok_r(NULL, ",", &saved_ptr);
		}
		}

		if (!path_v2[0] && !strcmp(type, "cgroup2"))
		strcpy(path_v2, mountpoint);

		if (path_v1[0] && path_v2[0])
		break;
		}
		fclose(fp);

		if (path_v1[0])
		path = path_v1;
		else if (path_v2[0])
		path = path_v2;
		else
		return -1;

		if (strlen(path) < maxlen) {
		strcpy(buf, path);
		return 0;
		}
		return -1;
		}

tools/lib/api/fs/fs.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@ FS(bpf_fs)
		#undef FS


		int cgroupfs_find_mountpoint(char buf, size_t maxlen, const char subsys);

		int filename__read_int(const char filename, int value);
		int filename__read_ull(const char filename, unsigned long long value);
		int filename__read_xll(const char filename, unsigned long long value);

tools/lib/perf/Documentation/examples/counting.c

0 → 100644

+83 −0

Original line number	Diff line number	Diff line
		#include <linux/perf_event.h>
		#include <perf/evlist.h>
		#include <perf/evsel.h>
		#include <perf/cpumap.h>
		#include <perf/threadmap.h>
		#include <perf/mmap.h>
		#include <perf/core.h>
		#include <perf/event.h>
		#include <stdio.h>
		#include <unistd.h>

		static int libperf_print(enum libperf_print_level level,
		const char *fmt, va_list ap)
		{
		return vfprintf(stderr, fmt, ap);
		}

		int main(int argc, char **argv)
		{
		int count = 100000, err = 0;
		struct perf_evlist *evlist;
		struct perf_evsel *evsel;
		struct perf_thread_map *threads;
		struct perf_counts_values counts;

		struct perf_event_attr attr1 = {
		.type = PERF_TYPE_SOFTWARE,
		.config = PERF_COUNT_SW_CPU_CLOCK,
		.read_format = PERF_FORMAT_TOTAL_TIME_ENABLED\|PERF_FORMAT_TOTAL_TIME_RUNNING,
		.disabled = 1,
		};
		struct perf_event_attr attr2 = {
		.type = PERF_TYPE_SOFTWARE,
		.config = PERF_COUNT_SW_TASK_CLOCK,
		.read_format = PERF_FORMAT_TOTAL_TIME_ENABLED\|PERF_FORMAT_TOTAL_TIME_RUNNING,
		.disabled = 1,
		};

		libperf_init(libperf_print);
		threads = perf_thread_map__new_dummy();
		if (!threads) {
		fprintf(stderr, "failed to create threads\n");
		return -1;
		}
		perf_thread_map__set_pid(threads, 0, 0);
		evlist = perf_evlist__new();
		if (!evlist) {
		fprintf(stderr, "failed to create evlist\n");
		goto out_threads;
		}
		evsel = perf_evsel__new(&attr1);
		if (!evsel) {
		fprintf(stderr, "failed to create evsel1\n");
		goto out_evlist;
		}
		perf_evlist__add(evlist, evsel);
		evsel = perf_evsel__new(&attr2);
		if (!evsel) {
		fprintf(stderr, "failed to create evsel2\n");
		goto out_evlist;
		}
		perf_evlist__add(evlist, evsel);
		perf_evlist__set_maps(evlist, NULL, threads);
		err = perf_evlist__open(evlist);
		if (err) {
		fprintf(stderr, "failed to open evsel\n");
		goto out_evlist;
		}
		perf_evlist__enable(evlist);
		while (count--);
		perf_evlist__disable(evlist);
		perf_evlist__for_each_evsel(evlist, evsel) {
		perf_evsel__read(evsel, 0, 0, &counts);
		fprintf(stdout, "count %llu, enabled %llu, run %llu\n",
		counts.val, counts.ena, counts.run);
		}
		perf_evlist__close(evlist);
		out_evlist:
		perf_evlist__delete(evlist);
		out_threads:
		perf_thread_map__put(threads);
		return err;
		}

Admin message