linaro-dev August 2014

linaro-dev@lists.linaro.org

27 participants
43 discussions

[PATCH idlestat] Add -o option to save output report to a file

by pi-cheng.chen

Currently the serial terminal connected to the boards running idlestat are restricted to be at least 80 characters wide to output the report. Otherwise idlestat quits with message "The terminal must be at least 80 columns wide". Fix it by adding a "-o" option to save report output to a file. Signed-off-by: Pi-Cheng Chen <pi-cheng.chen(a)linaro.org> --- idlestat.c | 136 ++++++++++++++++++++++++++++++++++++++++--------------------- idlestat.h | 1 + 2 files changed, 90 insertions(+), 47 deletions(-) diff --git a/idlestat.c b/idlestat.c index bba8951..fb0ae8f 100644 --- a/idlestat.c +++ b/idlestat.c @@ -51,6 +51,7 @@ #define USEC_PER_SEC 1000000 static char buffer[BUFSIZE]; +static FILE *output; static inline int error(const char *str) { @@ -68,19 +69,40 @@ static void charrep(char c, int count) { int i; for (i = 0; i < count; i++) - printf("%c", c); + fprintf(output, "%c", c); +} + +static int open_report_file(const char *path) +{ + if (path) { + output = fopen(path, "w+"); + + if (!output) { + fprintf(stderr, "%s: failed to open '%s'\n", __func__, path); + return -1; + } + } else + output = stdout; + + return 0; +} + +static void close_report_file(void) +{ + if (output != stdout) + fclose(output); } static void display_cpu_header(char *cpu, int length) { charrep('-', length); - printf("\n"); + fprintf(output, "\n"); if (strstr(cpu, "cluster")) - printf("| %-*s |\n", length - 4, cpu); + fprintf(output, "| %-*s |\n", length - 4, cpu); else if (strstr(cpu, "core")) - printf("| %-*s |\n", length - 9, cpu); - else printf("| %-*s |\n", length - 16, cpu); + fprintf(output, "| %-*s |\n", length - 9, cpu); + else fprintf(output, "| %-*s |\n", length - 16, cpu); } static void display_factored_time(double time, int align) @@ -89,15 +111,15 @@ static void display_factored_time(double time, int align) if (time < 1000) { sprintf(buffer, "%.0lfus", time); - printf("%*s", align, buffer); + fprintf(output, "%*s", align, buffer); } else if (time < 1000000) { sprintf(buffer, "%.2lfms", time / 1000.0); - printf("%*s", align, buffer); + fprintf(output, "%*s", align, buffer); } else { sprintf(buffer, "%.2lfs", time / 1000000.0); - printf("%*s", align, buffer); + fprintf(output, "%*s", align, buffer); } } @@ -107,28 +129,29 @@ static void display_factored_freq(int freq, int align) if (freq < 1000) { sprintf(buffer, "%dHz", freq); - printf("%*s", align, buffer); + fprintf(output, "%*s", align, buffer); } else if (freq < 1000000) { sprintf(buffer, "%.2fMHz", (float)freq / 1000.0); - printf("%*s", align, buffer); + fprintf(output, "%*s", align, buffer); } else { sprintf(buffer, "%.2fGHz", (float)freq / 1000000.0); - printf("%*s", align, buffer); + fprintf(output, "%*s", align, buffer); } } static void display_cstates_header(void) { charrep('-', 80); - printf("\n"); + fprintf(output, "\n"); - printf("| C-state | min | max | avg | total | hits | over | under |\n"); + fprintf(output, "| C-state | min | max | avg | total" + " | hits | over | under |\n"); } static void display_cstates_footer(void) { charrep('-', 80); - printf("\n\n"); + fprintf(output, "\n\n"); } static int display_cstates(void *arg, char *cpu) @@ -148,23 +171,23 @@ static int display_cstates(void *arg, char *cpu) display_cpu_header(cpu, 80); cpu_header = true; charrep('-', 80); - printf("\n"); + fprintf(output, "\n"); } - printf("| %8s | ", c->name); + fprintf(output, "| %8s | ", c->name); display_factored_time(c->min_time == DBL_MAX ? 0. : c->min_time, 8); - printf(" | "); + fprintf(output, " | "); display_factored_time(c->max_time, 8); - printf(" | "); + fprintf(output, " | "); display_factored_time(c->avg_time, 8); - printf(" | "); + fprintf(output, " | "); display_factored_time(c->duration, 8); - printf(" | "); - printf("%5d | %5d | %5d |", c->nrdata, + fprintf(output, " | "); + fprintf(output, "%5d | %5d | %5d |", c->nrdata, c->premature_wakeup, c->could_sleep_more); - printf("\n"); + fprintf(output, "\n"); } return 0; @@ -173,15 +196,16 @@ static int display_cstates(void *arg, char *cpu) static void display_pstates_header(void) { charrep('-', 64); - printf("\n"); + fprintf(output, "\n"); - printf("| P-state | min | max | avg | total | hits |\n"); + fprintf(output, "| P-state | min | max | avg | total" + " | hits |\n"); } static void display_pstates_footer(void) { charrep('-', 64); - printf("\n\n"); + fprintf(output, "\n\n"); } static int display_pstates(void *arg, char *cpu) @@ -202,24 +226,24 @@ static int display_pstates(void *arg, char *cpu) display_cpu_header(cpu, 64); cpu_header = true; charrep('-', 64); - printf("\n"); + fprintf(output, "\n"); } - printf("| "); + fprintf(output, "| "); display_factored_freq(p->freq, 8); - printf(" | "); + fprintf(output, " | "); display_factored_time(p->min_time == DBL_MAX ? 0. : p->min_time, 8); - printf(" | "); + fprintf(output, " | "); display_factored_time(p->max_time, 8); - printf(" | "); + fprintf(output, " | "); display_factored_time(p->avg_time, 8); - printf(" | "); + fprintf(output, " | "); display_factored_time(p->duration, 8); - printf(" | "); - printf("%5d", p->count); - printf(" | "); - printf("\n"); + fprintf(output, " | "); + fprintf(output, "%5d", p->count); + fprintf(output, " | "); + fprintf(output, "\n"); } return 0; @@ -228,15 +252,15 @@ static int display_pstates(void *arg, char *cpu) static void display_wakeup_header(void) { charrep('-', 44); - printf("\n"); + fprintf(output, "\n"); - printf("| Wakeup | # | Name | Count |\n"); + fprintf(output, "| Wakeup | # | Name | Count |\n"); } static void display_wakeup_footer(void) { charrep('-', 44); - printf("\n\n"); + fprintf(output, "\n\n"); } static int display_wakeup(void *arg, char *cpu) @@ -253,16 +277,16 @@ static int display_wakeup(void *arg, char *cpu) display_cpu_header(cpu, 44); cpu_header = true; charrep('-', 44); - printf("\n"); + fprintf(output, "\n"); } if (irqinfo->irq_type == HARD_IRQ) - printf("| %-6s | %-3d | %15.15s | %7d |\n", + fprintf(output, "| %-6s | %-3d | %15.15s | %7d |\n", "irq", irqinfo->id, irqinfo->name, irqinfo->count); if (irqinfo->irq_type == IPI_IRQ) - printf("| %-6s | --- | %15.15s | %7d |\n", + fprintf(output, "| %-6s | --- | %15.15s | %7d |\n", "ipi", irqinfo->name, irqinfo->count); } @@ -1111,11 +1135,11 @@ static void help(const char *cmd) { fprintf(stderr, "\nUsage:\nTrace mode:\n\t%s --trace -f|--trace-file <filename>" - " -t|--duration <seconds> -c|--idle -p|--frequency -w|--wakeup", - basename(cmd)); + " -o|--output-file <filename> -t|--duration <seconds>" + " -c|--idle -p|--frequency -w|--wakeup", basename(cmd)); fprintf(stderr, - "\nReporting mode:\n\t%s --import -f|--trace-file <filename>", - basename(cmd)); + "\nReporting mode:\n\t%s --import -f|--trace-file <filename>" + " -o|--output-file <filename>", basename(cmd)); fprintf(stderr, "\n\nExamples:\n1. Run a trace, post-process the results" " (default is to show only C-state statistics):\n\tsudo " @@ -1131,6 +1155,15 @@ static void help(const char *cmd) fprintf(stderr, "\n4. Post-process a trace captured earlier:\n\tsudo ./%s" " --import -f /tmp/mytrace\n", basename(cmd)); + fprintf(stderr, + "\n5. Run a trace, post-process the results and print all" + " statistics into a file:\n\tsudo ./%s --trace -f /tmp/mytrace -t 10 -p -c -w" + " -o /tmp/myreport\n", basename(cmd)); + fprintf(stderr, + "\n6. Post-process a trace captured earlier and print all" + " statistics into a file:\n\tsudo ./%s --import -f /tmp/mytrace -p -c -w" + " -o /tmp/myreport\n", + basename(cmd)); } static void version(const char *cmd) @@ -1144,6 +1177,7 @@ int getoptions(int argc, char *argv[], struct program_options *options) { "trace", no_argument, &options->mode, TRACE }, { "import", no_argument, &options->mode, IMPORT }, { "trace-file", required_argument, NULL, 'f' }, + { "output-file", required_argument, NULL, 'o' }, { "help", no_argument, NULL, 'h' }, { "duration", required_argument, NULL, 't' }, { "version", no_argument, NULL, 'V' }, @@ -1157,13 +1191,14 @@ int getoptions(int argc, char *argv[], struct program_options *options) memset(options, 0, sizeof(*options)); options->filename = NULL; + options->outfilename = NULL; options->mode = -1; options->format = -1; while (1) { int optindex = 0; - c = getopt_long(argc, argv, ":df:ht:cpwVv", + c = getopt_long(argc, argv, ":df:o:ht:cpwVv", long_options, &optindex); if (c == -1) break; @@ -1172,6 +1207,9 @@ int getoptions(int argc, char *argv[], struct program_options *options) case 'f': options->filename = optarg; break; + case 'o': + options->outfilename = optarg; + break; case 'h': help(argv[0]); exit(0); @@ -1427,7 +1465,7 @@ int main(int argc, char *argv[], char *const envp[]) return -1; } - if (check_window_size()) { + if (check_window_size() && !options.outfilename) { fprintf(stderr, "The terminal must be at least " "80 columns wide\n"); return -1; @@ -1501,6 +1539,8 @@ int main(int argc, char *argv[], char *const envp[]) * the same cluster */ if (0 == establish_idledata_to_topo(datas)) { + if (open_report_file(options.outfilename)) + return -1; if (options.display & IDLE_DISPLAY) { display_cstates_header(); @@ -1519,6 +1559,8 @@ int main(int argc, char *argv[], char *const envp[]) dump_cpu_topo_info(display_wakeup, 1); display_wakeup_footer(); } + + close_report_file(); } release_cpu_topo_cstates(); diff --git a/idlestat.h b/idlestat.h index 1d5f961..735f0fe 100644 --- a/idlestat.h +++ b/idlestat.h @@ -132,6 +132,7 @@ struct program_options { int display; unsigned int duration; char *filename; + char *outfilename; int verbose; }; -- 1.9.1

9 years, 8 months

Ducati Support for OMAP4 on kitkat

by Sriram V

Hi, I wanted to check the extent of ducati support for OMAP4 panda/blaze board for Android Kitkat release. Any pointers on this will be very helpful. Thanks. -- Regards, Sriram

9 years, 8 months

[Activity] Week 33

by Dileep Katta

== Progress == * Enabling UEFI Fastboot on Panda (CARD-198: 0 %) - Got Panda board from Amit. * CARD 1103: Flash support on u-boot fastboot (CARD-1103: 100%) - Worked on the comments on the patch by Steve Rae == Plans == * CARD-198: Start working on the activity on Panda (30%) * CARD 1103: fastboot flash command (CARD-1103: 60%) - Fix the issues in booting from the flashed image - Steve Rae from Broadcom expressed concern over design of partition handling. Need to work with Steve to resolve the same. == Issues == * None

9 years, 8 months

[ACTIVITY] Week 33

by Riku Voipio

== Progress == * Submitted fix formysql in LAMP images (BUG-336 20%) * Switched from Foundation model to using Qemu * http://suihkulokki.blogspot.fi/2014/08/booting-linaro-armv8-oe-images-with-… (10%) * Debugged TC2 booting mainline kernels in lab (20%) * Switch KVM arndale job to mainline kernel now that usb is fixed upstream (20%) * Tried gcov enabled kernel (CARD-1488 20%) == Plans == * Set experimental build for gcov/arm (CARD-1488) * Perf/linux-tools into deb-pkg or otherwise get BUG-360 cleared * if patch for BUG-336 doesn't land in OE-core, add to linaro overlay. == Issues ==

