linaro-dev October 2014

linaro-dev@lists.linaro.org

15 participants
35 discussions

by Vishal Bhoj

== Progress == * Cleanup Juno AOSP master build (DEVPLAT-263, 30%) * Integrate bc command in Juno build (REQ-559, 10%) * Project ARA (60%) == Plans == * Enable SELinux on linux-linaro * Investigate ARMv8 LSK failures in LAVA * Project ARA. == Issues == * None

11 years

[ACTIVITY] Week 41

by Riku Voipio

== Progress == * Juno CI loop added and tested (CARD-1611 50%) * qemu job to docker migration finished (20%) * Ended TC2 kvm testing - not all needed code mainline (20%) * started converting my CI jobs to use jenkins-job-builder (10%) == Plans == * mocve my jobs to jenkins-job-builder and docker where applicable * highbank slave upgrade to trusty == Issues == * Xen juno support not ready, need to split CARD-1611

11 years

[ACTIVITY] Week 41

by Koen Kooi

== Progress == * Release (20%) * add links for bare metal toolchain (Bug 719) * fix permission issue for 14.06 toolchain (Bug 745) * remove some more launchpad references * release note updates * OE baseline work (CARD-787: 80%) * All builds seem to be OK * Going through all the warnings and fix them == Plans == * ELC-E -- Koen Kooi Builds and Baselines | Release Manager Linaro.org | Open source software for ARM SoCs

11 years

[ACTIVITY] Weeks 40+41

by Bernhard Rosenkränzer

Just realized I forgot to send the report last week, so I'm combining them. == Progress == * Got AOSP to build with clang for all Nexus devices * Submitted all related patches upstream, most are accepted, 34 remaining in the queue * Wrote a script that pulls related patches directly from AOSP's gerrit * Looked at boot failure with clang-built init; no final results yet (clang-built init does start up properly, but reboots at some point that needs to be identified) * Looked at UI startup failure with clang-built AOSP; no final results yet (building the most suspected components such as surfaceflinger, opengl, hwui, ... with gcc doesn't help) * Started preparing for my Linux Plumbers Conf talks * Looked at installjammer and NSIS to replace the Windoze installer for toolchain binaries (cbuild1 built this automatically, cbuild2 currently doesn't). Picked NSIS. == Plans == * Finish preparations for my Linux Plumbers Conf talks * Attend Linux Plumbers Conf * Toolchain releases == Issues == * none

11 years

[PATCH POWERTOP V3] 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> --- 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 | 333 ++++++++++++++++++++++++++++++++++++++++++++++ src/devices/devfreq.h | 75 +++++++++++ src/main.cpp | 9 ++ src/report/report-maker.h | 1 + 5 files changed, 419 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..38f9d6e --- /dev/null +++ b/src/devices/devfreq.cpp @@ -0,0 +1,333 @@ +/* + * 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]; + + df->dstates.resize(0); + 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

11 years

Re: [Powertop] [PATCH] devfreq: add devfreq devices stats support

by Sanjay Singh Rawat

On Thursday 02 October 2014 01:52 AM, Magnus Fromreide wrote: > On Tue, Sep 30, 2014 at 12:04:54PM +0530, Sanjay Singh Rawat wrote: >> 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> >> --- >> >> 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 | 367 ++++++++++++++++++++++++++++++++++++++++++++++ >> src/devices/devfreq.h | 75 ++++++++++ >> src/main.cpp | 9 ++ >> src/report/report-maker.h | 1 + >> 5 files changed, 453 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..3eb63e5 >> --- /dev/null >> +++ b/src/devices/devfreq.cpp >> @@ -0,0 +1,367 @@ > ... >> +/* todo: adapt to new report format */ >> +#if 0 > Do it, or at least do not commit big #if 0-blocks. ack > >> + 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 > /MF -- sanjay

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)gmail.com> Signed-off-by: Sanjay Singh Rawat <sanjay.rawat(a)linaro.org> --- 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 | 367 ++++++++++++++++++++++++++++++++++++++++++++++ src/devices/devfreq.h | 75 ++++++++++ src/main.cpp | 9 ++ src/report/report-maker.h | 1 + 5 files changed, 453 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..3eb63e5 --- /dev/null +++ b/src/devices/devfreq.cpp @@ -0,0 +1,367 @@ +/* + * 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; + 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) +{ + 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 */ +#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(); + /* 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..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 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

11 years

[PATCH IDLESTAT] clear few memory leaks

by Sanjay Singh Rawat

