Re: [Powertop] [PATCH] Fix handling of /proc/cpuinfo for non x86 architectures

[Chris Ferron <chris.e.ferron at linux.intel.com>]

[-- Attachment #1: Type: text/plain, Size: 1795 bytes --]

On 07/12/2012 01:37 PM, Stefan Weil wrote:
> Not all architectures include lines with "vendor_id\t" or
> "processor\t". ARM Linux without SMP support includes
> neither of these two entries. With SMP support, there are
> "processor\t" entries for each CPU.
>
> Set vendor to an empty string initially, so there is a default value.
>
> Assume CPU id 0 when no number was set while encountering the first
> "bogomips\t" line. If there are more such lines without a correct
> number, only the first CPU is handled. This should not be needed
> for ARM, but makes the code more robust because it avoids calling
> handle_one_cpu twice with number == 0.
>
> Signed-off-by: Stefan Weil <sw(a)weilnetz.de>
> ---
>
> This patch is based on my previous patch (which fixed the crash on ARM).
> The final result was tested on a Raspberry PI ARM.
>
> - sw
>
>   src/cpu/cpu.cpp |    9 ++++++++-
>   1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp
> index d08bdcd..13015bd 100644
> --- a/src/cpu/cpu.cpp
> +++ b/src/cpu/cpu.cpp
> @@ -233,6 +233,9 @@ void enumerate_cpus(void)
>   	if (!file)
>   		return;
>   
> +	/* Not all /proc/cpuinfo include "vendor_id\t". */
> +	vendor[0] = '\0';
> +
>   	while (file) {
>   
>   		file.getline(line, sizeof(line));
> @@ -271,10 +274,14 @@ void enumerate_cpus(void)
>   			}
>   		}
>   		if (strncasecmp(line, "bogomips\t", 9) == 0) {
> +			if (number == -1) {
> +				/* Not all /proc/cpuinfo include "processor\t". */
> +				number = 0;
> +			}
>   			if (number >= 0) {
>   				handle_one_cpu(number, vendor, family, model);
>   				set_max_cpu(number);
> -				number = -1;
> +				number = -2;
>   			}
>   		}
>   	}
Your patch has been merged.
Thank you,