9 years, 8 months

[ACTIVITY] Week 33

by Bernhard Rosenkränzer

== Progress == * more work on cbuildv2 builds * NDK master updates * Android toolchain updates for bug 176 == Plans == * Toolchain and NDK 2014.08 releases * Apply workaround for building Android 32bit with Linaro toolchains == Issues == * none

9 years, 8 months

[PATCH PM-QA v2] Test.mk: Fix make error 1 issues

by Lisa Nguyen

Modify Test.mk to resolve the following build error: make: [uncheck] Error 1 (ignored). Signed-off-by: Lisa Nguyen <lisa.nguyen(a)linaro.org> --- Changes from v1 to v2: - Forgot to add @ to silence the shell command --- Test.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Test.mk b/Test.mk index 89e5cd9..df9cd62 100644 --- a/Test.mk +++ b/Test.mk @@ -22,7 +22,7 @@ # - initial API and implementation SNT=$(wildcard *sanity.sh) -TST=$(wildcard *[^(sanity)].sh) +TST=$(wildcard *[^{sanity}].sh) LOG=$(TST:.sh=.log) CFLAGS?=-g -Wall -pthread CC?=gcc @@ -57,6 +57,6 @@ clean: rm -f *.o $(EXEC) uncheck: - -@test ! -z "$(LOG)" && rm -f $(LOG) + -@$(shell test ! -z "$(LOG)" && rm -f $(LOG)) recheck: uncheck check -- 1.7.9.5

