Re: [PATCH v13 13/14] perf, tools: Handle header line in mapfile

[Jiri Olsa]

On Tue, Jun 02, 2015 at 10:12:13AM -0700, Sukadev Bhattiprolu wrote:
> From: Andi Kleen 
> 
> Support a header line in the mapfile.csv, to match the existing
> mapfiles

'Suport' means 'skip' in here

jirka

> 
> Signed-off-by: Andi Kleen 
> Signed-off-by: Sukadev Bhattiprolu 
> 
> Changelog[v2]
>   All architectures may not use the "Family" to identify. So,
>   assume first line is header.
> ---
>  tools/perf/pmu-events/jevents.c |9 +++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
> index 14707fb..8d365f2 100644
> --- a/tools/perf/pmu-events/jevents.c
> +++ b/tools/perf/pmu-events/jevents.c
> @@ -461,7 +461,12 @@ static int process_mapfile(FILE *outfp, char *fpath)
>  
>   print_mapping_table_prefix(outfp);
>  
> - line_num = 0;
> + /* Skip first line (header) */
> + p = fgets(line, n, mapfp);
> + if (!p)
> + goto out;
> +
> + line_num = 1;
>   while (1) {
>   char *cpuid, *version, *type, *fname;
>  
> @@ -505,8 +510,8 @@ static int process_mapfile(FILE *outfp, char *fpath)
>   fprintf(outfp, "},\n");
>   }
>  
> +out:
>   print_mapping_table_suffix(outfp);
> -
>   return 0;
>  }
>  
> -- 
> 1.7.9.5
> 
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[PATCH v13 13/14] perf, tools: Handle header line in mapfile

[Sukadev Bhattiprolu]

From: Andi Kleen 

Support a header line in the mapfile.csv, to match the existing
mapfiles

Signed-off-by: Andi Kleen 
Signed-off-by: Sukadev Bhattiprolu 

Changelog[v2]
All architectures may not use the "Family" to identify. So,
assume first line is header.
---
 tools/perf/pmu-events/jevents.c |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index 14707fb..8d365f2 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -461,7 +461,12 @@ static int process_mapfile(FILE *outfp, char *fpath)
 
print_mapping_table_prefix(outfp);
 
-   line_num = 0;
+   /* Skip first line (header) */
+   p = fgets(line, n, mapfp);
+   if (!p)
+   goto out;
+
+   line_num = 1;
while (1) {
char *cpuid, *version, *type, *fname;
 
@@ -505,8 +510,8 @@ static int process_mapfile(FILE *outfp, char *fpath)
fprintf(outfp, "},\n");
}
 
+out:
print_mapping_table_suffix(outfp);
-
return 0;
 }
 
-- 
1.7.9.5

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev