tools/thermal: tmon: UI and build system improvements
cover tools/thermal: tmon: UI and build system improvements
Hi,
This patch set includes a few build system improvements and a few UI fixes.
The last patch is ugly, and personally, I don't care if it's included. But it's an attempt to kill a warning. Better suggestions are welcome.
Thanks,
Brian
Brian Norris (8):
tools/thermal: tmon: add --target-temp parameter tools/thermal: tmon: add min/max macros
tools/thermal: tmon: tui: don't hard-code dialog window size
assumptions
tools/thermal: tmon: fixup tui windowing calculations tools/thermal: tmon: add .gitignore
tools/thermal: tmon: support cross-compiling tools/thermal: tmon: use pkg-config to determine library dependencies tools/thermal: tmon: silence 'set but not used' warnings
tools/thermal/tmon/.gitignore | 1 + tools/thermal/tmon/Makefile | 15 ++++++++++++--- tools/thermal/tmon/tmon.8 | 2 ++ tools/thermal/tmon/tmon.c | 14 ++++++++++++-- tools/thermal/tmon/tui.c | 45 ++++++++++++++++++++++++++++++++++--------- 5 files changed, 63 insertions(+), 14 deletions(-) create mode 100644 tools/thermal/tmon/.gitignore
Signature · 1 line
1.9.1
PATCH 1/8 tools/thermal: tmon: add --target-temp parameter
If we launch in daemon mode (--daemon), we don't have the ncurses UI, but we might want to set the target temperature still. For example, someone might stick the following in their boot script:
tmon --control intel_powerclamp --target-temp 90 --log --daemon
This would turn on CPU idle injection when we're around 90 degrees celsius, and would log temperature and throttling info to /var/tmp/tmon.log.
--- tools/thermal/tmon/tmon.8 | 2 ++ tools/thermal/tmon/tmon.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-)
tools/thermal/tmon/tmon.8 +2 -0
@@ -55,6 +55,8 @@ The \fB-l --log\fP option write data to /var/tmp/tmon.log .PP The \fB-t --time-interval\fP option sets the polling interval in seconds .PP +The \fB-T --target-temp\fP option sets the initial target temperature +.PP The \fB-v --version\fP option shows the version of \fBtmon \fP .PP The \fB-z --zone\fP option sets the target therma zone instance to be controlled
tools/thermal/tmon/tmon.c +12 -2
@@ -64,6 +64,7 @@ void usage()printf (" -h, --help show this help message\n" );printf (" -l, --log log data to /var/tmp/tmon.log\n" );printf (" -t, --time-interval sampling time interval, > 1 sec.\n" ); +printf (" -T, --target-temp initial target temperature\n" );printf (" -v, --version show version\n" );printf (" -z, --zone target thermal zone id\n" );
@@ -219,6 +220,7 @@ static struct option opts[] = { { "control", 1, NULL, 'c' }, { "daemon", 0, NULL, 'd' }, { "time-interval", 1, NULL, 't' }, + { "target-temp", 1, NULL, 'T' }, { "log", 0, NULL, 'l' }, { "help", 0, NULL, 'h' }, { "version", 0, NULL, 'v' },
@@ -231,7 +233,7 @@ int main(int argc, char **argv) {int err =0 ;int id2 =0 , c; -double yk =0.0 ;/* controller output */ +double yk =0.0 , temp;/* controller output */ int target_tz_index;if (geteuid () !=0 ) {
@@ -239,7 +241,7 @@ int main(int argc, char **argv)exit (EXIT_FAILURE ); } -while ((c =getopt_long (argc, argv,"c:dlht:vgz:" , opts, &id2)) !=-1 ) { +while ((c =getopt_long (argc, argv,"c:dlht:T:vgz:" , opts, &id2)) !=-1 ) {switch (c) {case 'c' : no_control =0 ;
@@ -254,6 +256,14 @@ int main(int argc, char **argv)if (ticktime <1 ) ticktime =1 ;break ; +case 'T' : + temp =strtod (optarg,NULL ); +if (temp <0 ) { +fprintf (stderr,"error: temperature must be positive\n" ); +return 1 ; + } + target_temp_user = temp; +break ;case 'l' :printf ("Logging data to /var/tmp/tmon.log\n" ); logging =1 ;
Signature · 1 line
1.9.1
PATCH 2/8 tools/thermal: tmon: add min/max macros
In reply to Brian Norris--- tools/thermal/tmon/tui.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
tools/thermal/tmon/tui.c +12 -0
@@ -30,6 +30,18 @@#include "tmon.h" +#define min (x, y) ({ \ + typeof(x) _min1 = (x); \ + typeof(y) _min2 = (y); \ + (void) (&_min1 == &_min2); \ + _min1 < _min2 ? _min1 : _min2; }) + +#define max (x, y) ({ \ + typeof(x) _max1 = (x); \ + typeof(y) _max2 = (y); \ + (void) (&_max1 == &_max2); \ + _max1 > _max2 ? _max1 : _max2; }) +static PANEL *data_panel;static PANEL *dialogue_panel;static PANEL *top;
Signature · 1 line
1.9.1
PATCH 3/8 tools/thermal: tmon: tui: don't hard-code dialog window size assumptions
In reply to Brian NorrisWe can use the ncurses API to get the number of rows.
--- tools/thermal/tmon/tui.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/thermal/tmon/tui.c +5 -4
@@ -274,11 +274,14 @@ const char DIAG_TITLE[] = "[ TUNABLES ]";void show_dialogue (void ) {int j, x =0 , y =0 ; +int rows, cols;WINDOW *w = dialogue_window;if (tui_disabled || !w)return ; +getmaxyx (w, rows, cols); +werase (w);box (w,0 ,0 );mvwprintw (w,0 , maxx/4 ,DIAG_TITLE );
@@ -297,10 +300,8 @@ void show_dialogue(void)wattron (w,A_BOLD );mvwprintw (w,DIAG_DEV_ROWS +1 ,1 ,"Enter Choice [A-Z]?" );wattroff (w,A_BOLD ); -/* y size of dialogue win is nr cdev + 5, so print legend -* at the bottom line -*/ -mvwprintw (w, ptdata.nr_cooling_dev+3 ,1 , +/* print legend at the bottom line */ +mvwprintw (w, rows -2 ,1 ,"Legend: A=Active, P=Passive, C=Critical" );wrefresh (dialogue_window);
Signature · 1 line
1.9.1
PATCH 4/8 tools/thermal: tmon: fixup tui windowing calculations
In reply to Brian NorrisThe number of rows in the dialog vary according to the number of cooling devices. However, some of the windowing computations were assuming a fixed number of rows. This computation is OK when we have between 4 and 9 cooling devices (and they wrap to the next column), but with fewer devices, we end up printing off the end of the window.
This unifies the row computation into a single function and uses that throughout the TUI code. This also accounts for increasing the number of rows when there are more than 9 total cooling devices.
--- tools/thermal/tmon/tui.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
tools/thermal/tmon/tui.c +16 -5
@@ -110,6 +110,18 @@ void write_status_bar(int x, char *line)wrefresh (status_bar_window); } +/* wrap at 5 */ +#define DIAG_DEV_ROWS 5 +/* +* list cooling devices + "set temp" entry; wraps after 5 rows, if they fit +*/ +static int diag_dev_rows (void ) +{ +int entries = ptdata.nr_cooling_dev +1 ; +int rows =max (DIAG_DEV_ROWS , (entries +1 ) /2 ); +return min (rows, entries); +} +void setup_windows (void ) {int y_begin =1 ;
@@ -134,7 +146,7 @@ void setup_windows(void)* dialogue window is a pop-up, when needed it lays on top of cdev win */ - dialogue_window =subwin (stdscr, ptdata.nr_cooling_dev+5 , maxx-50 , + dialogue_window =subwin (stdscr,diag_dev_rows () +5 , maxx-50 ,DIAG_Y ,DIAG_X ); thermal_data_window = subwin(stdscr, ptdata.nr_tz_sensor *
@@ -270,7 +282,6 @@ void show_cooling_device(void) }const char DIAG_TITLE [] ="[ TUNABLES ]" ; -#define DIAG_DEV_ROWS 5void show_dialogue (void ) {int j, x =0 , y =0 ;
@@ -287,7 +298,7 @@ void show_dialogue(void)mvwprintw (w,0 , maxx/4 ,DIAG_TITLE );/* list all the available tunables */ for (j =0 ; j <= ptdata.nr_cooling_dev; j++) { - y = j %DIAG_DEV_ROWS ; + y = j %diag_dev_rows ();if (y ==0 && j !=0 ) x +=20 ;if (j == ptdata.nr_cooling_dev)
@@ -298,7 +309,7 @@ void show_dialogue(void) ptdata.cdi[j].type, ptdata.cdi[j].instance); }wattron (w,A_BOLD ); -mvwprintw (w,DIAG_DEV_ROWS +1 ,1 ,"Enter Choice [A-Z]?" ); +mvwprintw (w,diag_dev_rows ()+1 ,1 ,"Enter Choice [A-Z]?" );wattroff (w,A_BOLD );/* print legend at the bottom line */ mvwprintw(w, rows - 2, 1,
@@ -450,7 +461,7 @@ static void handle_input_choice(int ch)snprintf (buf,sizeof (buf),"New Value for %.10s-%2d: " , ptdata.cdi[cdev_id].type, ptdata.cdi[cdev_id].instance); -write_dialogue_win (buf,DIAG_DEV_ROWS +2 ,2 ); +write_dialogue_win (buf,diag_dev_rows () +2 ,2 );handle_input_val (cdev_id); }else {snprintf (buf,sizeof (buf),"Invalid selection %d" , ch);
Signature · 1 line
1.9.1
PATCH 5/8 tools/thermal: tmon: add .gitignore
In reply to Brian Norris--- tools/thermal/tmon/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 tools/thermal/tmon/.gitignore
tools/thermal/tmon/.gitignore new file +1 -0
@@ -0,0 +1 @@ +/tmon
Signature · 1 line
1.9.1
PATCH 6/8 tools/thermal: tmon: support cross-compiling
In reply to Brian NorrisWe might want to prepare CFLAGS outside of this Makefile, so don't overwrite its initial value.
Then, support $(CROSS_COMPILE), so we can use a cross-compile toolchain.
--- tools/thermal/tmon/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/thermal/tmon/Makefile +2 -2
@@ -2,8 +2,8 @@ VERSION = 1.0 BINDIR=usr/bin WARNFLAGS=-Wall -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int -CFLAGS= -O1 ${WARNFLAGS} -fstack-protector -CC=gcc +CFLAGS+= -O1 ${WARNFLAGS} -fstack-protector +CC=$(CROSS_COMPILE)gcc CFLAGS+=-D VERSION=\"$(VERSION)\" LDFLAGS+=
Signature · 1 line
1.9.1
PATCH 7/8 tools/thermal: tmon: use pkg-config to determine library dependencies
In reply to Brian NorrisSome distros (e.g., Arch Linux) don't package the tinfo library separately from ncurses, so don't unconditionally include it. Instead, use pkg-config.
The $(STATIC) ugliness is to handle the reported build case from commit 6b533269fb25 ("tools/thermal: tmon: fix compilation errors when building statically"), where a developer wants to be able to build with:
make LDFLAGS=-static
which requires an additional pkg-config flag.
Finally, support a lowest common denominator fallback (-lpanel -lncurses) for build systems that don't have pkg-config entries for ncurses.
--- tools/thermal/tmon/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
tools/thermal/tmon/Makefile +10 -1
@@ -16,12 +16,21 @@ INSTALL_CONFIGFILE=install -m 644 -p CONFIG_FILE= CONFIG_PATH= +# Static builds might require -ltinfo, for instance +ifneq ($(findstring -static, $(LDFLAGS)),) +STATIC := --static +endif + +TMON_LIBS=-lm -lpthread +TMON_LIBS += $(shell pkg-config --libs $(STATIC) panelw ncursesw 2> /dev/null || \ + pkg-config --libs $(STATIC) panel ncurses 2> /dev/null || \ + echo -lpanel -lncurses) OBJS = tmon.o tui.o sysfs.o pid.o OBJS += tmon: $(OBJS) Makefile tmon.h - $(CC) ${CFLAGS} $(LDFLAGS) $(OBJS) -o $(TARGET) -lm -lpanel -lncursesw -ltinfo -lpthread + $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $(TARGET) $(TMON_LIBS) valgrind: tmon sudo valgrind -v --track-origins=yes --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes ./$(TARGET) 1> /dev/null
Signature · 1 line
1.9.1
PATCH 8/8 tools/thermal: tmon: silence 'set but not used' warnings
In reply to Brian Norrisgcc complains about the 'cols' variable being unused. This is unavoidable, given the ncurses getmaxyx() macro-based API, which wants to assign to a variable directly, even when we're not going to use it.
Warning:
gcc -O1 -Wall -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int -fstack-protector -D VERSION=\"1.0\" -c -o tui.o tui.c
tui.c: In function ‘show_dialogue’:
tui.c:288:12: warning: variable ‘cols’ set but not used [-Wunused-but-set-variable]
int rows, cols;
^
So, add a hack to get rid of that warning.
---
This patch is ugly and of little value IMO, but it does squash the warning. Take it or leave it.
tools/thermal/tmon/tui.c | 3 +++ 1 file changed, 3 insertions(+)
tools/thermal/tmon/tui.c +3 -0
@@ -293,6 +293,9 @@ void show_dialogue(void)getmaxyx (w, rows, cols); +/* Silence compiler 'unused' warnings */ + (void )cols; +werase (w);box (w,0 ,0 );mvwprintw (w,0 , maxx/4 ,DIAG_TITLE );
Signature · 1 line
1.9.1
Quoted 9 lines · On Tue, 17 Feb 2015 18:18:28 -0800 Brian Norris <[email protected]>…
Hi,
This patch set includes a few build system improvements and a few UI fixes.
The last patch is ugly, and personally, I don't care if it's included. But it's an attempt to kill a warning. Better suggestions are welcome.
Good improvements.
Quoted 26 lines
Thanks,
BrianBrian Norris (8):
tools/thermal: tmon: add --target-temp parametertools/thermal: tmon: add min/max macros
tools/thermal: tmon: tui: don't hard-code dialog window size
assumptions
tools/thermal: tmon: fixup tui windowing calculationstools/thermal: tmon: add .gitignore
tools/thermal: tmon: support cross-compilingtools/thermal: tmon: use pkg-config to determine library
dependenciestools/thermal: tmon: silence 'set but not used' warningstools/thermal/tmon/.gitignore | 1 + tools/thermal/tmon/Makefile | 15 ++++++++++++--- tools/thermal/tmon/tmon.8 | 2 ++ tools/thermal/tmon/tmon.c | 14 ++++++++++++-- tools/thermal/tmon/tui.c | 45++++++++++++++++++++++++++++++++++--------- 5 files changed, 63 insertions(+), 14 deletions(-) create mode 100644
tools/thermal/tmon/.gitignoreSignature · 1 line
1.9.1
Signature · 1 line
Jacob Pan
Quoted 6 lines · Brian Norris
Hi,
This patch set includes a few build system improvements and a few UI fixes.
The last patch is ugly, and personally, I don't care if it's included. But it's an attempt to kill a warning. Better suggestions are welcome.
FWIW:
Quoted 23 lines
Thanks,
BrianBrian Norris (8):
tools/thermal: tmon: add --target-temp parametertools/thermal: tmon: add min/max macros
tools/thermal: tmon: tui: don't hard-code dialog window size
assumptions
tools/thermal: tmon: fixup tui windowing calculationstools/thermal: tmon: add .gitignore
tools/thermal: tmon: support cross-compilingtools/thermal: tmon: use pkg-config to determine library dependenciestools/thermal: tmon: silence 'set but not used' warningstools/thermal/tmon/.gitignore | 1 + tools/thermal/tmon/Makefile | 15 ++++++++++++--- tools/thermal/tmon/tmon.8 | 2 ++ tools/thermal/tmon/tmon.c | 14 ++++++++++++-- tools/thermal/tmon/tui.c | 45 ++++++++++++++++++++++++++++++++++--------- 5 files changed, 63 insertions(+), 14 deletions(-) create mode 100644 tools/thermal/tmon/.gitignore
Signature · 1 line
Florian