linaro-dev

linaro-dev@lists.linaro.org

4332 discussions

[PATCH] idlestate: Allocate struct cpufreq_pstate dynamically

by pi-cheng.chen

When using intel_pstate driver, "scaling_available_freqs" attr is not exported to sysfs. It causes assertion of idlestat due to memory of struct cpufreq_pstate was not allocated. Allocate struct cpufreq_pstate dynamically when getting frequency information from trace file instead of parsing available frequencies from sysfs Signed-off-by: Pi-Cheng Chen <pi-cheng.chen(a)linaro.org> --- idlestat.c | 109 ++++++++++++++++++++++++++----------------------------------- 1 file changed, 47 insertions(+), 62 deletions(-) diff --git a/idlestat.c b/idlestat.c index bba8951..0046063 100644 --- a/idlestat.c +++ b/idlestat.c @@ -509,8 +509,8 @@ static void release_pstate_info(struct cpufreq_pstates *pstates, int nrcpus) } /** - * build_pstate_info - parse cpufreq sysfs entries and build per-CPU - * structs to maintain statistics of P-state transitions + * build_pstate_info - allocate and initialize per-CPU structs to + * maintain statistics of P-state transitions * @nrcpus: number of CPUs * * Return: per-CPU array of structs (success) or NULL (error) @@ -526,55 +526,8 @@ static struct cpufreq_pstates *build_pstate_info(int nrcpus) memset(pstates, 0, sizeof(*pstates) * nrcpus); for (cpu = 0; cpu < nrcpus; cpu++) { - struct cpufreq_pstate *pstate; - int nrfreq; - char *fpath, *freq, line[256]; - FILE *sc_av_freq; - - if (asprintf(&fpath, CPUFREQ_AVFREQ_PATH_FORMAT, cpu) < 0) - goto clean_exit; - - /* read scaling_available_frequencies for the CPU */ - sc_av_freq = fopen(fpath, "r"); - free(fpath); - if (!sc_av_freq) { - fprintf(stderr, "warning: P-states not supported for " - "CPU%d\n", cpu); - continue; - } - freq = fgets(line, sizeof(line)/sizeof(line[0]), sc_av_freq); - fclose(sc_av_freq); - if (!freq) { - /* unlikely to be here, but just in case... */ - fprintf(stderr, "warning: P-state info not found for " - "CPU%d\n", cpu); - continue; - } - - /* tokenize line and populate each frequency */ - nrfreq = 0; - pstate = NULL; - while ((freq = strtok(freq, "\n ")) != NULL) { - struct cpufreq_pstate *tmp = realloc(pstate, sizeof(*pstate) * (nrfreq+1)); - if (!tmp) - goto clean_exit; - pstate = tmp; - - /* initialize pstate record */ - pstate[nrfreq].id = nrfreq; - pstate[nrfreq].freq = atol(freq); - pstate[nrfreq].count = 0; - pstate[nrfreq].min_time = DBL_MAX; - pstate[nrfreq].max_time = 0.; - pstate[nrfreq].avg_time = 0.; - pstate[nrfreq].duration = 0.; - nrfreq++; - freq = NULL; - } - - /* now populate cpufreq_pstates for this CPU */ - pstates[cpu].pstate = pstate; - pstates[cpu].max = nrfreq; + pstates[cpu].pstate = NULL; + pstates[cpu].max = 0; pstates[cpu].current = -1; /* unknown */ pstates[cpu].idle = -1; /* unknown */ pstates[cpu].time_enter = 0.; @@ -582,10 +535,43 @@ static struct cpufreq_pstates *build_pstate_info(int nrcpus) } return pstates; +} -clean_exit: - release_pstate_info(pstates, nrcpus); - return NULL; +/** + * alloc_pstate - allocate and initialize pstate struct to + * maintain statistics of P-state transitions + * @pstates: per-CPU P-state statistics struct + * @freq: frequency for which the newly pstate is allocated + * + * Return: the index of the newly allocated pstate struct + */ +static int alloc_pstate(struct cpufreq_pstates *pstates, unsigned int freq) +{ + struct cpufreq_pstate *pstate, *tmp; + int nrfreq; + + pstate = pstates->pstate; + nrfreq = pstates->max; + + tmp = realloc(pstate, sizeof(*pstate) * (nrfreq + 1)); + if (!tmp) { + perror("realloc pstate"); + return -1; + } + pstate = tmp; + + pstate[nrfreq].id = nrfreq; + pstate[nrfreq].freq = freq; + pstate[nrfreq].count = 0; + pstate[nrfreq].min_time = DBL_MAX; + pstate[nrfreq].max_time = 0; + pstate[nrfreq].avg_time = 0; + pstate[nrfreq].duration = 0; + + pstates->pstate = tmp; + pstates->max = nrfreq + 1; + + return nrfreq; } static int get_current_pstate(struct cpuidle_datas *datas, int cpu, @@ -660,6 +646,9 @@ static void cpu_change_pstate(struct cpuidle_datas *datas, int cpu, cur = get_current_pstate(datas, cpu, &ps, &p); next = freq_to_pstate_index(ps, freq); + if (next < 0) + next = alloc_pstate(ps, freq); + assert(next >= 0); switch (cur) { case 1: @@ -711,7 +700,6 @@ static int store_data(double time, int state, int cpu, struct cpuidle_datas *datas, int count) { struct cpuidle_cstates *cstates = &datas->cstates[cpu]; - struct cpufreq_pstate *pstate = datas->pstates[cpu].pstate; struct cpuidle_cstate *cstate; struct cpuidle_data *data, *tmp; int nrdata, last_cstate = cstates->last_cstate; @@ -774,9 +762,8 @@ static int store_data(double time, int state, int cpu, /* need indication if CPU is idle or not */ cstates->last_cstate = -1; - /* update P-state stats if supported */ - if (pstate) - cpu_pstate_running(datas, cpu, time); + /* update P-state stats */ + cpu_pstate_running(datas, cpu, time); return 0; } @@ -794,9 +781,8 @@ static int store_data(double time, int state, int cpu, cstates->cstate_max = MAX(cstates->cstate_max, state); cstates->last_cstate = state; cstates->wakeirq = NULL; - /* update P-state stats if supported */ - if (pstate) - cpu_pstate_idle(datas, cpu, time); + /* update P-state stats*/ + cpu_pstate_idle(datas, cpu, time); return 0; } @@ -966,7 +952,6 @@ static struct cpuidle_datas *idlestat_load(struct program_options *options) } else if (strstr(buffer, "cpu_frequency")) { assert(sscanf(buffer, TRACE_FORMAT, &time, &freq, &cpu) == 3); - assert(datas->pstates[cpu].pstate != NULL); cpu_change_pstate(datas, cpu, freq, time); count++; continue; -- 1.9.1

11 years

[PATCH] configs: Add config fragment for gcov

by riku.voipio＠linaro.org

From: Riku Voipio <riku.voipio(a)linaro.org> As needed for enabling CARD-1488. For config-core-tracking branch. This patch adds config options to enable gcov profile. CONFIG_GCOV_KERNEL=y CONFIG_GCOV_PROFILE_ALL=y CONFIG_GCOV_FORMAT_AUTODETECT=y From: Naresh Kamboju <naresh.kamboju(a)linaro.org> Signed-off-by: Naresh Kamboju <naresh.kamboju(a)linaro.org> Signed-off-by: Riku Voipio <riku.voipio(a)linaro.org> --- linaro/configs/gcov.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 linaro/configs/gcov.conf diff --git a/linaro/configs/gcov.conf b/linaro/configs/gcov.conf new file mode 100644 index 0000000..2d1209d --- /dev/null +++ b/linaro/configs/gcov.conf @@ -0,0 +1,3 @@ +CONFIG_GCOV_KERNEL=y +CONFIG_GCOV_PROFILE_ALL=y +CONFIG_GCOV_FORMAT_AUTODETECT=y -- 2.0.1

11 years

[PATCH] devfreq: add devfreq devices stats support

by Sanjay Singh Rawat

add window to show frequency stats for devfreq devices Signed-off-by: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> Signed-off-by: Sanjay Singh Rawat <sanjay.rawat(a)linaro.org> --- src/Makefile.am | 2 +- src/devices/devfreq.cpp | 351 ++++++++++++++++++++++++++++++++++++++++++++++ src/devices/devfreq.h | 75 ++++++++++ src/main.cpp | 9 ++ src/report/report-maker.h | 1 + 5 files changed, 437 insertions(+), 1 deletion(-) create mode 100644 src/devices/devfreq.cpp create mode 100644 src/devices/devfreq.h diff --git a/src/Makefile.am b/src/Makefile.am index 6886388..fee1ffa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,7 @@ powertop_SOURCES = parameters/persistent.cpp parameters/learn.cpp parameters/par report/report-formatter-csv.cpp report/report-formatter-csv.h \ report/report-formatter-html.cpp report/report-formatter-html.h \ report/report-data-html.cpp report/report-data-html.h \ - main.cpp css.h powertop.css cpu/intel_gpu.cpp \ + main.cpp css.h powertop.css cpu/intel_gpu.cpp devices/devfreq.cpp \ cpu/rapl/rapl_interface.cpp cpu/cpu_rapl_device.cpp cpu/rapl/rapl_interface.h\ cpu/dram_rapl_device.cpp devices/gpu_rapl_device.cpp cpu/cpu_rapl_device.h \ cpu/dram_rapl_device.h devices/gpu_rapl_device.h diff --git a/src/devices/devfreq.cpp b/src/devices/devfreq.cpp new file mode 100644 index 0000000..29d7790 --- /dev/null +++ b/src/devices/devfreq.cpp @@ -0,0 +1,351 @@ +/* + * Copyright 2012, Linaro + * + * This file is part of PowerTOP + * + * This program file is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program in a file named COPYING; if not, write to the + * Free Software Foundation, Inc, + * 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * or just google for it. + * + * Authors: + * Rajagopal Venkat <rajagopal.venkat(a)linaro.org> + */ + +#include <iostream> +#include <fstream> + +#include <dirent.h> +#include <stdlib.h> +#include <time.h> +#include <unistd.h> + +#include "device.h" +#include "devfreq.h" +#include "../display.h" +#include "../cpu/cpu.h" +#include "../report/report.h" +#include "../report/report-maker.h" + +static bool is_enabled = true; + +static vector<class devfreq *> all_devfreq; + +devfreq::devfreq(const char* dpath): device() +{ + strncpy(dir_name, dpath, sizeof(dir_name)); +} + +uint64_t devfreq::parse_freq_time(char* pchr) +{ + char *cptr, *pptr = pchr; + uint64_t ctime; + + cptr = strtok(pchr, " :"); + while (cptr != NULL) { + cptr = strtok(NULL, " :"); + if (cptr ) + pptr = cptr; + } + + ctime = strtoull(pptr, NULL, 10); + return ctime; +} + +void devfreq::process_time_stamps() +{ + unsigned int i; + uint64_t active_time = 0; + + sample_time = (1000000.0 * (stamp_after.tv_sec - stamp_before.tv_sec)) + + ((stamp_after.tv_usec - stamp_before.tv_usec) ); + + for (i=0; i < dstates.size()-1; i++) { + struct frequency *state = dstates[i]; + state->time_after = 1000 * (state->time_after - state->time_before); + active_time += state->time_after; + } + /* Compute idle time for the device */ + dstates[i]->time_after = sample_time - active_time; +} + +void devfreq::add_devfreq_freq_state(uint64_t freq, uint64_t time) +{ + struct frequency *state; + + state = new(std::nothrow) struct frequency; + if (!state) + return; + + memset(state, 0, sizeof(*state)); + dstates.push_back(state); + + state->freq = freq; + if (freq == 0) + strcpy(state->human_name, "Idle"); + else + hz_to_human(freq, state->human_name); + state->time_before = time; +} + +void devfreq::update_devfreq_freq_state(uint64_t freq, uint64_t time) +{ + unsigned int i; + struct frequency *state = NULL; + + for(i=0; i < dstates.size(); i++) { + if (freq == dstates[i]->freq) + state = dstates[i]; + } + + if (state == NULL) { + add_devfreq_freq_state(freq, time); + return; + } + + state->time_after = time; +} + +void devfreq::parse_devfreq_trans_stat(char *dname) +{ + ifstream file; + char filename[256]; + + sprintf(filename, "/sys/class/devfreq/%s/trans_stat", dir_name); + file.open(filename); + + if (!file) + return; + + char line[1024]; + char *c; + + while (file) { + uint64_t freq; + uint64_t time; + char *pchr; + + memset(line, 0, sizeof(line)); + file.getline(line, sizeof(line)); + + pchr = strchr(line, '*'); + pchr = (pchr != NULL) ? pchr+1 : line; + + freq = strtoull(pchr, &c, 10); + if (!freq) + continue; + + time = parse_freq_time(pchr); + update_devfreq_freq_state(freq, time); + } + file.close(); +} + +void devfreq::start_measurement(void) +{ + unsigned int i; + ifstream file; + + for (i=0; i < dstates.size(); i++) + delete dstates[i]; + dstates.resize(0); + sample_time = 0; + + gettimeofday(&stamp_before, NULL); + parse_devfreq_trans_stat(dir_name); + /* add device idle state */ + update_devfreq_freq_state(0, 0); +} + +void devfreq::end_measurement(void) +{ + parse_devfreq_trans_stat(dir_name); + gettimeofday(&stamp_after, NULL); + process_time_stamps(); +} + +double devfreq::power_usage(struct result_bundle *result, struct parameter_bundle *bundle) +{ + return 0; +} + +double devfreq::utilization(void) +{ + return 0; +} + +void devfreq::fill_freq_utilization(unsigned int idx, char *buf) +{ + buf[0] = 0; + + if (idx < dstates.size() && dstates[idx]) { + struct frequency *state = dstates[idx]; + sprintf(buf, " %5.1f%% ", percentage(1.0 * state->time_after / sample_time)); + } +} + +void devfreq::fill_freq_name(unsigned int idx, char *buf) +{ + buf[0] = 0; + + if (idx < dstates.size() && dstates[idx]) { + sprintf(buf, "%-15s", dstates[idx]->human_name); + } +} + +void start_devfreq_measurement(void) +{ + unsigned int i; + + for (i=0; i<all_devfreq.size(); i++) + all_devfreq[i]->start_measurement(); +} + +void end_devfreq_measurement(void) +{ + unsigned int i; + + for (i=0; i<all_devfreq.size(); i++) + all_devfreq[i]->end_measurement(); +} + +static void devfreq_dev_callback(const char *d_name) +{ + devfreq *df = new(std::nothrow) class devfreq(d_name); + if (df) + all_devfreq.push_back(df); +} + +void create_all_devfreq_devices(void) +{ + DIR *dir; + std::string p = "/sys/class/devfreq/"; + dir = opendir(p.c_str()); + if (dir == NULL) { + fprintf(stderr, "Devfreq not enabled\n"); + is_enabled = false; + return; + } + + callback fn = &devfreq_dev_callback; + process_directory(p.c_str(), fn); +} + +void initialize_devfreq(void) +{ + if (is_enabled) + create_tab("Device Freq stats", _("Device Freq stats")); +} + +void display_devfreq_devices(void) +{ + unsigned int i, j; + WINDOW *win; + char fline[1024]; + char buf[128]; + + win = get_ncurses_win("Device Freq stats"); + if (!win) + return; + + wclear(win); + wmove(win, 2,0); + + if (!is_enabled) { + wprintw(win, _(" Devfreq is not enabled")); + return; + } + + if (!all_devfreq.size()) { + wprintw(win, _(" No devfreq devices available")); + return; + } + + for (i=0; i<all_devfreq.size(); i++) { + + class devfreq *df = all_devfreq[i]; + wprintw(win, "\n%s\n", df->device_name()); + + for(j=0; j < df->dstates.size(); j++) { + memset(fline, 0, sizeof(fline)); + strcpy(fline, "\t"); + df->fill_freq_name(j, buf); + strcat(fline, buf); + df->fill_freq_utilization(j, buf); + strcat(fline, buf); + strcat(fline, "\n"); + wprintw(win, fline); + } + wprintw(win, "\n"); + } +} + +void report_devfreq_devices(void) +{ + if (!is_enabled) { + return; + } + +/* todo: adapt to new report format */ +#if 0 + char buffer[512]; + unsigned int i, j; + + report.begin_section(SECTION_DEVFREQ); + report.add_header("Device Frequency Report"); + + report.begin_table(TABLE_WIDE); + if (!all_devfreq.size()) { + report.begin_row(); + report.add(" No devfreq devices available"); + return; + } + + for (i = 0; i < all_devfreq.size(); i++) { + buffer[0] = 0; + class devfreq *df = all_devfreq[i]; + + report.begin_row(); + report.begin_cell(CELL_CPU_PSTATE_HEADER); + report.addf("%s", df->device_name()); + + for (j = 0; j < df->dstates.size(); j++) { + report.begin_row(); + report.begin_cell(CELL_CPU_STATE_VALUE); + df->fill_freq_name(j, buffer); + report.add(buffer); + report.begin_cell(CELL_CPU_STATE_VALUE); + df->fill_freq_utilization(j, buffer); + report.add(buffer); + } + } +#endif + +} + +void clear_all_devfreq() +{ + unsigned int i, j; + + for (i=0; i < all_devfreq.size(); i++) { + class devfreq *df = all_devfreq[i]; + + for(j=0; j < df->dstates.size(); j++) + delete df->dstates[j]; + + df->dstates.resize(0); + delete df; + } + all_devfreq.clear(); +} diff --git a/src/devices/devfreq.h b/src/devices/devfreq.h new file mode 100644 index 0000000..8ab5705 --- /dev/null +++ b/src/devices/devfreq.h @@ -0,0 +1,75 @@ +/* + * Copyright 2012, Linaro + * + * This file is part of PowerTOP + * + * This program file is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program in a file named COPYING; if not, write to the + * Free Software Foundation, Inc, + * 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * or just google for it. + * + * Authors: + * Rajagopal Venkat <rajagopal.venkat(a)linaro.org> + */ +#ifndef _INCLUDE_GUARD_DEVFREQ_H +#define _INCLUDE_GUARD_DEVFREQ_H + +#include "device.h" +#include "../parameters/parameters.h" + +struct frequency; + +class devfreq: public device { + char dir_name[4096]; + struct timeval stamp_before, stamp_after; + double sample_time; + + uint64_t parse_freq_time(char *ptr); + void add_devfreq_freq_state(uint64_t freq, uint64_t time); + void update_devfreq_freq_state(uint64_t freq, uint64_t time); + void parse_devfreq_trans_stat(char *dname); + void process_time_stamps(); + +public: + + vector<struct frequency *> dstates; + + devfreq(const char *c); + void fill_freq_utilization(unsigned int idx, char *buf); + void fill_freq_name(unsigned int idx, char *buf); + + virtual void start_measurement(void); + virtual void end_measurement(void); + + virtual double utilization(void); /* percentage */ + + virtual const char * class_name(void) { return "devfreq";}; + + virtual const char * device_name(void) { return dir_name;}; + virtual const char * human_name(void) { return "devfreq";}; + virtual double power_usage(struct result_bundle *result, struct parameter_bundle *bundle); + virtual const char * util_units(void) { return " rpm"; }; + virtual int power_valid(void) { return 0; /*utilization_power_valid(r_index);*/}; + virtual int grouping_prio(void) { return 1; }; +}; + +extern void create_all_devfreq_devices(void); +extern void clear_all_devfreq(void); +extern void display_devfreq_devices(void); +extern void report_devfreq_devices(void); +extern void initialize_devfreq(void); +extern void start_devfreq_measurement(void); +extern void end_devfreq_measurement(void); + +#endif diff --git a/src/main.cpp b/src/main.cpp index cf4e547..d33eaed 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -48,6 +48,7 @@ #include "devices/device.h" +#include "devices/devfreq.h" #include "devices/usb.h" #include "devices/ahci.h" #include "measurement/measurement.h" @@ -194,6 +195,7 @@ void one_measurement(int seconds, char *workload) create_all_usb_devices(); start_power_measurement(); devices_start_measurement(); + start_devfreq_measurement(); start_process_measurement(); start_cpu_measurement(); @@ -206,6 +208,7 @@ void one_measurement(int seconds, char *workload) end_cpu_measurement(); end_process_measurement(); collect_open_devices(); + end_devfreq_measurement(); devices_end_measurement(); end_power_measurement(); @@ -233,6 +236,9 @@ void one_measurement(int seconds, char *workload) report_show_open_devices(); report_devices(); + display_devfreq_devices(); + report_devfreq_devices(); + ahci_create_device_stats_table(); store_results(measurement_time); end_cpu_data(); @@ -344,6 +350,7 @@ static void powertop_init(void) enumerate_cpus(); create_all_devices(); + create_all_devfreq_devices(); detect_power_meters(); register_parameter("base power", 100, 0.5); @@ -457,6 +464,7 @@ int main(int argc, char **argv) exit(0); } init_display(); + initialize_devfreq(); initialize_tuning(); /* first one is short to not let the user wait too long */ one_measurement(1, NULL); @@ -491,6 +499,7 @@ int main(int argc, char **argv) clean_open_devices(); clear_all_devices(); + clear_all_devfreq(); clear_all_cpus(); return 0; diff --git a/src/report/report-maker.h b/src/report/report-maker.h index 423568a..bda4cef 100644 --- a/src/report/report-maker.h +++ b/src/report/report-maker.h @@ -89,6 +89,7 @@ enum section_type { SECTION_SYSINFO, SECTION_CPUIDLE, SECTION_CPUFREQ, + SECTION_DEVFREQ, SECTION_DEVPOWER, SECTION_SOFTWARE, SECTION_SUMMARY, -- 1.8.3.2

11 years

[ACTIVITY] Week 34

by Riku Voipio

== Progress == * Got gcov run successfully locally (CARD-1488 40%) * Moved udev fix to linaro overlay since no fix in OE-CORE (BUG-336 10%) * Fixed calxeda jenkins builders (30%) * Checking failed kvm/xen lava tests (10%) == Plans == * Set experimental build for gcov/arm (CARD-1488) * Perf/linux-tools into deb-pkg or otherwise get BUG-360 cleared

11 years

[ACTIVITY] Week 34

by Koen Kooi

== Progress == * OE baseline work (CARD-787: 90%) * Release (5%) * CARD-1566 (5%) == Plans == * release == Issues ==

11 years

[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

11 years

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

11 years

[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

11 years

[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 ==

11 years

[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

11 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev