All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@redhat.com>
To: John Garry <john.garry@huawei.com>
Cc: peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
	mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
	namhyung@kernel.org, will@kernel.org, ak@linux.intel.com,
	linuxarm@huawei.com, linux-kernel@vger.kernel.org,
	qiangqing.zhang@nxp.com, irogers@google.com,
	robin.murphy@arm.com, zhangshaokun@hisilicon.com,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH RFC v3 02/12] perf jevents: Add support for system events tables
Date: Mon, 11 May 2020 13:01:37 +0200	[thread overview]
Message-ID: <20200511110137.GC2986380@krava> (raw)
In-Reply-To: <1588852671-61996-3-git-send-email-john.garry@huawei.com>

On Thu, May 07, 2020 at 07:57:41PM +0800, John Garry wrote:

SNIP

> +				      &sys_event_tables);
> +		}
> +
>  		print_events_table_prefix(eventsfp, tblname);
>  		return 0;
>  	}
> @@ -1180,7 +1253,6 @@ int main(int argc, char *argv[])
>  	} else if (rc < 0) {
>  		/* Make build fail */
>  		fclose(eventsfp);
> -		free_arch_std_events();
>  		ret = 1;
>  		goto out_free_mapfile;
>  	} else if (rc) {
> @@ -1206,27 +1278,31 @@ int main(int argc, char *argv[])
>  	if (close_table)
>  		print_events_table_suffix(eventsfp);
>  
> -	if (!mapfile) {
> -		pr_info("%s: No CPU->JSON mapping?\n", prog);
> -		goto empty_map;
> +	if (mapfile) {
> +		if (process_mapfile(eventsfp, mapfile)) {
> +			pr_err("%s: Error processing mapfile %s\n", prog,
> +			       mapfile);
> +			/* Make build fail */
> +			fclose(eventsfp);
> +			ret = 1;
> +		}
> +	} else {
> +		pr_err("%s: No CPU->JSON mapping?\n", prog);

shouldn't we jump to empty_map in here? there still needs to be a
mapfile, right?

jirka

>  	}
>  
> -	if (process_mapfile(eventsfp, mapfile)) {
> -		pr_info("%s: Error processing mapfile %s\n", prog, mapfile);
> -		/* Make build fail */
> +	if (process_system_event_tables(eventsfp)) {
>  		fclose(eventsfp);
> -		free_arch_std_events();
>  		ret = 1;
>  	}
>  
> -
>  	goto out_free_mapfile;
>  
>  empty_map:
>  	fclose(eventsfp);
>  	create_empty_mapping(output_file);
> -	free_arch_std_events();
>  out_free_mapfile:
> +	free_arch_std_events();
> +	free_sys_event_tables();
>  	free(mapfile);
>  	return ret;
>  }

SNIP


WARNING: multiple messages have this Message-ID (diff)
From: Jiri Olsa <jolsa@redhat.com>
To: John Garry <john.garry@huawei.com>
Cc: mark.rutland@arm.com, irogers@google.com, ak@linux.intel.com,
	qiangqing.zhang@nxp.com, peterz@infradead.org,
	robin.murphy@arm.com, linuxarm@huawei.com, acme@kernel.org,
	linux-kernel@vger.kernel.org, zhangshaokun@hisilicon.com,
	alexander.shishkin@linux.intel.com, mingo@redhat.com,
	namhyung@kernel.org, will@kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH RFC v3 02/12] perf jevents: Add support for system events tables
Date: Mon, 11 May 2020 13:01:37 +0200	[thread overview]
Message-ID: <20200511110137.GC2986380@krava> (raw)
In-Reply-To: <1588852671-61996-3-git-send-email-john.garry@huawei.com>

On Thu, May 07, 2020 at 07:57:41PM +0800, John Garry wrote:

SNIP

> +				      &sys_event_tables);
> +		}
> +
>  		print_events_table_prefix(eventsfp, tblname);
>  		return 0;
>  	}
> @@ -1180,7 +1253,6 @@ int main(int argc, char *argv[])
>  	} else if (rc < 0) {
>  		/* Make build fail */
>  		fclose(eventsfp);
> -		free_arch_std_events();
>  		ret = 1;
>  		goto out_free_mapfile;
>  	} else if (rc) {
> @@ -1206,27 +1278,31 @@ int main(int argc, char *argv[])
>  	if (close_table)
>  		print_events_table_suffix(eventsfp);
>  
> -	if (!mapfile) {
> -		pr_info("%s: No CPU->JSON mapping?\n", prog);
> -		goto empty_map;
> +	if (mapfile) {
> +		if (process_mapfile(eventsfp, mapfile)) {
> +			pr_err("%s: Error processing mapfile %s\n", prog,
> +			       mapfile);
> +			/* Make build fail */
> +			fclose(eventsfp);
> +			ret = 1;
> +		}
> +	} else {
> +		pr_err("%s: No CPU->JSON mapping?\n", prog);

shouldn't we jump to empty_map in here? there still needs to be a
mapfile, right?

jirka

>  	}
>  
> -	if (process_mapfile(eventsfp, mapfile)) {
> -		pr_info("%s: Error processing mapfile %s\n", prog, mapfile);
> -		/* Make build fail */
> +	if (process_system_event_tables(eventsfp)) {
>  		fclose(eventsfp);
> -		free_arch_std_events();
>  		ret = 1;
>  	}
>  
> -
>  	goto out_free_mapfile;
>  
>  empty_map:
>  	fclose(eventsfp);
>  	create_empty_mapping(output_file);
> -	free_arch_std_events();
>  out_free_mapfile:
> +	free_arch_std_events();
> +	free_sys_event_tables();
>  	free(mapfile);
>  	return ret;
>  }

SNIP


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-05-11 11:01 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-07 11:57 [PATCH RFC v3 00/12] perf pmu-events: Support event aliasing for system PMUs John Garry
2020-05-07 11:57 ` John Garry
2020-05-07 11:57 ` [PATCH RFC v3 01/12] perf jevents: Add support for an extra directory level John Garry
2020-05-07 11:57   ` John Garry
2020-05-07 11:57 ` [PATCH RFC v3 02/12] perf jevents: Add support for system events tables John Garry
2020-05-07 11:57   ` John Garry
2020-05-11 11:01   ` Jiri Olsa
2020-05-11 11:01     ` Jiri Olsa
2020-05-11 14:52     ` John Garry
2020-05-11 14:52       ` John Garry
2020-05-11 11:01   ` Jiri Olsa [this message]
2020-05-11 11:01     ` Jiri Olsa
2020-05-11 15:02     ` John Garry
2020-05-11 15:02       ` John Garry
2020-05-11 16:21       ` Ian Rogers
2020-05-11 16:21         ` Ian Rogers
2020-05-12 10:29         ` Jiri Olsa
2020-05-12 10:29           ` Jiri Olsa
2020-05-11 11:01   ` Jiri Olsa
2020-05-11 11:01     ` Jiri Olsa
2020-05-07 11:57 ` [PATCH RFC v3 03/12] perf vendor events arm64: Relocate hip08 events John Garry
2020-05-07 11:57   ` John Garry
2020-05-07 11:57 ` [PATCH RFC v3 04/12] perf vendor events arm64: Add Architected events smmuv3-pmcg.json John Garry
2020-05-07 11:57   ` John Garry
2020-05-07 11:57 ` [PATCH RFC v3 05/12] perf vendor events arm64: Add hip08 SMMUv3 PMCG events John Garry
2020-05-07 11:57   ` John Garry
2020-05-07 11:57 ` [PATCH RFC v3 06/12] perf pmu: Add pmu_id() John Garry
2020-05-07 11:57   ` John Garry
2020-05-07 11:57 ` [PATCH RFC v3 07/12] perf pmu: Add pmu_add_sys_aliases() John Garry
2020-05-07 11:57   ` John Garry
2020-05-07 11:57 ` [PATCH RFC v3 08/12] perf vendor events: Add JSON metrics for imx8mm DDR Perf John Garry
2020-05-07 11:57   ` John Garry
2020-05-07 11:57 ` [PATCH RFC v3 09/12] perf metricgroup: Split up metricgroup__add_metric() John Garry
2020-05-07 11:57   ` John Garry
2020-05-11 11:01   ` Jiri Olsa
2020-05-11 11:01     ` Jiri Olsa
2020-05-11 11:25     ` John Garry
2020-05-11 11:25       ` John Garry
2020-05-11 11:35       ` Joakim Zhang
2020-05-11 11:35         ` Joakim Zhang
2020-05-07 11:57 ` [PATCH RFC v3 10/12] perf metricgroup: Split up metricgroup__print() John Garry
2020-05-07 11:57   ` John Garry
2020-05-07 11:57 ` [PATCH RFC v3 11/12] perf metricgroup: Support printing metric groups for system PMUs John Garry
2020-05-07 11:57   ` John Garry
2020-05-07 11:57 ` [PATCH RFC v3 12/12] perf metricgroup: Support adding metrics " John Garry
2020-05-07 11:57   ` John Garry
2020-05-08  2:55 ` [PATCH RFC v3 00/12] perf pmu-events: Support event aliasing " Joakim Zhang
2020-05-08  2:55   ` Joakim Zhang
2020-05-12  8:02 ` Joakim Zhang
2020-05-12  8:02   ` Joakim Zhang
2020-05-12 10:13   ` John Garry
2020-05-12 10:13     ` John Garry
2020-05-12 10:30     ` Joakim Zhang
2020-05-12 10:30       ` Joakim Zhang

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=20200511110137.GC2986380@krava \
    --to=jolsa@redhat.com \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=irogers@google.com \
    --cc=john.garry@huawei.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=mark.rutland@arm.com \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=qiangqing.zhang@nxp.com \
    --cc=robin.murphy@arm.com \
    --cc=will@kernel.org \
    --cc=zhangshaokun@hisilicon.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.