Re: [PATCH RFC 02/10] perf,tools: Support new sort type --socket

[Jiri Olsa <jolsa@redhat.com>]

On Mon, Aug 24, 2015 at 04:47:12PM +0000, Liang, Kan wrote:
> 
> 
> > On Mon, Aug 24, 2015 at 02:22:08PM +0000, Liang, Kan wrote:
> > > >
> > > > On Fri, Aug 21, 2015 at 08:25:24PM +0000, Liang, Kan wrote:
> > > >
> > > > SNIP
> > > >
> > > > > >
> > > > > > we need global topology information in perf.data and use the
> > > > > > mapping from there, we can't use current server info
> > > > > >
> > > > > > we currently store core_siblings_list and thread_siblings_list,
> > > > > > in topology FEATURE, which is probably not enough
> > > > > >
> > > > >
> > > > > core_siblings_list  includes the cpu list in the same socket.
> > > > > thread_siblings_list includes the cpu list in the same core.
> > > > > numa_nodes includes the cpu list for each node.
> > > > >
> > > > > It looks we have enough data from topology FEATURE.
> > > >
> > > > hum, haven't hecked deeply.. how will you get core id for cpu?
> > > >
> > >
> > > from thread_siblings_list.
> > >  I just noticed that svg_build_topology_map did the similar thing to
> > > get topology map for timechart from perf header.
> > 
> > could you please provide both functions then cpu -> core, cpu -> socket
> > 
> 
> Do you mean something like this?
> Store cpu->socket and cpu->core in perf_session_env.

yep, seems ok

thanks,
jirka

> 
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index 179b2bd..a01c603 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -1590,10 +1596,17 @@ static int process_cpu_topology(struct perf_file_section *section __maybe_unused
>  	u32 nr, i;
>  	char *str;
>  	struct strbuf sb;
> +	int cpu_nr = ph->env.nr_cpus_online;
> +	struct cpu_map *map;
> +	int j;
> +
> +	ph->env.cpu = calloc(cpu_nr, sizeof(*ph->env.cpu));
> +	if (!ph->env.cpu)
> +		return -1;
>  
>  	ret = readn(fd, &nr, sizeof(nr));
>  	if (ret != sizeof(nr))
> -		return -1;
> +		goto free_cpu;
>  
>  	if (ph->needs_swap)
>  		nr = bswap_32(nr);
> @@ -1608,6 +1621,14 @@ static int process_cpu_topology(struct perf_file_section *section __maybe_unused
>  
>  		/* include a NULL character at the end */
>  		strbuf_add(&sb, str, strlen(str) + 1);
> +
> +		map = cpu_map__new(str);
> +		if (!map)
> +			goto error;
> +		for (j = 0; j < map->nr; j++) {
> +			 ph->env.cpu[map->map[j]].socket_id = i;
> +		}
> +		cpu_map__put(map);
>  		free(str);
>  	}
>  	ph->env.sibling_cores = strbuf_detach(&sb, NULL);
> @@ -1628,6 +1649,14 @@ static int process_cpu_topology(struct perf_file_section *section __maybe_unused
>  
>  		/* include a NULL character at the end */
>  		strbuf_add(&sb, str, strlen(str) + 1);
> +
> +		map = cpu_map__new(str);
> +		if (!map)
> +			goto error;
> +		for (j = 0; j < map->nr; j++) {
> +			ph->env.cpu[map->map[j]].core_id = i;
> +		}
> +		cpu_map__put(map);
>  		free(str);
>  	}
>  	ph->env.sibling_threads = strbuf_detach(&sb, NULL);
> @@ -1635,6 +1664,8 @@ static int process_cpu_topology(struct perf_file_section *section __maybe_unused
>  
>  error:
>  	strbuf_release(&sb);
> +free_cpu:
> +	free(ph->env.cpu);
>  	return -1;
>  }
>  
> diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
> index 9b53b65..8b8c4fc 100644
> --- a/tools/perf/util/header.h
> +++ b/tools/perf/util/header.h
> @@ -66,6 +66,11 @@ struct perf_header;
>  int perf_file_header__read(struct perf_file_header *header,
>  			   struct perf_header *ph, int fd);
>  
> +struct cpu_topology_map {
> +	int	socket_id;
> +	int	core_id;
> +};
> +
>  struct perf_session_env {
>  	char			*hostname;
>  	char			*os_release;
> @@ -89,6 +94,7 @@ struct perf_session_env {
>  	char			*sibling_threads;
>  	char			*numa_nodes;
>  	char			*pmu_mappings;
> +	struct cpu_topology_map	*cpu;
>  };
>  
>  struct perf_header {
> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> index 18722e7..51b4d5a 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -185,6 +185,7 @@ static void perf_session_env__exit(struct perf_session_env *env)
>  	zfree(&env->sibling_threads);
>  	zfree(&env->numa_nodes);
>  	zfree(&env->pmu_mappings);
> +	zfree(&env->cpu);
>  }
>  
>  void perf_session__delete(struct perf_session *session)
>