9 years, 8 months

[PATCH PM-QA v2] Simplify code to obtain number of cpus for a platform

by Lisa Nguyen

Create a global variable that will look for number of cpus for a platform and use it in multiple functions to make the code simplier to read. Signed-off-by: Lisa Nguyen <lisa.nguyen(a)linaro.org> --- Changes from v1 to v2: - Edit the command to grab the number of cpus by adding the -1v option, showing the cpu numbers in order for testing per Sanjay's suggestion cpufreq/cpufreq_05.sh | 6 +++--- cpuhotplug/cpuhotplug_sanity.sh | 1 - include/functions.sh | 13 +++++-------- include/thermal_functions.sh | 4 ++-- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/cpufreq/cpufreq_05.sh b/cpufreq/cpufreq_05.sh index 93fce78..1f0dd8d 100755 --- a/cpufreq/cpufreq_05.sh +++ b/cpufreq/cpufreq_05.sh @@ -62,7 +62,7 @@ supported=$(cat $CPU_PATH/cpu0/cpufreq/scaling_available_governors | grep "ondem if [ -z "$supported" ]; then log_skip "ondemand not supported" else - for cpu in $(ls $CPU_PATH | grep "cpu[0-9].*"); do + for cpu in $cpus; do switch_ondemand $cpu done check_governor $cpu 'ondemand' @@ -72,7 +72,7 @@ supported=$(cat $CPU_PATH/cpu0/cpufreq/scaling_available_governors | grep "conse if [ -z "$supported" ]; then log_skip "conservative not supported" else - for cpu in $(ls $CPU_PATH | grep "cpu[0-9].*"); do + for cpu in $cpus; do switch_conservative $cpu done check_governor $cpu 'conservative' @@ -82,7 +82,7 @@ supported=$(cat $CPU_PATH/cpu0/cpufreq/scaling_available_governors | grep "users if [ -z "$supported" ]; then log_skip "userspace not supported" else - for cpu in $(ls $CPU_PATH | grep "cpu[0-9].*"); do + for cpu in $cpus; do switch_userspace $cpu done diff --git a/cpuhotplug/cpuhotplug_sanity.sh b/cpuhotplug/cpuhotplug_sanity.sh index d9b6af8..2ad24ff 100755 --- a/cpuhotplug/cpuhotplug_sanity.sh +++ b/cpuhotplug/cpuhotplug_sanity.sh @@ -33,7 +33,6 @@ fi check_cpuhotplug_sysfs_entry() { - cpus=$(ls $CPU_PATH | grep "cpu[0-9].*") cpunum=$(ls $CPU_PATH | grep "cpu[0-9].*" -c) if [ $cpunum -eq 1 ]; then diff --git a/include/functions.sh b/include/functions.sh index e0f08fb..7a113b6 100644 --- a/include/functions.sh +++ b/include/functions.sh @@ -30,6 +30,7 @@ TEST_NAME=$(basename ${0%.sh}) PREFIX=$TEST_NAME INC=0 CPU= +cpus=$(ls -1v $CPU_PATH | grep "cpu[0-9].*") pass_count=0 fail_count=0 skip_count=0 @@ -86,7 +87,6 @@ for_each_cpu() { local func=$1 shift 1 - cpus=$(ls $CPU_PATH | grep "cpu[0-9].*") for cpu in $cpus; do INC=0 CPU=/$cpu @@ -339,8 +339,8 @@ save_governors() { governors_backup= local index=0 - for i in $(ls $CPU_PATH | grep "cpu[0-9].*"); do - governors_backup[$index]=$(cat $CPU_PATH/$i/cpufreq/scaling_governor) + for cpu in $cpus; do + governors_backup[$index]=$(cat $CPU_PATH/$cpu/cpufreq/scaling_governor) index=$((index + 1)) done } @@ -350,9 +350,9 @@ restore_governors() { local index=0 local oldgov= - for i in $(ls $CPU_PATH | grep "cpu[0-9].*"); do + for cpu in $cpus; do oldgov=${governors_backup[$index]} - echo $oldgov > $CPU_PATH/$i/cpufreq/scaling_governor + echo $oldgov > $CPU_PATH/$cpu/cpufreq/scaling_governor index=$((index + 1)) done } @@ -361,8 +361,6 @@ save_frequencies() { frequencies_backup= local index=0 - local cpus=$(ls $CPU_PATH | grep "cpu[0-9].*") - local cpu= for cpu in $cpus; do frequencies_backup[$index]=$(cat $CPU_PATH/$cpu/cpufreq/scaling_cur_freq) @@ -374,7 +372,6 @@ restore_frequencies() { local index=0 local oldfreq= - local cpus=$(ls $CPU_PATH | grep "cpu[0-9].*") for cpu in $cpus; do oldfreq=${frequencies_backup[$index]} diff --git a/include/thermal_functions.sh b/include/thermal_functions.sh index a51240b..c25e1d8 100644 --- a/include/thermal_functions.sh +++ b/include/thermal_functions.sh @@ -184,7 +184,7 @@ check_scaling_freq() { local index=0 local flag=0 - for cpu in $(ls $CPU_PATH | grep "cpu[0-9].*"); do + for cpu in $cpus; do if [ $before_freq_list[$index] -ne $afterf_req_list[$index] ] ; then flag=1 fi @@ -197,7 +197,7 @@ store_scaling_maxfreq() { scale_freq= local index=0 - for cpu in $(ls $CPU_PATH | grep "cpu[0-9].*"); do + for cpu in $cpus; do scale_freq[$index]=$(cat $CPU_PATH/$cpu/cpufreq/scaling_max_freq) index=$((index + 1)) done -- 1.7.9.5

9 years, 8 months

[Activity] Week 32

by Dileep Katta

== Progress == * Enabling UEFI Fastboot on Panda - on hold (CARD-198: 0 %) * CARD 1103: Flash support on u-boot fastboot (CARD-1103: 100%) - fixed checkpatch.pl issues, sent v2 of patches for review - Testing the flashing functionality == Plans == * CARD-198: Start working on the activity on Panda/BBB (50%) * CARD 1103: fastboot flash command (CARD-1103: 60%) - Fix the issues in booting from the flashed image - rework on the review comments, if any == Issues == * None

9 years, 8 months

[ACTIVITY] Week 32

by Koen Kooi

== Progress == * OE baseline work (CARD-787: 50%) * Release (10%) * CARD-1566 (40%) == Plans == * CARD-1566 <https://cards.linaro.org/browse/CARD-1566> == Issues ==

9 years, 8 months

[ACTIVITY] week 32

by Bernhard Rosenkränzer

== Progress == * Finished NDK 10 update for 2014.07 * Worked on cbuildv2 builds == Plans == * Finish cbuildv2 builds * Update NDK to upstream master == Issues == * Currently visiting my sister, limited connectivity

9 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev August 2014