linaro-dev October 2014

linaro-dev@lists.linaro.org

15 participants
35 discussions

by Riku Voipio

== Progress == * Moved Xen jobs from linux-linaro to mainline (40%) * Xen juno moved to CARD-1708 (10%) * Debugging mustang/arndale networking issues (30%) * Debugging GCOV_PROFILE_ALL breaking allmodconfig (10%) == Plans == * Continue docker/ jenkins-job-builder conversions * Draft CARDs for next cycles * Follow up the GCOV breakage == Issues == * Non-virt related breakage in mainline

10 years, 2 months

[PATCH IDLESTAT V2] clear few memory leaks

by Sanjay Singh Rawat

Signed-off-by: Sanjay Singh Rawat <sanjay.rawat(a)linaro.org> --- idlestat.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/idlestat.c b/idlestat.c index ab561c1..1266215 100644 --- a/idlestat.c +++ b/idlestat.c @@ -460,9 +460,14 @@ static void release_cstate_info(struct cpuidle_cstates *cstates, int nrcpus) struct cpuidle_cstate *c = &(cstates[cpu].cstate[i]); if (c->name) free(c->name); + if (c->data) + free(c->data); } } + if (cstates->wakeinfo.irqinfo) + free(cstates->wakeinfo.irqinfo); + /* free the cstates array */ free(cstates); } -- 1.8.3.2

10 years, 2 months

[PATCH v3] idlestat: Allocate struct cpufreq_pstate dynamically

by pi-cheng.chen

