Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 35d41c2..d00973f 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ src/.deps/ src/Makefile src/calibrate/.deps/ src/cpu/.deps/ +src/cpu/rapl/.deps src/devices/.deps/ src/measurement/.deps/ src/parameters/.deps/ -- 2.0.4

The same error was fixed in multiple files to made clang++ work. error: variable length array of non-POD element type 'string' (aka 'basic_string<char>') Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- src/cpu/cpu.cpp | 18 ++++++++++++------ src/devices/ahci.cpp | 3 ++- src/devices/device.cpp | 6 ++++-- src/devlist.cpp | 3 ++- src/process/do_process.cpp | 9 ++++++--- src/report/report.cpp | 3 ++- src/tuning/tuning.cpp | 10 ++++++---- 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index dbca20c..4e040c1 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -479,12 +479,12 @@ void report_display_cpu_cstates(void) /* Tables for PKG, CORE, CPU */ pkg_tbl_size.cols=2; pkg_tbl_size.rows= ((cstates_num+1)-LEVEL_HEADER)+1; - string pkg_data[pkg_tbl_size.cols * pkg_tbl_size.rows]; + string *pkg_data = new string[pkg_tbl_size.cols * pkg_tbl_size.rows]; core_tbl_size.cols=2; core_tbl_size.rows=(cstates_num *_package->children.size()) + _package->children.size(); - string core_data[core_tbl_size.cols * core_tbl_size.rows]; + string *core_data = new string[core_tbl_size.cols * core_tbl_size.rows]; int num_cpus=0, num_cores=0; for (core = 0; core < _package->children.size(); core++) { @@ -506,7 +506,7 @@ void report_display_cpu_cstates(void) cpu_tbl_size.cols=(2 * (num_cpus / num_cores)) + 1; cpu_tbl_size.rows = ((cstates_num+1-LEVEL_HEADER) * _package->children.size()) + _package->children.size(); - string cpu_data[cpu_tbl_size.cols * cpu_tbl_size.rows]; + string *cpu_data = new string[cpu_tbl_size.cols * cpu_tbl_size.rows]; for (core = 0; core < _package->children.size(); core++) { cpu_data[idx3]="&nbsp;"; @@ -633,6 +633,9 @@ void report_display_cpu_cstates(void) init_cpu_table_attr(&std_table_css, title+1, cpu_tbl_size.rows, cpu_tbl_size.cols); report.add_table(cpu_data, &std_table_css); + delete [] pkg_data; + delete [] core_data; + delete [] cpu_data; } report.end_div(); } @@ -688,11 +691,11 @@ void report_display_cpu_pstates(void) /* Tables for PKG, CORE, CPU */ pkg_tbl_size.cols=2; pkg_tbl_size.rows=((pstates_num+1)-LEVEL_HEADER)+2; - string pkg_data[pkg_tbl_size.cols * pkg_tbl_size.rows]; + string *pkg_data = new string[pkg_tbl_size.cols * pkg_tbl_size.rows]; core_tbl_size.cols=2; core_tbl_size.rows=((pstates_num+2) *_package->children.size()); - string core_data[core_tbl_size.cols * core_tbl_size.rows]; + string *core_data = new string[core_tbl_size.cols * core_tbl_size.rows]; /* PKG */ num_cpus=0; @@ -717,7 +720,7 @@ void report_display_cpu_pstates(void) cpu_tbl_size.cols= (num_cpus/ num_cores) + 1; cpu_tbl_size.rows= (pstates_num+2) * _package->children.size() + _package->children.size(); - string cpu_data[cpu_tbl_size.cols * cpu_tbl_size.rows]; + string *cpu_data = new string[cpu_tbl_size.cols * cpu_tbl_size.rows]; /* Core */ for (core = 0; core < _package->children.size(); core++) { @@ -818,6 +821,9 @@ void report_display_cpu_pstates(void) init_cpu_table_attr(&std_table_css, title, cpu_tbl_size.rows, cpu_tbl_size.cols); report.add_table(cpu_data, &std_table_css); + delete [] pkg_data; + delete [] core_data; + delete [] cpu_data; } report.end_div(); } diff --git a/src/devices/ahci.cpp b/src/devices/ahci.cpp index 3b4627a..a0891ae 100644 --- a/src/devices/ahci.cpp +++ b/src/devices/ahci.cpp @@ -382,7 +382,7 @@ void ahci_create_device_stats_table(void) /* Set array of data in row Major order */ - string ahci_data[cols * rows]; + string *ahci_data = new string[cols * rows]; ahci_data[0]=__("Link"); ahci_data[1]=__("Active"); ahci_data[2]=__("Partial"); @@ -396,6 +396,7 @@ void ahci_create_device_stats_table(void) report.add_title(&title_attr, __("AHCI ALPM Residency Statistics")); report.add_table(ahci_data, &std_table_css); report.end_div(); + delete [] ahci_data; } void ahci::report_device_stats(string *ahci_data, int idx) diff --git a/src/devices/device.cpp b/src/devices/device.cpp index da595a8..b4765ef 100644 --- a/src/devices/device.cpp +++ b/src/devices/device.cpp @@ -247,7 +247,7 @@ void show_report_devices(void) /* Device Summary */ int summary_size=2; - string summary[summary_size]; + string *summary = new string[summary_size]; pw = global_joules_consumed(); char buf[32]; if (pw > 0.0001) { @@ -263,9 +263,10 @@ void show_report_devices(void) summary[1].append(" W"); report.add_summary_list(summary, summary_size); } + delete [] summary; /* Set array of data in row Major order */ - string device_data[cols * rows]; + string *device_data = new string[cols * rows]; device_data[0]= __("Usage"); device_data[1]= __("Device Name"); if (show_power) @@ -308,6 +309,7 @@ void show_report_devices(void) /* Report Output */ report.add_title(&title_attr, __("Device Power Report")); report.add_table(device_data, &std_table_css); + delete [] device_data; } diff --git a/src/devlist.cpp b/src/devlist.cpp index 21b4c1c..20fe5da 100644 --- a/src/devlist.cpp +++ b/src/devlist.cpp @@ -326,7 +326,7 @@ void report_show_open_devices(void) init_title_attr(&title_attr); /* Set array of data in row Major order */ - string process_data[cols * rows]; + string *process_data = new string[cols * rows]; sort(target->begin(), target->end(), devlist_sort); process_data[0]=__("Process"); @@ -348,5 +348,6 @@ void report_show_open_devices(void) /* No div attribute here inherits from device power report */ report.add_title(&title_attr, __("Process Device Activity")); report.add_table(process_data, &std_table_css); + delete [] process_data; report.end_div(); } diff --git a/src/process/do_process.cpp b/src/process/do_process.cpp index f7f9765..8d55507 100644 --- a/src/process/do_process.cpp +++ b/src/process/do_process.cpp @@ -918,7 +918,7 @@ void report_process_update_display(void) init_title_attr(&title_attr); /* Set array of data in row Major order */ - string software_data[cols * rows]; + string *software_data = new string[cols * rows]; software_data[0]=__("Usage"); software_data[1]=__("Wakeups/s"); software_data[2]=__("GPU ops/s"); @@ -1013,6 +1013,7 @@ void report_process_update_display(void) report.add_title(&title_attr, __("Overview of Software Power Consumers")); report.add_table(software_data, &std_table_css); report.end_div(); + delete [] software_data; } void report_summary(void) @@ -1048,7 +1049,7 @@ void report_summary(void) /* Set array for summary */ int summary_size =12; - string summary[summary_size]; + string *summary = new string [summary_size]; summary[0]=__("Target:"); summary[1]=__("1 units/s"); summary[2]=__("System: "); @@ -1068,7 +1069,7 @@ void report_summary(void) summary[11].append(__(" ops/s")); /* Set array of data in row Major order */ - string summary_data[cols * (rows+1)]; + string *summary_data = new string[cols * (rows + 1)]; summary_data[0]=__("Usage"); summary_data[1]=__("Events/s"); summary_data[2]=__("Category"); @@ -1134,6 +1135,8 @@ void report_summary(void) report.add_title(&title_attr, __("Top 10 Power Consumers")); report.add_table(summary_data, &std_table_css); report.end_div(); + delete [] summary; + delete [] summary_data; } diff --git a/src/report/report.cpp b/src/report/report.cpp index d55531e..981e984 100644 --- a/src/report/report.cpp +++ b/src/report/report.cpp @@ -115,7 +115,7 @@ static void system_info(void) init_title_attr(&title_attr); /* Set array of data in row Major order */ - string system_data[sys_table.rows * sys_table.cols]; + string *system_data = new string[sys_table.rows * sys_table.cols]; system_data[0]=__("PowerTOP Version"); system_data[1]=POWERTOP_VERSION; @@ -159,6 +159,7 @@ static void system_info(void) report.end_div(); report.end_header(); report.add_navigation(); + delete [] system_data; } void init_report_output(char *filename_str, int iterations) diff --git a/src/tuning/tuning.cpp b/src/tuning/tuning.cpp index 6367a20..85b80ac 100644 --- a/src/tuning/tuning.cpp +++ b/src/tuning/tuning.cpp @@ -230,7 +230,7 @@ void report_show_tunables(void) init_tune_table_attr(&tune_table_css, rows, cols); /* Set array of data in row Major order */ - string tunable_data[cols * rows]; + string *tunable_data = new string[cols * rows]; tunable_data[0]=__("Description"); tunable_data[1]=__("Script"); @@ -249,6 +249,7 @@ void report_show_tunables(void) /* Report Output */ report.add_title(&title_attr,__("Software Settings in Need of Tuning")); report.add_table(tunable_data, &tune_table_css); + delete [] tunable_data; } /* Second Table */ @@ -258,7 +259,7 @@ void report_show_tunables(void) init_tune_table_attr(&tune_table_css, rows, cols); /* Set array of data in row Major order */ - string untunable_data[rows]; + string *untunable_data = new string[rows]; untunable_data[0]=__("Description"); for (i = 0; i < all_untunables.size(); i++) @@ -267,6 +268,7 @@ void report_show_tunables(void) /* Report Output */ report.add_title(&title_attr,__("Untunable Software Issues")); report.add_table(untunable_data, &tune_table_css); + delete [] untunable_data; /* Third Table */ /* Set Table attributes, rows, and cols */ @@ -275,7 +277,7 @@ void report_show_tunables(void) init_std_table_attr(&tune_table_css, rows, cols); /* Set array of data in row Major order */ - string tuned_data[rows]; + string *tuned_data = new string[rows]; tuned_data[0]=__("Description"); idx=cols; for (i = 0; i < all_tunables.size(); i++) { @@ -291,7 +293,7 @@ void report_show_tunables(void) report.add_title(&title_attr,__("Optimal Tuned Software Settings")); report.add_table(tuned_data, &tune_table_css); report.end_div(); - + delete [] tuned_data; } void clear_tuning() -- 2.0.4

Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- src/cpu/rapl/rapl_interface.cpp | 4 ++-- src/devices/alsa.cpp | 1 - src/display.cpp | 9 ++------- src/tuning/runtime.cpp | 4 ---- src/tuning/tuning.cpp | 1 - 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/cpu/rapl/rapl_interface.cpp b/src/cpu/rapl/rapl_interface.cpp index a19e0a9..ab8e8ce 100644 --- a/src/cpu/rapl/rapl_interface.cpp +++ b/src/cpu/rapl/rapl_interface.cpp @@ -647,9 +647,9 @@ void c_rapl_interface::rapl_measure_energy() double pp0_joules = 0; double pp1_joules = 0; - ret = get_pkg_power_info(&thermal_spec_power, &max_power, &min_power, &max_time_window); + get_pkg_power_info(&thermal_spec_power, &max_power, &min_power, &max_time_window); RAPL_DBG_PRINT("Pkg Power Info: Thermal spec %f watts, max %f watts, min %f watts, max time window %f seconds\n", thermal_spec_power, max_power, min_power, max_time_window); - ret = get_dram_power_info(&thermal_spec_power, &max_power, &min_power, &max_time_window); + get_dram_power_info(&thermal_spec_power, &max_power, &min_power, &max_time_window); RAPL_DBG_PRINT("DRAM Power Info: Thermal spec %f watts, max %f watts, min %f watts, max time window %f seconds\n", thermal_spec_power, max_power, min_power, max_time_window); for (;;) { diff --git a/src/devices/alsa.cpp b/src/devices/alsa.cpp index 5dee334..a1fca71 100644 --- a/src/devices/alsa.cpp +++ b/src/devices/alsa.cpp @@ -154,7 +154,6 @@ static void create_all_alsa_callback(const char *d_name) { char filename[4096]; class alsa *bl; - ofstream file; if (strncmp(d_name, "hwC", 3) != 0) return; diff --git a/src/display.cpp b/src/display.cpp index c76ba27..123620a 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -267,13 +267,8 @@ void cursor_up(void) if (w) { w->cursor_up(); if(w->ypad_pos > 0) { - if (tab_names[current_tab] == "Tunables") { - prefresh(w->win, --w->ypad_pos, w->xpad_pos, - 1, 0, LINES - 3, COLS - 1); - } else { - prefresh(w->win, --w->ypad_pos, w->xpad_pos, - 1, 0, LINES - 3, COLS - 1); - } + prefresh(w->win, --w->ypad_pos, w->xpad_pos, + 1, 0, LINES - 3, COLS - 1); } } diff --git a/src/tuning/runtime.cpp b/src/tuning/runtime.cpp index b57d53e..3201fdd 100644 --- a/src/tuning/runtime.cpp +++ b/src/tuning/runtime.cpp @@ -139,10 +139,6 @@ void add_runtime_tunables(const char *bus) if (entry->d_name[0] == '.') continue; - sprintf(filename, "/sys/bus/%s/devices/%s", bus, entry->d_name); - - - sprintf(filename, "/sys/bus/%s/devices/%s/power/control", bus, entry->d_name); if (access(filename, R_OK) != 0) diff --git a/src/tuning/tuning.cpp b/src/tuning/tuning.cpp index 85b80ac..7d64cad 100644 --- a/src/tuning/tuning.cpp +++ b/src/tuning/tuning.cpp @@ -198,7 +198,6 @@ void report_show_tunables(void) unsigned int i; /* three tables; bad, unfixable, good */ sort_tunables(); - string srt_tmp; int idx, rows = 0, cols; /* First Table */ -- 2.0.4

Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- src/main.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 3b67ef0..4bfd038 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -460,7 +460,8 @@ int main(int argc, char **argv) end_pci_access(); exit(0); } - init_display(); + if (!auto_tune) + init_display(); initialize_tuning(); /* first one is short to not let the user wait too long */ one_measurement(1, NULL); @@ -473,11 +474,13 @@ int main(int argc, char **argv) } while (!leave_powertop) { - show_cur_tab(); + if (!auto_tune) + show_cur_tab(); one_measurement(time_out, NULL); learn_parameters(15, 0); } - endwin(); + if (!auto_tune) + endwin(); printf("%s\n", _("Leaving PowerTOP")); end_process_data(); -- 2.0.4

On (08/05/14 22:31), Sami Kerola wrote: I think it makes sense to extend ui_notify_user() so it can cover both cases: initialised ncurses -- calling mvprintw(), and uninitialised ncurses -- printf (to stdout). this will change a bit 'powertop --auto-tune' behaviour, since by default user will now see a 'list' of commands executed by powertop, but it's really easy to silent powertop via stdout redirection. what do you think? -ss

On 20 August 2014 15:57, Sami Kerola <kerolasa(a)iki.fi&gt; wrote: Hello Sergey and others, I had a bit of spare time so I started to look what exactly is calling mvprintw() via ui_notify_user(). My initial reaction was that I must have made some error in search, because I could not find such call. So I added abort() to the code... index b482296..55c9603 100644 --- a/src/lib.cpp +++ b/src/lib.cpp @@ -546,5 +546,6 @@ void ui_notify_user(const char *frmt, ...) vsnprintf(notify, UI_NOTIFY_BUFF_SZ - 1, frmt, list); va_end(list); mvprintw(1, 0, notify); + abort(); attroff(COLOR_PAIR(1)); } ...and found the --auto-tune does not entering to that function. When running in normal mode the call path is from main() -> one_measurement() -> do_sleep() -> cursor_enter() -> tuning_window::cursor_enter -> ui_notify_user() -> mvprintw(). I also realized the --auto-tune is setting leave_powertop = 1, which means the patch 0009 can be simplified. Here is better version of the change that avoids running unnecessary if(). --->8---- From: Sami Kerola <kerolasa(a)iki.fi&gt; Date: Wed, 20 Aug 2014 23:31:52 +0300 Subject: [PATCH 09/14] do not use ncurses when --auto-tune is specified Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky(a)gmail.com&gt; Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- src/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 3b67ef0..bd0fc88 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -460,7 +460,8 @@ int main(int argc, char **argv) end_pci_access(); exit(0); } - init_display(); + if (!auto_tune) + init_display(); initialize_tuning(); /* first one is short to not let the user wait too long */ one_measurement(1, NULL); @@ -477,7 +478,8 @@ int main(int argc, char **argv) one_measurement(time_out, NULL); learn_parameters(15, 0); } - endwin(); + if (!auto_tune) + endwin(); printf("%s\n", _("Leaving PowerTOP")); end_process_data(); -- 2.1.0

Use header macro .TH expected way. Use English spacing, that means two spaces after a dot. Use simple font macros, such as .B or .BR, where possible rather than \fB inline selectors. Highlight option arguments consistently, also in description segments. Convert interactive commands to a table. Use mail and web address macros when appropriate. Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- doc/powertop.8 | 141 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/doc/powertop.8 b/doc/powertop.8 index 3535a21..31e7e6d 100644 --- a/doc/powertop.8 +++ b/doc/powertop.8 @@ -1,94 +1,95 @@ -.TH POWERTOP 8 "June 1, 2012" "Linux" "powertop manual" +.TH POWERTOP "8" "2014-08-02" "powertop manual" "System Administration" .SH NAME powertop \- a power consumption and power management diagnosis tool. .SH SYNOPSIS .B powertop -.RB [ -.IR options -.RB ] +.RI [ options ] .SH DESCRIPTION -.P -\fBpowertop\fP is a program that helps to diagnose various issues with power consumption -and power management. It also has an interactive mode allowing one to -experiment with various power management settings. When invoking powertop -without arguments powertop starts in interactive mode. +.B powertop +is a program that helps to diagnose various issues with power consumption +and power management. It also has an interactive mode allowing one to +experiment with various power management settings. When invoking +powertop without arguments powertop starts in interactive mode. .SH OPTIONS .TP -\fB\-\-calibrate -runs powertop in calibration mode. When running on battery, powertop -can track power consumption as well as system activity. When there -are enough measurements, powertop can start to report power estimates. One +.B \-\-calibrate +Runs powertop in calibration mode. When running on battery, powertop can +track power consumption as well as system activity. When there are +enough measurements, powertop can start to report power estimates. One can get more accurate estimates by using this option to enable a -calibration cycle. This will cycle through various display levels and USB -device activities and workloads. +calibration cycle. This will cycle through various display levels and +USB device activities and workloads. .TP -\fB\-\-csv[\fR=\fIFILENAME\fR] -generate a CSV report. If a filename is not specified then the -default name "powertop.csv" is used. The CSV report can be -used for reporting and data analysis. +\fB\-\-csv\fR[=\fIfilename\fR] +Generate a CSV report. If a +.I filename +is not specified then the default name +.B powertop.csv +is used. The CSV report can be used for reporting and data analysis. .TP -\fB\-\-debug - run in "debug" mode. +.B \-\-debug +Run in "debug" mode. .TP \fB\-\-extech\fR=\fIdevnode\fR -use the Extech Power Analyzer for measurements. This allows one to +Use the Extech Power Analyzer for measurements. This allows one to specify the serial device node of the serial to USB adaptor connecting to -the Extech Power Analyzer, for example /dev/ttyUSB0. +the Extech Power Analyzer, for example +.IR /dev/ttyUSB0 . .TP -\fB\-\-help - show the help message. +.B \-\-help +Show the help message. .TP -\fB\-\-html[\fR=\fIFILENAME\fR] -generate an HTML report. If a filename is not specified then the -default name "powertop.html" is used. The HTML report can be -sent to others to help diagnose power issues. +\fB\-\-html\fR[=\fIfilename\fR] +Generate an HTML report. If a +.I filename +is not specified then the default name +.B powertop.html +is used. The HTML report can be sent to others to help diagnose power +issues. .TP -\fB\-\-iteration[\fR=\fIiterations\fR] -number of times to run each test. +\fB\-\-iteration\fR[=\fIiterations\fR] +Number of times to run each test. .TP -\fB\-\-quiet - suppress stderr output. +.B \-\-quiet +Suppress stderr output. .TP -\fB\-\-time[\fR=\fIseconds\fR] -generate a report for a specified number of seconds. +\fB\-\-time\fR[=\fIseconds\fR] +Generate a report for a specified number of +.IR seconds . .TP -\fB\-\-version -print version information and exit. +.B \-\-version +Print version information and exit. .SH COMMANDS In interactive mode, the following key bindings are available: -.TP -\fBTab -Show next tab -.TP -\fBBackTab -Show previous tab -.TP -\fBRight Arrow -Scroll to the right -.TP -\fBLeft Arrow -Scroll to the left -.TP -\fBUp Arrow, PageUp -Scroll up or select previous item -.TP -\fBDown Arrow, PageDown -Scroll down or select next item -.TP -\fBSpace, Return -Activate current item -.TP -\fBs -Set refresh timeout -.TP -\fBr -Refresh window -.TP -\fBq, Ctrl-C, Escape -Exit powertop +.IP +.TS +tab(@); +l l. +\fBTab\fR@Show next tab +\fBBackTab\fR@Show previous tab +\fBRight Arrow\fR@Scroll to the right +\fBLeft Arrow\fR@Scroll to the left +\fBUp Arrow\fR, \fBPageUp\fR@Scroll up or select previous item +\fBDown Arrow\fR, \fBPageDown\fR@Scroll down or select next item +\fBSpace\fR, \fBReturn\fR@Activate current item +\fBs\fR@Set refresh timeout +\fBr\fR@Refresh window +\fBq\fR, \fBCtrl-C\fR, \fBEscape\fR@Exit powertop +.TE .SH BUGS -Send bug reports to <powertop(a)lists.01.org&gt; +Send bug reports to +.MT powertop(a)lists.01.org +.ME .SH SEE ALSO -The program is more fully described at https://01.org/powertop +The program is more fully described at +.UR https://01.org/powertop +.UE .SH AUTHOR -powertop was written by Arjan van de Ven <arjan(a)linux.intel.com&gt;, and is currently maintained by Chris E Ferron <chris.e.ferron(a)linux.intel.com&gt;. +powertop was written by +.MT arjan@\:linux.\:intel.\:com +Arjan van de Ven +.ME , +and is currently maintained by +.MT chris.\:e.\:ferron@\:linux.\:intel.\:com +Chris E Ferron +.ME . -- 2.0.4

Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- README.traceevent | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/README.traceevent b/README.traceevent index 38563ab..0747766 100644 --- a/README.traceevent +++ b/README.traceevent @@ -1,15 +1,20 @@ traceevent: -The traceevent library being built in PowerTOP is really a effort by Steven Rostedt. -The long term intent is for Steven to push the trace event library to distributions, and consume it externally. Right now the PowerTOP project is keeping in sync with his code posted in the Linux kernel git under tools/lib/traceevent. -We will not take patches into the traceevent code directly, rather we will be re-basing -against that code base. +The traceevent library being built in PowerTOP is really a effort by +Steven Rostedt. The long term intent is for Steven to push the trace +event library to distributions, and consume it externally. Right now the +PowerTOP project is keeping in sync with his code posted in the Linux +kernel git under tools/lib/traceevent. We will not take patches into the +traceevent code directly, rather we will be re-basing against that code +base. If you find a bug in the trace event code, you should to one of two things. -1. Send a patch to the PowerTOP mailing list, which will get forwared to Steven if appropriate. -2. Send a patch to the PowerTOP mailing list, cc <Steven Rostedt> rostedt(a)goodmis.org +1. Send a patch to the PowerTOP mailing list, which will get forwared to + Steven if appropriate. +2. Send a patch to the PowerTOP mailing list, and + CC: Steven Rostedt <rostedt(a)goodmis.org&gt; -Please do use the PowerTOP mailing list to discuss topics about traceevent as its used with PowerTOP. - +Please do use the PowerTOP mailing list to discuss topics about +traceevent as its used with PowerTOP. -- 2.0.4

