Commit c60da22a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf header: Transform nodes string info to struct 



Storing NUMA info within struct numa_node instead of strings. This way
it's usable in future patches.

Also it turned out it's slightly less code involved than using strings.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1467634583-29147-2-git-send-email-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6430a94e

tools/perf/util/env.c

+4 −1
Original line number Diff line number Diff line
@@ -18,10 +18,13 @@ void perf_env__exit(struct perf_env *env) 
	zfree(&env->cmdline_argv);

	zfree(&env->sibling_cores);

	zfree(&env->sibling_threads);

	zfree(&env->numa_nodes);

	zfree(&env->pmu_mappings);

	zfree(&env->cpu);



	for (i = 0; i < env->nr_numa_nodes; i++)

		cpu_map__put(env->numa_nodes[i].map);

	zfree(&env->numa_nodes);



	for (i = 0; i < env->caches_cnt; i++)

		cpu_cache_level__free(&env->caches[i]);

	zfree(&env->caches);

tools/perf/util/env.h

+9 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __PERF_ENV_H



#include <linux/types.h>

#include "cpumap.h"



struct cpu_topology_map {

	int	socket_id;
@@ -18,6 +19,13 @@ struct cpu_cache_level { 
	char	*map;

};



struct numa_node {

	u32		 node;

	u64		 mem_total;

	u64		 mem_free;

	struct cpu_map	*map;

};



struct perf_env {

	char			*hostname;

	char			*os_release;
@@ -40,11 +48,11 @@ struct perf_env { 
	const char		**cmdline_argv;

	char			*sibling_cores;

	char			*sibling_threads;

	char			*numa_nodes;

	char			*pmu_mappings;

	struct cpu_topology_map	*cpu;

	struct cpu_cache_level	*caches;

	int			 caches_cnt;

	struct numa_node	*numa_nodes;

};



extern struct perf_env perf_env;

tools/perf/util/header.c

+26 −50
Original line number Diff line number Diff line
@@ -1306,42 +1306,19 @@ static void print_total_mem(struct perf_header *ph, int fd __maybe_unused, 
static void print_numa_topology(struct perf_header *ph, int fd __maybe_unused,

				FILE *fp)

{

	u32 nr, c, i;

	char *str, *tmp;

	uint64_t mem_total, mem_free;



	/* nr nodes */

	nr = ph->env.nr_numa_nodes;

	str = ph->env.numa_nodes;



	for (i = 0; i < nr; i++) {

		/* node number */

		c = strtoul(str, &tmp, 0);

		if (*tmp != ':')

			goto error;



		str = tmp + 1;

		mem_total = strtoull(str, &tmp, 0);

		if (*tmp != ':')

			goto error;

	int i;

	struct numa_node *n;



		str = tmp + 1;

		mem_free = strtoull(str, &tmp, 0);

		if (*tmp != ':')

			goto error;

	for (i = 0; i < ph->env.nr_numa_nodes; i++) {

		n = &ph->env.numa_nodes[i];



		fprintf(fp, "# node%u meminfo  : total = %"PRIu64" kB,"

			    " free = %"PRIu64" kB\n",

			c, mem_total, mem_free);

			n->node, n->mem_total, n->mem_free);



		str = tmp + 1;

		fprintf(fp, "# node%u cpu list : %s\n", c, str);



		str += strlen(str) + 1;

		fprintf(fp, "# node%u cpu list : ", n->node);

		cpu_map__fprintf(n->map, fp);

	}

	return;

error:

	fprintf(fp, "# numa topology : not available\n");

}



static void print_cpuid(struct perf_header *ph, int fd __maybe_unused, FILE *fp)
@@ -1906,11 +1883,10 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse 
				 struct perf_header *ph, int fd,

				 void *data __maybe_unused)

{

	struct numa_node *nodes, *n;

	ssize_t ret;

	u32 nr, node, i;

	u32 nr, i;

	char *str;

	uint64_t mem_total, mem_free;

	struct strbuf sb;



	/* nr nodes */

	ret = readn(fd, &nr, sizeof(nr));
@@ -1921,47 +1897,47 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse 
		nr = bswap_32(nr);



	ph->env.nr_numa_nodes = nr;

	if (strbuf_init(&sb, 256) < 0)

		return -1;

	nodes = zalloc(sizeof(*nodes) * nr);

	if (!nodes)

		return -ENOMEM;



	for (i = 0; i < nr; i++) {

		n = &nodes[i];



		/* node number */

		ret = readn(fd, &node, sizeof(node));

		if (ret != sizeof(node))

		ret = readn(fd, &n->node, sizeof(u32));

		if (ret != sizeof(n->node))

			goto error;



		ret = readn(fd, &mem_total, sizeof(u64));

		ret = readn(fd, &n->mem_total, sizeof(u64));

		if (ret != sizeof(u64))

			goto error;



		ret = readn(fd, &mem_free, sizeof(u64));

		ret = readn(fd, &n->mem_free, sizeof(u64));

		if (ret != sizeof(u64))

			goto error;



		if (ph->needs_swap) {

			node = bswap_32(node);

			mem_total = bswap_64(mem_total);

			mem_free = bswap_64(mem_free);

			n->node      = bswap_32(n->node);

			n->mem_total = bswap_64(n->mem_total);

			n->mem_free  = bswap_64(n->mem_free);

		}



		if (strbuf_addf(&sb, "%u:%"PRIu64":%"PRIu64":",

				node, mem_total, mem_free) < 0)

			goto error;



		str = do_read_string(fd, ph);

		if (!str)

			goto error;



		/* include a NULL character at the end */

		if (strbuf_add(&sb, str, strlen(str) + 1) < 0)

		n->map = cpu_map__new(str);

		if (!n->map)

			goto error;



		free(str);

	}

	ph->env.numa_nodes = strbuf_detach(&sb, NULL);

	ph->env.numa_nodes = nodes;

	return 0;



error:

	strbuf_release(&sb);

	free(nodes);

	return -1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE