Date: Tue, 22 Jan 2013 19:43:32 +0800 From: Austin Zhang <zhang.austin(a)gmail.com&gt; To: powertop(a)lists.01.org Subject: [Powertop] [PATCH] V2: Fix C states and P states presentation issue. X-Mailer: git-send-email 1.7.5.4 If using '10' in this 'for' loop, for P states, once the processor provides more than 10 P states, those additional ones cannot been presented; and for C states, once the processor provides maximize C states level more than 9, for example, it only has POLL, C1, C3, C6, C10, the additional one like C10 also cannot be presented. Now we get the loop numbers from the system information we had got before. Changes from V1: Using std:max to simplify codes Signed-off-by: Austin Zhang <zhang.austin(a)gmail.com&gt; --- src/cpu/cpu.cpp | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index 7f3af69..1bae255 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -402,8 +402,16 @@ void report_display_cpu_cstates(void) { char buffer[512], buffer2[512]; unsigned int package, core, cpu; - int line; + int line, cstates_num; class abstract_cpu *_package, * _core, * _cpu; + unsigned int i, j; + + for (i = 0, cstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + cstates_num = std::max(cstates_num, + (all_cpus[i]->cstates[j])->line_level); + } report.begin_section(SECTION_CPUIDLE); report.add_header("Processor Idle state report"); @@ -421,7 +429,7 @@ void report_display_cpu_cstates(void) if (!_core) continue; - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= cstates_num; line++) { bool first_cpu = true; if (!_package->has_cstate_level(line)) @@ -628,14 +636,29 @@ void impl_w_display_cpu_states(int state) char buffer[128]; char linebuf[1024]; unsigned int package, core, cpu; - int line; + int line, loop, cstates_num, pstates_num; class abstract_cpu *_package, * _core, * _cpu; int ctr = 0; + unsigned int i, j; + + for (i = 0, cstates_num = 0, pstates_num = 0; i < all_cpus.size(); i++) { + if (!all_cpus[i]) + continue; - if (state == PSTATE) + pstates_num = std::max<int>(pstates_num, all_cpus[i]->pstates.size()); +

+ for (j = 0; j < all_cpus[i]->cstates.size(); j++) + cstates_num = std::max(cstates_num, + (all_cpus[i]->cstates[j])->line_level); + } + + if (state == PSTATE) { win = get_ncurses_win("Frequency stats"); - else + loop = pstates_num; + } else { win = get_ncurses_win("Idle stats"); + loop = cstates_num; + } if (!win) return; @@ -656,8 +679,7 @@ void impl_w_display_cpu_states(int state) if (!_core->has_pstates() && state == PSTATE) continue; - - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= loop; line++) { int first = 1; ctr = 0; linebuf[0] = 0; -- 1.7.5.4 _______________________________________________ PowerTop mailing list PowerTop(a)lists.01.org https://lists.01.org/mailman/listinfo/powertop

Date: Wed, 23 Jan 2013 11:54:47 +0800 From: Austin Zhang <zhang.austin(a)gmail.com&gt; To: powertop(a)lists.01.org Cc: sergey.senozhatsky(a)gmail.com, i.zhbanov(a)samsung.com, Austin Zhang <zhang.austin(a)gmail.com&gt; Subject: [PATCH] Using std::max to handle all such kind of logic X-Mailer: git-send-email 1.7.5.4 Signed-off-by: Austin Zhang <zhang.austin(a)gmail.com&gt; --- src/cpu/cpu.cpp | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index 7f3af69..38540a5 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -525,8 +525,9 @@ void report_display_cpu_pstates(void) unsigned int i, pstates_num; for (i = 0, pstates_num = 0; i < all_cpus.size(); i++) - if (all_cpus[i] && all_cpus[i]->pstates.size() > pstates_num) - pstates_num = all_cpus[i]->pstates.size(); + if (all_cpus[i]) + pstates_num = std::max<unsigned int>(pstates_num, + all_cpus[i]->pstates.size()); report.begin_section(SECTION_CPUFREQ); report.add_header("Processor Frequency Report"); -- 1.7.5.4

On Wed, 2013-01-23 at 11:54 +0800, Austin Zhang wrote: > Signed-off-by: Austin Zhang <zhang.austin(a)gmail.com&gt; > --- > src/cpu/cpu.cpp | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp > index 7f3af69..38540a5 100644 > --- a/src/cpu/cpu.cpp > +++ b/src/cpu/cpu.cpp > @@ -525,8 +525,9 @@ void report_display_cpu_pstates(void) > unsigned int i, pstates_num; > > for (i = 0, pstates_num = 0; i < all_cpus.size(); i++) > - if (all_cpus[i] && all_cpus[i]->pstates.size() > pstates_num) > - pstates_num = all_cpus[i]->pstates.size(); > + if (all_cpus[i]) > + pstates_num = std::max<unsigned int>(pstates_num, > + all_cpus[i]->pstates.size()); There should be no need to specify the template argument if pstates_num is declared to the right type. The return type of vector<T>::size() is vector<T>::size_type. Thus I think this is a nicer version: vector<frequency*>::size_type pstates_num; for (i = 0, pstates_num = 0; i < all_cpus.size(); ++i) if (all_cpus[i]) pstates_num = max(pstates_num, all_cpus[i]->pstates.size()); What do you think? /MF

Signed-off-by: Austin Zhang <zhang.austin(a)gmail.com&gt; --- src/cpu/cpu.cpp | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index 7f3af69..38540a5 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -525,8 +525,9 @@ void report_display_cpu_pstates(void) unsigned int i, pstates_num; for (i = 0, pstates_num = 0; i < all_cpus.size(); i++) - if (all_cpus[i] && all_cpus[i]->pstates.size() > pstates_num) - pstates_num = all_cpus[i]->pstates.size(); + if (all_cpus[i]) + pstates_num = std::max<unsigned int>(pstates_num, + all_cpus[i]->pstates.size()); report.begin_section(SECTION_CPUFREQ); report.add_header("Processor Frequency Report");

If using '10' in this 'for' loop, for P states, once the processor provides more than 10 P states, those additional ones cannot been presented; and for C states, once the processor provides maximize C states level more than 9, for example, it only has POLL, C1, C3, C6, C10, the additional one like C10 also cannot be presented. Now we get the loop numbers from the system information we had got before. Changes from V1: Using std:max to simplify codes Signed-off-by: Austin Zhang <zhang.austin(a)gmail.com&gt; --- src/cpu/cpu.cpp | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index 7f3af69..1bae255 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -402,8 +402,16 @@ void report_display_cpu_cstates(void) { char buffer[512], buffer2[512]; unsigned int package, core, cpu; - int line; + int line, cstates_num; class abstract_cpu *_package, * _core, * _cpu; + unsigned int i, j; + + for (i = 0, cstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + cstates_num = std::max(cstates_num, + (all_cpus[i]->cstates[j])->line_level); + } report.begin_section(SECTION_CPUIDLE); report.add_header("Processor Idle state report"); @@ -421,7 +429,7 @@ void report_display_cpu_cstates(void) if (!_core) continue; - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= cstates_num; line++) { bool first_cpu = true; if (!_package->has_cstate_level(line)) @@ -628,14 +636,29 @@ void impl_w_display_cpu_states(int state) char buffer[128]; char linebuf[1024]; unsigned int package, core, cpu; - int line; + int line, loop, cstates_num, pstates_num; class abstract_cpu *_package, * _core, * _cpu; int ctr = 0; + unsigned int i, j; + + for (i = 0, cstates_num = 0, pstates_num = 0; i < all_cpus.size(); i++) { + if (!all_cpus[i]) + continue; - if (state == PSTATE) + pstates_num = std::max<int>(pstates_num, all_cpus[i]->pstates.size()); + + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + cstates_num = std::max(cstates_num, + (all_cpus[i]->cstates[j])->line_level); + } + + if (state == PSTATE) { win = get_ncurses_win("Frequency stats"); - else + loop = pstates_num; + } else { win = get_ncurses_win("Idle stats"); + loop = cstates_num; + } if (!win) return; @@ -656,8 +679,7 @@ void impl_w_display_cpu_states(int state) if (!_core->has_pstates() && state == PSTATE) continue; - - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= loop; line++) { int first = 1; ctr = 0; linebuf[0] = 0;