sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

powertop: fix segfault in dump mode 

The cause is: in dump mode, setup_windows() is not invoked so the
*_window variables, like cstate_window, are still NULL; later in
main() -> show_cstates(), the functions, like wrefresh(), will trigger
segfault.

After discussing in PowerTop mailling list, I think the right solution is
we should stub out the ncurses calls in dump mode.

(The patch was also sent to upstream PowerTop mailling list.)

This fixes [BUGID #195]:
Bug 195 - [sdk] powertop segfault when running with dump option

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
This commit is contained in:
Dexuan Cui 2010-08-27 21:02:34 +08:00 committed by Richard Purdie
parent f2011318ec
commit 6c098ebe42
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch Normal file
View File

@ -0,0 +1,31 @@
Running PowerTop in Poky in dump mode (with --dump) always ends with a
segmentation fault.
The cause is: in dump mode, setup_windows() is not invoked so the
*_window variables, like cstate_window, are still NULL; later in
main() -> show_cstates(), the functions, like wrefresh(), will trigger
segfault.
After discussing in PowerTop mailling list, I think the right solution is
we should stub out the ncurses calls in dump mode.
(The patch was also sent to upstream PowerTop mailling list.)
Signed-off-by Dexuan Cui <dexuan.cui@intel.com>, 2010-08-20
(this patch is licensed under GPLv2)
--- a/display.c
+++ b/display.c
@@ -44,6 +44,12 @@
static WINDOW *status_bar_window;
#define print(win, y, x, fmt, args...) do { if (dump) printf(fmt, ## args); else mvwprintw(win, y, x, fmt, ## args); } while (0)
+#define wattrset(win, c) do { if (!dump ) wattrset(win, c); } while (0)
+#define wbkgd(win, c) do { if (!dump ) wbkgd(win, c); } while (0)
+#define werase(win) do { if (!dump ) werase(win); } while (0)
+#define wrefresh(win) do { if (!dump ) wrefresh(win); } while (0)
+#define wattron(win, a) do { if (!dump ) wattron(win, a); } while (0)
+#define wattroff(win, a) do { if (!dump ) wattroff(win, a); } while (0)
char status_bar_slots[10][40];

3
meta/recipes-kernel/powertop/powertop_1.13.bb
View File

@ -12,7 +12,8 @@ REPENDS_${PN} = "pciutils"
PR = "r0"
SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz"
SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
file://stub_out_the_ncurses_calls_in_dump_mode.patch"
CFLAGS += "${LDFLAGS}"
EXTRA_OEMAKE = "VERSION=\"${PV}\""