Signed-off-by: Sanjay Singh Rawat <sanjay.rawat(a)linaro.org> --- below are the leaks which this patch clears 72 bytes in 3 blocks are definitely lost in loss record 2 of 9 at 0x4C2ABBD: malloc (vg_replace_malloc.c:296) by 0x4C2CA8B: realloc (vg_replace_malloc.c:692) by 0x403636: store_data (idlestat.c:836) 72 bytes in 2 blocks are definitely lost in loss record 4 of 9 at 0x4C2CB0A: realloc (vg_replace_malloc.c:692) by 0x403820: store_irq (idlestat.c:882) 32,136 bytes in 9 blocks are definitely lost in loss record 9 of 9 at 0x4C2CB0A: realloc (vg_replace_malloc.c:692) by 0x403636: store_data (idlestat.c:836) by 0x403E2D: idlestat_load (idlestat.c:1015) --- idlestat.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/idlestat.c b/idlestat.c index da615cb..4d38d57 100644 --- a/idlestat.c +++ b/idlestat.c @@ -459,9 +459,16 @@ 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); + if (cstates->wakeirq) + free(cstates->wakeirq); + /* free the cstates array */ free(cstates); } -- 1.8.3.2

11 years

[PATCH v2] Bug 351 - Display topology fo:r p-states and wakeups array

by Howard Chen

Currently only the c-state is showing the cpu topology when displaying the results. For the sake of consistency, we should also give the topology for the p-states and the wakeups array. Before: -------------------------------------------- | Wakeup | # | Name | Count | -------------------------------------------- | cpu0 | -------------------------------------------- | ipi | --- | RESCHEDULE | 1 | | irq | 100 | ahci | 4 | -------------------------------------------- | cpu1 | -------------------------------------------- | irq | 130 | eth1-TxRx-1 | 3 | | irq | 111 | eth0-TxRx-0 | 2 | | ipi | --- | CALL_FUNCTION | 1 | After: -------------------------------------------- | Wakeup | # | Name | Count | -------------------------------------------- | clusterA | -------------------------------------------- | cpu0 | -------------------------------------------- | ipi | --- | RESCHEDULE | 1 | | irq | 100 | ahci | 4 | -------------------------------------------- | cpu1 | -------------------------------------------- | irq | 130 | eth1-TxRx-1 | 3 | | irq | 111 | eth0-TxRx-0 | 2 | | ipi | --- | CALL_FUNCTION | 1 | Fix this by add display_cpu_header for other cases instead of CPUs only. Signed-off-by: Howard Chen <howard.chen(a)linaro.org> --- idlestat.c | 6 ++++++ topology.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/idlestat.c b/idlestat.c index da615cb..e609e86 100644 --- a/idlestat.c +++ b/idlestat.c @@ -242,6 +242,10 @@ static int display_pstates(void *arg, char *cpu) bool cpu_header = false; struct cpufreq_pstates *pstates = arg; + if(!strstr(cpu, "cpu")){ + display_cpu_header(cpu, 64); + return 0; + } for (i = 0; i < pstates->max; i++) { struct cpufreq_pstate *p = &(pstates->pstate[i]); @@ -299,6 +303,8 @@ static int display_wakeup(void *arg, char *cpu) struct wakeup_info *wakeinfo = &cstates->wakeinfo; struct wakeup_irq *irqinfo = wakeinfo->irqinfo; + if(!strstr(cpu, "cpu")) + display_cpu_header(cpu, 44); for (i = 0; i < wakeinfo->nrdata; i++, irqinfo++) { if (!cpu_header) { diff --git a/topology.c b/topology.c index 92521e1..47c6983 100644 --- a/topology.c +++ b/topology.c @@ -458,8 +458,7 @@ int dump_cpu_topo_info(int (*dump)(void *, char *), int cstate) sprintf(tmp, "cluster%c", s_phy->physical_id + 'A'); - if (cstate) - dump(s_phy->cstates, tmp); + dump(s_phy->cstates, tmp); list_for_each_entry(s_core, &s_phy->core_head, list_core) { if (s_core->is_ht && cstate) { -- 1.9.1

11 years

[Activity] Week 40

by Dileep Katta

== Progress == * CARD 1103: Flash support on u-boot fastboot (CARD-1103: 100%) - Fastboot flash framework by Steve Rae was accepted in Upstream - v4 can't be submitted due the code present in upstream - Working enabling the existing framework for BBB and Panda to complete the card == Plans == * CARD 1103: fastboot flash command (CARD-1103: 70%) - submit the changes made for support of BBB and Panda * Enabling UEFI Fastboot on Panda (CARD-198: 30%) - work on the task == Issues == * 2 days holiday in India in last week Regards, Dileep

11 years

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev October 2014