Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92a7e127 authored by Jan Stancek's avatar Jan Stancek Committed by Arnaldo Carvalho de Melo
Browse files

perf cpumap: Add cpu__max_present_cpu() 



Similar to cpu__max_cpu() (which returns the max possible CPU), returns
the max present CPU.

Signed-off-by: default avatarJan Stancek <jstancek@redhat.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/8ea4601b5cacc49927235b4ebac424bd6eeccb06.1487146877.git.jstancek@redhat.com


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

tools/perf/util/cpumap.c

+22 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "asm/bug.h"



static int max_cpu_num;

static int max_present_cpu_num;

static int max_node_num;

static int *cpunode_map;
@@ -442,6 +443,7 @@ static void set_max_cpu_num(void) 


	/* set up default */

	max_cpu_num = 4096;

	max_present_cpu_num = 4096;



	mnt = sysfs__mountpoint();

	if (!mnt)
@@ -455,6 +457,17 @@ static void set_max_cpu_num(void) 
	}



	ret = get_max_num(path, &max_cpu_num);

	if (ret)

		goto out;



	/* get the highest present cpu number for a sparse allocation */

	ret = snprintf(path, PATH_MAX, "%s/devices/system/cpu/present", mnt);

	if (ret == PATH_MAX) {

		pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX);

		goto out;

	}



	ret = get_max_num(path, &max_present_cpu_num);



out:

	if (ret)
@@ -505,6 +518,15 @@ int cpu__max_cpu(void) 
	return max_cpu_num;

}



int cpu__max_present_cpu(void)

{

	if (unlikely(!max_present_cpu_num))

		set_max_cpu_num();



	return max_present_cpu_num;

}





int cpu__get_node(int cpu)

{

	if (unlikely(cpunode_map == NULL)) {

tools/perf/util/cpumap.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ int cpu__setup_cpunode_map(void); 


int cpu__max_node(void);

int cpu__max_cpu(void);

int cpu__max_present_cpu(void);

int cpu__get_node(int cpu);



int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,