Initialize struct cpufreq_pstates with initial P-state of CPUs and allocate struct cpufreq_pstate dynamically when parsing trace file to solve the issue caused by missing "scaling_avaialable_freqs" attr when using intel_pstate driver. Changes v2 to v3: Initialize struct cpufreq_pstates with initial P-state of all CPUs and beginning timestamp before trace acquisition and close all P-states with ending timestamp hanges v1 to v2: Sort the cpufreq_pstate list when parsing events Signed-off-by: Pi-Cheng Chen <pi-cheng.chen(a)linaro.org> --- idlestat.c | 259 ++++++++++++++++++++++++++++++++++++++++++++----------------- idlestat.h | 7 ++ trace.h | 1 + 3 files changed, 195 insertions(+), 72 deletions(-) diff --git a/idlestat.c b/idlestat.c index da615cb..8230067 100644 --- a/idlestat.c +++ b/idlestat.c @@ -536,6 +536,121 @@ static struct cpuidle_cstates *build_cstate_info(int nrcpus) return cstates; } +#define TRACE_STAT_FORMAT "%*[^:]:%lf" + +static double get_trace_ts(void) +{ + FILE *f; + double ts; + + f = fopen(TRACE_STAT_FILE, "r"); + if (!f) + return -1; + + while (fgets(buffer, BUFSIZE, f)) { + if (!strstr(buffer, "now ts")) + continue; + if (!sscanf(buffer, TRACE_STAT_FORMAT, &ts)) + ts = -1; + break; + } + fclose(f); + + return ts; +} + +static void release_init_pstates(struct init_pstates *init) +{ + free(init->freqs); + free(init); +} + +static struct init_pstates *build_init_pstates(void) +{ + struct init_pstates *init; + int nr_cpus, cpu; + unsigned int *freqs; + + nr_cpus = sysconf(_SC_NPROCESSORS_CONF); + if (nr_cpus < 0) + return NULL; + + init = malloc(sizeof(*init)); + if (!init) + return NULL; + + freqs = calloc(nr_cpus, sizeof(*freqs)); + if (!freqs) { + free(init); + return NULL; + } + memset(freqs, 0, sizeof(*freqs) * nr_cpus); + + for (cpu = 0; cpu < nr_cpus; cpu++) { + char *fpath; + unsigned int *freq = &(freqs[cpu]); + + if (asprintf(&fpath, CPUFREQ_CURFREQ_PATH_FORMAT, cpu) < 0) { + release_init_pstates(init); + return NULL; + } + if (read_int(fpath, (int *)freq)) + *freq = 0; + free(fpath); + } + init->nr_cpus = nr_cpus; + init->freqs = freqs; + + return init; +} + +/** + * alloc_pstate - allocate, sort, 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, i, next = 0; + + pstate = pstates->pstate; + nrfreq = pstates->max; + + tmp = realloc(pstate, sizeof(*pstate) * (nrfreq + 1)); + if (!tmp) { + perror("realloc pstate"); + return -1; + } + pstate = tmp; + pstates->pstate = tmp; + pstates->max = nrfreq + 1; + + for (i = 0; i < nrfreq && freq <= pstate[i].freq; i++) + ; + + next = i; + for (i = nrfreq; i > next && i > 0; i--) { + pstate[i] = pstate[i - 1]; + pstate[i].id = i; + pstates->current = (pstates->current == i - 1)? + i : pstates->current; + } + + pstate[next].id = next; + pstate[next].freq = freq; + pstate[next].count = 0; + pstate[next].min_time = DBL_MAX; + pstate[next].max_time = 0; + pstate[next].avg_time = 0; + pstate[next].duration = 0; + + return next; +} + /** * release_pstate_info - free all P-state related structs * @pstates: per-cpu array of P-state statistics structs @@ -560,14 +675,16 @@ static void release_pstate_info(struct cpufreq_pstates *pstates, int nrcpus) return; } -/** - * 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 + * @initp: initial P-state of CPUs before trace acquistion + * @start_ts: timestamp when trace acquisition started * * Return: per-CPU array of structs (success) or NULL (error) */ -static struct cpufreq_pstates *build_pstate_info(int nrcpus) +static struct cpufreq_pstates *build_pstate_info(int nrcpus, + struct init_pstates *initp, double start_ts) { int cpu; struct cpufreq_pstates *pstates; @@ -577,67 +694,28 @@ static struct cpufreq_pstates *build_pstate_info(int nrcpus) return NULL; 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; - } + if (initp) + assert(initp->nr_cpus == nrcpus); - /* 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; + for (cpu = 0; cpu < nrcpus; cpu++) { + struct cpufreq_pstates *ps = &(pstates[cpu]); + + ps->pstate = NULL; + ps->max = 0; + ps->current = -1; /* unknown */ + ps->idle = -1; /* unknown */ + ps->time_enter = 0.; + ps->time_exit = 0.; + + if (initp && initp->freqs[cpu] > 0 && start_ts > 0) { + ps->current = alloc_pstate(ps, initp->freqs[cpu]); + assert(ps->current >= 0); + ps->time_enter = start_ts; + ps->idle = 0; } - - /* now populate cpufreq_pstates for this CPU */ - pstates[cpu].pstate = pstate; - pstates[cpu].max = nrfreq; - pstates[cpu].current = -1; /* unknown */ - pstates[cpu].idle = -1; /* unknown */ - pstates[cpu].time_enter = 0.; - pstates[cpu].time_exit = 0.; } return pstates; - -clean_exit: - release_pstate_info(pstates, nrcpus); - return NULL; } static int get_current_pstate(struct cpuidle_datas *datas, int cpu, @@ -712,6 +790,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: @@ -742,6 +823,19 @@ static void cpu_change_pstate(struct cpuidle_datas *datas, int cpu, } } +static void cpu_close_all_pstate(struct cpuidle_datas *datas, double time) +{ + struct cpufreq_pstates *ps; + struct cpufreq_pstate *p; + int cpu, cur; + + for (cpu = 0; cpu < datas->nrcpus; cpu++) { + cur = get_current_pstate(datas, cpu, &ps, &p); + if (p && !cur && time > 0) + close_current_pstate(ps, time); + } +} + static void cpu_pstate_idle(struct cpuidle_datas *datas, int cpu, double time) { struct cpufreq_pstates *ps = &(datas->pstates[cpu]); @@ -763,7 +857,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; @@ -826,9 +919,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; } @@ -846,9 +938,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; } @@ -932,7 +1023,8 @@ static int get_wakeup_irq(struct cpuidle_datas *datas, char *buffer, int count) return -1; } -static struct cpuidle_datas *idlestat_load(struct program_options *options) +static struct cpuidle_datas *idlestat_load(struct program_options *options, + struct init_pstates *initp, double start_ts, double end_ts) { FILE *f; unsigned int state = 0, freq = 0, cpu = 0, nrcpus = 0; @@ -988,14 +1080,13 @@ static struct cpuidle_datas *idlestat_load(struct program_options *options) return ptrerror("build_cstate_info: out of memory"); } - datas->pstates = build_pstate_info(nrcpus); + datas->pstates = build_pstate_info(nrcpus, initp, start_ts); if (!datas->pstates) { free(datas->cstates); free(datas); fclose(f); return ptrerror("build_pstate_info: out of memory"); } - datas->nrcpus = nrcpus; /* read topology information */ @@ -1018,7 +1109,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; @@ -1031,6 +1121,9 @@ static struct cpuidle_datas *idlestat_load(struct program_options *options) fclose(f); + /* close all p-state with end timestamp */ + cpu_close_all_pstate(datas, end_ts); + fprintf(stderr, "Log is %lf secs long with %zd events\n", end - begin, count); @@ -1481,7 +1574,9 @@ int main(int argc, char *argv[], char *const envp[]) { struct cpuidle_datas *datas; struct program_options options; + struct init_pstates *initp = NULL; int args; + double start_ts, end_ts; args = getoptions(argc, argv, &options); if (args <= 0) @@ -1527,6 +1622,14 @@ int main(int argc, char *argv[], char *const envp[]) if (idlestat_flush_trace()) return -1; + /* Get current P-state of all CPUs */ + if (options.display & FREQUENCY_DISPLAY) + initp = build_init_pstates(); + + /* Get timestamp before trace acquisition */ + if (options.display & FREQUENCY_DISPLAY) + start_ts = get_trace_ts(); + /* Start the recording */ if (idlestat_trace_enable(true)) return -1; @@ -1549,6 +1652,17 @@ int main(int argc, char *argv[], char *const envp[]) if (idlestat_trace_enable(false)) return -1; + /* Get timestamp after trace acquisition */ + if (options.display & FREQUENCY_DISPLAY) + end_ts = get_trace_ts(); + + /* Emit warning messages when P-state info might be partial */ + if (options.display & FREQUENCY_DISPLAY && + (!initp || start_ts < 0 || end_ts < 0)) + fprintf(stderr, "Unable to get initial P-state," + " beginning timestamp, or ending timestamp!\n" + "P-state statistics data might be partial!\n"); + /* At this point we should have some spurious wake up * at the beginning of the traces and at the end (wake * up all cpus and timer expiration for the timer @@ -1559,7 +1673,7 @@ int main(int argc, char *argv[], char *const envp[]) } /* Load the idle states information */ - datas = idlestat_load(&options); + datas = idlestat_load(&options, initp, start_ts, end_ts); if (!datas) return 1; @@ -1590,6 +1704,7 @@ int main(int argc, char *argv[], char *const envp[]) } } + release_init_pstates(initp); release_cpu_topo_cstates(); release_cpu_topo_info(); release_pstate_info(datas->pstates, datas->nrcpus); diff --git a/idlestat.h b/idlestat.h index 735f0fe..39ba4d7 100644 --- a/idlestat.h +++ b/idlestat.h @@ -41,6 +41,8 @@ "/sys/devices/system/cpu/cpu%d/cpuidle/state%d/residency" #define CPUFREQ_AVFREQ_PATH_FORMAT \ "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_available_frequencies" +#define CPUFREQ_CURFREQ_PATH_FORMAT \ + "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_cur_freq" #define CPUIDLE_STATENAME_PATH_FORMAT \ "/sys/devices/system/cpu/cpu%d/cpuidle/state%d/name" @@ -63,6 +65,11 @@ struct cpuidle_cstate { int target_residency; /* -1 if not available */ }; +struct init_pstates { + int nr_cpus; + unsigned int *freqs; +}; + enum IRQ_TYPE { HARD_IRQ = 0, IPI_IRQ, diff --git a/trace.h b/trace.h index bef6703..90b4a6a 100644 --- a/trace.h +++ b/trace.h @@ -33,6 +33,7 @@ #define TRACE_EVENT_PATH TRACE_PATH "/events/enable" #define TRACE_FREE TRACE_PATH "/free_buffer" #define TRACE_FILE TRACE_PATH "/trace" +#define TRACE_STAT_FILE TRACE_PATH "/per_cpu/cpu0/stats" #define TRACE_IDLE_NRHITS_PER_SEC 10000 #define TRACE_IDLE_LENGTH 196 #define TRACE_CPUFREQ_NRHITS_PER_SEC 100 -- 1.9.1

