public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andi Kleen <ak@linux.intel.com>
To: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Andi Kleen <andi@firstfloor.org>,
	jolsa@redhat.com, mingo@kernel.org, acme@kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/3] perf, tools: Fix jevents dependencies
Date: Thu, 28 May 2015 14:15:57 -0700	[thread overview]
Message-ID: <20150528211557.GR7484@tassilo.jf.intel.com> (raw)
In-Reply-To: <20150528205716.GA11221@us.ibm.com>

On Thu, May 28, 2015 at 01:57:16PM -0700, Sukadev Bhattiprolu wrote:
> Andi Kleen [andi@firstfloor.org] wrote:
> | From: Andi Kleen <ak@linux.intel.com>
> | 
> | The "find" based dependencies for the JSON files didn't work me. I
> | didn't get a rebuild when the JSON files changed.
> 
> Hmm, it works for me every time. I like the 'find' better because it
> is more compact and allows mulitple levels.

You're right. On rechecking it seems to work. Perhaps was some other
problem earlier. So the patch can be dropped.

> 
> | Change it to
> | use wildcard. Also add a dependency for the jevents binary itself
> | and for the mapfile.
> 
> I was trying this to address Jiri's comment about being silent if
> some architectures don't have JSON files (and based on your comments
> above, added the depedency for mapfile and jevents)

Ok.

> 
> diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build
> index 7e0c85c..45b05a7 100644
> --- a/tools/perf/pmu-events/Build
> +++ b/tools/perf/pmu-events/Build
> @@ -1,10 +1,12 @@
>  jevents-y      += json.o jsmn.o jevents.o
>  pmu-events-y   += pmu-events.o
> -JSON           =  $(shell find pmu-events/arch/$(ARCH) -name '*.json')
> -
> +EVDIR          = pmu-events/arch/$(ARCH)
> +JSON           =  $(shell [ -d $(EVDIR) ] && \
> +                       find $(EVDIR) -name '*.json' -o -name 'mapfile*')

BTW should only process a single mapfile called mapfile.csv

Currently it processes editor backup files and similar too, which is not really
intended.

-Andi

      reply	other threads:[~2015-05-28 21:16 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-28 20:19 perf: Additional improvements for json event lists Andi Kleen
2015-05-28 20:20 ` [PATCH 1/3] perf, tools: Add override support for event list CPUID Andi Kleen
2015-05-28 20:20 ` [PATCH 2/3] perf, tools: Support long descriptions with perf list -v Andi Kleen
2015-05-28 20:20 ` [PATCH 3/3] perf, tools: Fix jevents dependencies Andi Kleen
2015-05-28 20:57   ` Sukadev Bhattiprolu
2015-05-28 21:15     ` Andi Kleen [this message]

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=20150528211557.GR7484@tassilo.jf.intel.com \
    --to=ak@linux.intel.com \
    --cc=acme@kernel.org \
    --cc=andi@firstfloor.org \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=sukadev@linux.vnet.ibm.com \
    /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