Options in manual page are now in same order as in usage output, and they include short options when aplicable. Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- doc/powertop.8 | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/doc/powertop.8 b/doc/powertop.8 index 31e7e6d..8f93c43 100644 --- a/doc/powertop.8 +++ b/doc/powertop.8 @@ -12,7 +12,10 @@ experiment with various power management settings. When invoking powertop without arguments powertop starts in interactive mode. .SH OPTIONS .TP -.B \-\-calibrate +.B \-\-auto\-tune +Set all tunable options to their good setting without interaction. +.TP +.BR \-c ", " \-\-calibrate Runs powertop in calibration mode. When running on battery, powertop can track power consumption as well as system activity. When there are enough measurements, powertop can start to report power estimates. One @@ -20,7 +23,7 @@ can get more accurate estimates by using this option to enable a calibration cycle. This will cycle through various display levels and USB device activities and workloads. .TP -\fB\-\-csv\fR[=\fIfilename\fR] +\fB\-C\fR, \fB\-\-csv\fR[=\fIfilename\fR] Generate a CSV report. If a .I filename is not specified then the default name @@ -28,7 +31,7 @@ is not specified then the default name is used. The CSV report can be used for reporting and data analysis. .TP .B \-\-debug -Run in "debug" mode. +Run in debug mode. .TP \fB\-\-extech\fR=\fIdevnode\fR Use the Extech Power Analyzer for measurements. This allows one to @@ -36,10 +39,7 @@ specify the serial device node of the serial to USB adaptor connecting to the Extech Power Analyzer, for example .IR /dev/ttyUSB0 . .TP -.B \-\-help -Show the help message. -.TP -\fB\-\-html\fR[=\fIfilename\fR] +\fB\-h\fR, \fB\-\-html\fR[=\fIfilename\fR] Generate an HTML report. If a .I filename is not specified then the default name @@ -47,18 +47,26 @@ is not specified then the default name is used. The HTML report can be sent to others to help diagnose power issues. .TP -\fB\-\-iteration\fR[=\fIiterations\fR] +\fB\-i\fR, \fB\-\-iteration\fR[=\fIiterations\fR] Number of times to run each test. .TP -.B \-\-quiet +.BR \-q ", " \-\-quiet Suppress stderr output. .TP -\fB\-\-time\fR[=\fIseconds\fR] +\fB\-t\fR, \fB\-\-time\fR[=\fIseconds\fR] Generate a report for a specified number of .IR seconds . .TP -.B \-\-version +\fB\-w\fR, \fB\-\-workload\fR[=\fIworkload\fR] +Execute +.I workload +file as a part of calibration before making a report. +.TP +.BR \-V ", " \-\-version Print version information and exit. +.TP +.BR \-u ", " \-\-help +Show the help message and exit. .SH COMMANDS In interactive mode, the following key bindings are available: .IP -- 2.0.4