linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Borislav Petkov <bp@suse.de>, David Ahern <dsahern@gmail.com>,
	Don Zickus <dzickus@redhat.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Jiri Olsa <jolsa@redhat.com>, Mike Galbraith <efault@gmx.de>,
	Namhyung Kim <namhyung@kernel.org>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Stephane Eranian <eranian@google.com>
Subject: [PATCH 16/18] perf tools: Use sysctl__read_int instead of ad-hoc copies
Date: Thu, 11 Dec 2014 18:26:04 -0300	[thread overview]
Message-ID: <1418333166-15429-17-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1418333166-15429-1-git-send-email-acme@kernel.org>

From: Arnaldo Carvalho de Melo <acme@redhat.com>

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-pt2u7a3b50oddggecx7rwq2n@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/record.c | 11 +----------
 tools/perf/util/util.c   |  9 +--------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c
index cf69325b985f..8acd0df88b5c 100644
--- a/tools/perf/util/record.c
+++ b/tools/perf/util/record.c
@@ -137,16 +137,7 @@ void perf_evlist__config(struct perf_evlist *evlist, struct record_opts *opts)
 
 static int get_max_rate(unsigned int *rate)
 {
-	char path[PATH_MAX];
-	const char *procfs = procfs__mountpoint();
-
-	if (!procfs)
-		return -1;
-
-	snprintf(path, PATH_MAX,
-		 "%s/sys/kernel/perf_event_max_sample_rate", procfs);
-
-	return filename__read_int(path, (int *) rate);
+	return sysctl__read_int("kernel/perf_event_max_sample_rate", (int *)rate);
 }
 
 static int record_opts__config_freq(struct record_opts *opts)
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 41125e5b011e..b86744f29eef 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -506,16 +506,9 @@ const char *get_filename_for_perf_kvm(void)
 
 int perf_event_paranoid(void)
 {
-	char path[PATH_MAX];
-	const char *procfs = procfs__mountpoint();
 	int value;
 
-	if (!procfs)
-		return INT_MAX;
-
-	scnprintf(path, PATH_MAX, "%s/sys/kernel/perf_event_paranoid", procfs);
-
-	if (filename__read_int(path, &value))
+	if (sysctl__read_int("kernel/perf_event_paranoid", &value))
 		return INT_MAX;
 
 	return value;
-- 
1.9.3


  parent reply	other threads:[~2014-12-11 21:27 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-11 21:25 [GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 01/18] perf bench: Prepare memcpy for merge Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 02/18] perf bench: Merge memset into memcpy Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 03/18] perf bench: Fix memcpy/memset output Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 04/18] perf hists browser: Change print format from %lu to %PRIu64 Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 05/18] perf tools: Use single strcmp call instead of two Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 06/18] perf buildid-cache: Remove extra debugdir variables Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 07/18] perf buildid cache: Fix -a segfault related to kcore handling Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 08/18] perf tools: Add --buildid-dir option to set cache directory Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 09/18] perf callchain: Fixup parameter handling error message Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 10/18] perf callchain: Move cpumode resolve code to add_callchain_ip Arnaldo Carvalho de Melo
2014-12-11 21:25 ` [PATCH 11/18] calloc/xcalloc: Fix argument order Arnaldo Carvalho de Melo
2014-12-11 21:26 ` [PATCH 12/18] perf tests: Fix attr tests size values to cope with machine state on interrupt ABI changes Arnaldo Carvalho de Melo
2014-12-11 21:26 ` [PATCH 13/18] perf kvm stat live: Mark events as (x86 only) in help output Arnaldo Carvalho de Melo
2014-12-11 21:26 ` [PATCH 14/18] tools lib fs: Adopt filename__read_int from tools/perf/ Arnaldo Carvalho de Melo
2014-12-11 21:26 ` [PATCH 15/18] tools lib fs: Add sysctl__read_int helper Arnaldo Carvalho de Melo
2014-12-11 21:26 ` Arnaldo Carvalho de Melo [this message]
2014-12-11 21:26 ` [PATCH 17/18] perf evlist: Introduce strerror_mmap method Arnaldo Carvalho de Melo
2014-12-11 21:26 ` [PATCH 18/18] perf trace: Provide a better explanation when mmap fails Arnaldo Carvalho de Melo
2014-12-12  8:10 ` [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1418333166-15429-17-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=bp@suse.de \
    --cc=dsahern@gmail.com \
    --cc=dzickus@redhat.com \
    --cc=efault@gmx.de \
    --cc=eranian@google.com \
    --cc=fweisbec@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).