10 years, 2 months

[PATCH POWERTOP V4] 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)gmail.com> Signed-off-by: Sanjay Singh Rawat <sanjay.rawat(a)linaro.org> --- v4 - remove resizing before freeing the vector v3 - remove unused variables, reduce array size to suitable value - replace the inactive code block in the report function with TODO comment v2 - Show devfreq window on support basis. Check for empty devfreq directory. - Free the open dirp while exiting. --- src/Makefile.am | 1 + src/devices/devfreq.cpp | 332 ++++++++++++++++++++++++++++++++++++++++++++++ src/devices/devfreq.h | 75 +++++++++++ src/main.cpp | 9 ++ src/report/report-maker.h | 1 + 5 files changed, 418 insertions(+) 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 311b75e..d2f1da7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,6 +39,7 @@ powertop_SOURCES = \ devices/alsa.h \ devices/backlight.cpp \ devices/backlight.h \ + devices/devfreq.cpp \ devices/device.cpp \ devices/device.h \ devices/gpu_rapl_device.cpp \ diff --git a/src/devices/devfreq.cpp b/src/devices/devfreq.cpp new file mode 100644 index 0000000..d2e56e3 --- /dev/null +++ b/src/devices/devfreq.cpp @@ -0,0 +1,332 @@ +/* + * 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 DIR *dir = NULL; + +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; + + 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) +{ + struct dirent *entry; + int num = 0; + + std::string p = "/sys/class/devfreq/"; + dir = opendir(p.c_str()); + if (dir == NULL) { + fprintf(stderr, "Devfreq not enabled\n"); + is_enabled = false; + return; + } + + while((entry = readdir(dir)) != NULL) + num++; + + if (num == 2) { + fprintf(stderr, "Devfreq not enabled\n"); + is_enabled = false; + closedir(dir); + 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 */ + +} + +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]; + + delete df; + } + all_devfreq.clear(); + /* close /sys/class/devfreq */ + if (dir != NULL) + closedir(dir); +} diff --git a/src/devices/devfreq.h b/src/devices/devfreq.h new file mode 100644 index 0000000..16a60fb --- /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[128]; + 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 d3963ed..2162004 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" @@ -201,6 +202,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(); @@ -213,6 +215,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(); @@ -240,6 +243,8 @@ 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(); @@ -353,6 +358,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); @@ -464,6 +470,8 @@ int main(int argc, char **argv) } if (!auto_tune) init_display(); + + initialize_devfreq(); initialize_tuning(); /* first one is short to not let the user wait too long */ one_measurement(1, NULL); @@ -500,6 +508,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

