bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
To: "Björn Töpel" <bjorn.topel@gmail.com>
Cc: linux-kernel@vger.kernel.org,
	"Björn Töpel" <bjorn.topel@intel.com>,
	netdev@vger.kernel.org, bpf@vger.kernel.org, ast@kernel.org,
	daniel@iogearbox.net, adrian.hunter@intel.com, jolsa@kernel.org,
	namhyung@kernel.org
Subject: Re: [PATCH 1/2] perf tools: Make usage of test_attr__* optional for perf-sys.h
Date: Thu, 3 Oct 2019 10:50:42 -0300	[thread overview]
Message-ID: <20191003135042.GA18973@kernel.org> (raw)
In-Reply-To: <20191001113307.27796-2-bjorn.topel@gmail.com>

Em Tue, Oct 01, 2019 at 01:33:06PM +0200, Björn Töpel escreveu:
> From: Björn Töpel <bjorn.topel@intel.com>
> 
> For users of perf-sys.h outside perf, e.g. samples/bpf/bpf_load.c,
> it's convenient not to depend on test_attr__*.
> 
> After commit 91854f9a077e ("perf tools: Move everything related to
> sys_perf_event_open() to perf-sys.h"), all users of perf-sys.h will
> depend on test_attr__enabled and test_attr__open.
> 
> This commit enables a user to define HAVE_ATTR_TEST to zero in order
> to omit the test dependency.

Woah, I wasn't expecting tools/perf/ stuff to be included from outside
tools/perf/, so thanks for fixing that odd user.

Applied.

- Arnaldo
 
> Fixes: 91854f9a077e ("perf tools: Move everything related to sys_perf_event_open() to perf-sys.h")
> Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
> ---
>  tools/perf/perf-sys.h | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h
> index 63e4349a772a..15e458e150bd 100644
> --- a/tools/perf/perf-sys.h
> +++ b/tools/perf/perf-sys.h
> @@ -15,7 +15,9 @@ void test_attr__init(void);
>  void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,
>  		     int fd, int group_fd, unsigned long flags);
>  
> -#define HAVE_ATTR_TEST
> +#ifndef HAVE_ATTR_TEST
> +#define HAVE_ATTR_TEST 1
> +#endif
>  
>  static inline int
>  sys_perf_event_open(struct perf_event_attr *attr,
> @@ -27,7 +29,7 @@ sys_perf_event_open(struct perf_event_attr *attr,
>  	fd = syscall(__NR_perf_event_open, attr, pid, cpu,
>  		     group_fd, flags);
>  
> -#ifdef HAVE_ATTR_TEST
> +#if HAVE_ATTR_TEST
>  	if (unlikely(test_attr__enabled))
>  		test_attr__open(attr, pid, cpu, fd, group_fd, flags);
>  #endif
> -- 
> 2.20.1

-- 

- Arnaldo

  parent reply	other threads:[~2019-10-03 13:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-01 11:33 [PATCH 0/2] perf tools: optional compile time test_attr__* depenency for perf-sys.h Björn Töpel
2019-10-01 11:33 ` [PATCH 1/2] perf tools: Make usage of test_attr__* optional " Björn Töpel
2019-10-02 21:00   ` Song Liu
2019-10-03 13:50   ` Arnaldo Carvalho de Melo [this message]
2019-10-15  5:31   ` [tip: perf/core] " tip-bot2 for Björn Töpel
2019-10-01 11:33 ` [PATCH 2/2] samples/bpf: fix build by setting HAVE_ATTR_TEST to zero Björn Töpel
2019-10-02 21:00   ` Song Liu
2019-10-03  0:19     ` KP Singh
2019-10-03 13:53       ` Arnaldo Carvalho de Melo
2019-10-15  5:31   ` [tip: perf/core] " tip-bot2 for Björn Töpel

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=20191003135042.GA18973@kernel.org \
    --to=arnaldo.melo@gmail.com \
    --cc=adrian.hunter@intel.com \
    --cc=ast@kernel.org \
    --cc=bjorn.topel@gmail.com \
    --cc=bjorn.topel@intel.com \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=namhyung@kernel.org \
    --cc=netdev@vger.kernel.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).