linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@redhat.com>
To: Andi Kleen <andi@firstfloor.org>
Cc: acme@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org,
	Andi Kleen <ak@linux.intel.com>
Subject: Re: [PATCH] perf, tools, script: Allow adding and removing fields
Date: Tue, 9 May 2017 19:05:34 +0200	[thread overview]
Message-ID: <20170509170534.GA17318@krava> (raw)
In-Reply-To: <20170509143637.12810-1-andi@firstfloor.org>

On Tue, May 09, 2017 at 07:36:37AM -0700, Andi Kleen wrote:

SNIP

> +				} else {
> +					if (change == REMOVE)
> +						output[j].fields &= ~all_output_options[i].field;
> +					else
> +						output[j].fields |= all_output_options[i].field;
> +				}
>  			}
>  		} else {
>  			if (output[type].invalid_fields & all_output_options[i].field) {
> @@ -1826,10 +1852,15 @@ static int parse_output_fields(const struct option *opt __maybe_unused,
>  				 "Events will not be displayed.\n", event_type(type));
>  		}
>  	}
> +	goto out;
>  
> +out_badmix:
> +	fprintf(stderr, "Cannot mix +-field with overridden fields\n");
> +	rc = -EINVAL;
>  out:
>  	free(str);
>  	return rc;
> +
>  }

extra new line, but I guess Arnaldo could remove that ;-)

Acked-by: Jiri Olsa <jolsa@kernel.org>

thanks,
jirka

  reply	other threads:[~2017-05-09 17:05 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-09 14:36 [PATCH] perf, tools, script: Allow adding and removing fields Andi Kleen
2017-05-09 17:05 ` Jiri Olsa [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-06-02 15:48 Andi Kleen
2017-06-08 12:59 ` Milian Wolff
2017-06-09  2:52   ` Andi Kleen
2017-06-09  9:13     ` Milian Wolff
2017-06-11 19:06       ` Andi Kleen
2017-06-08 14:34 ` Arnaldo Carvalho de Melo
2017-05-08 16:21 Andi Kleen
2017-05-09 12:18 ` Jiri Olsa
2017-05-09 12:29   ` Andi Kleen
2017-05-09 13:45     ` Jiri Olsa
2017-05-09 14:34       ` Andi Kleen
2017-05-01 19:47 Andi Kleen
2017-05-02  6:41 ` Jiri Olsa
2017-05-04 22:26   ` Andi Kleen
2017-05-05  7:57     ` Jiri Olsa
2017-05-05 19:43       ` Andi Kleen
2017-05-07 14:08         ` Jiri Olsa

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=20170509170534.GA17318@krava \
    --to=jolsa@redhat.com \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=andi@firstfloor.org \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@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).