10 years, 2 months

[Activity] Week 41

by Dileep Katta

== Progress == * CARD 1103: Flash support on u-boot fastboot (CARD-1103: 80%) - Submitted patch enabling existing fastboot framework on BBB * Enabling UEFI Fastboot on Panda (CARD-198: 20%) - Started working on the task == Plans == * Enabling UEFI Fastoot on Panda (CARD-198: 100%) - Work on enabling Application and protocol == Issues == * None Regards, Dileep

10 years, 2 months

[ACTIVITY] Week42

by Wookey

== Progress == * Set up test wanna-build instance for multiarch-build testing (with DimaKogan) (DEVPLAT-220: 15%) * Fixed sbuild for squeeze chroots (pre-multiarch dpkg) (DEVPLAT-220: 20%) * Released sbuild-0.65.0 with build-profiles, linaro patches and lots of fixes (with bdrung) (DEVPLAT-220: 20%) * Helped new new Linaro/Debian hardware set-up (CARD-1586: 5%) * Filed 93 'dh-autoreconf' bugs for arm64 (CARD-1586: 15%) * Fixed/uploaded various packages (libphonenumber, aiksaurus, gmetadom, open-vpn-auth-ldap.(CARD-1586: 15%) * Uploaded botch 0.3 and 0.4 (bootstrap tools) * built and uploaded cross-binutils-0.13 (DEVPLAT-220: 10%) == Plans == * Get cross-toolchain packages into testing before freeze (looking iffy) == Issues == Shortage of hours in day. Wookey -- Principal hats: Linaro, Emdebian, Wookware, Balloonboard, ARM http://wookware.org/

10 years, 2 months

[ACTIVITY] Week 42

by Vishal Bhoj

== Progress == * cleaned up vexpress-LSK build (20%) * Tuned lsk images booting in LAVA (40%) * Project ARA (40%) == Plans == * Enable SELinux on linux-linaro == Issues == * None

10 years, 2 months

[ACTIVITY] Week 42

by Riku Voipio

== Progress == * Juno CI KVM full loop works now (CARD-1611 40%) -> example: https://validation.linaro.org/scheduler/job/185615 * Moved kvm-ci jobs to docker (20%) * qemu-ci now built with jenkins-job-builder (20%) * filed bug report about kvm/juno Oops in 3.18 (10%) * submitted patch to enable GCOV on arm64 (10%) -> picked up by akpm: http://ozlabs.org/~akpm/mmots/broken-out/gcov-enable-gcov_profile_all-from-… == Plans == * Continue docker/ jenkins-job-builder conversions * split/close-out of CARD-1611 * Move Xen jobs from linux-linaro to mainline

10 years, 2 months

[ACTIVITY] Week 42

by Koen Kooi

== Progress == * ELC-E (90%) * Release (10%) * Fix android directories and other issues == Plans == * Bugzilla backlog * OE build warnings * LEG CI -- Koen Kooi Builds and Baselines | Release Manager Linaro.org | Open source software for ARM SoCs

10 years, 2 months

[ACTIVITY] week41

by Wookey

== Progress == * Buildd-tending: (CARD-1586: 10%) Debian official rebuild is up to 87% https://buildd.debian.org/stats/graph-quarter-big.png * Made arrangements for new Linaro/Debian hardware (CARD-1586: 5%) * Wrote script to diff debian-ports and debian offical (5%) * Fixed cross-gcc doc-link/dep issue, and cross-fortran. Uploaded 0.5 to NEW (DEVPLAT-220: 40%) * Tested and uploaded fixed/improved multiarch-build sbuild (DEVPLAT-220: 20%) * Backported multiarch-build to sbuild version on buildds - mailed list (DEVPLAT-220: 20%) == Plans == * Get cross-toolchain packages into testing before freeze * Enable new buildd hardware == Issues == Shortage of hours in day. Wookey -- Principal hats: Linaro, Emdebian, Wookware, Balloonboard, ARM http://wookware.org/

10 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev October 2014