Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits) perf: Add back list_head data types perf ui hist browser: Fixup key bindings perf ui browser: Add ui_browser__show counterpart: __hide perf annotate: Cycle thru sorted lines with samples perf ui: Make SPACE work as PGDN in all browsers perf annotate: Sort by hottest lines in the TUI perf ui: Complete the breakdown of util/newt.c perf ui: Move hists browser to util/ui/browsers/ perf symbols: Ignore mapping symbols on ARM perf ui: Move map browser to util/ui/browsers/ perf ui: Move annotate browser to util/ui/browsers/ perf ui: Move ui_progress routines to separate file in util/ui/ perf ui: Move ui_helpline routines to separate file in util/ui/ perf ui: Shorten ui_browser member names perf, x86: P4 PMU -- update nmi irq statistics and unmask lvt entry properly perf ui: Start breaking down newt.c into multiple files perf tui: Introduce list_head based generic ui_browser refresh routine perf probe: Fix memory leaks in add_perf_probe_events perf probe: Fix to copy the type for raw parameters perf report: Speed up exit path ...tirimbino
Linus Torvalds
15 years ago
commit
4b17cafaa4
@ -0,0 +1,329 @@ |
||||
#define _GNU_SOURCE |
||||
#include <stdio.h> |
||||
#undef _GNU_SOURCE |
||||
/*
|
||||
* slang versions <= 2.0.6 have a "#if HAVE_LONG_LONG" that breaks |
||||
* the build if it isn't defined. Use the equivalent one that glibc |
||||
* has on features.h. |
||||
*/ |
||||
#include <features.h> |
||||
#ifndef HAVE_LONG_LONG |
||||
#define HAVE_LONG_LONG __GLIBC_HAVE_LONG_LONG |
||||
#endif |
||||
#include <slang.h> |
||||
#include <linux/list.h> |
||||
#include <linux/rbtree.h> |
||||
#include <stdlib.h> |
||||
#include <sys/ttydefaults.h> |
||||
#include "browser.h" |
||||
#include "helpline.h" |
||||
#include "../color.h" |
||||
#include "../util.h" |
||||
|
||||
#if SLANG_VERSION < 20104 |
||||
#define sltt_set_color(obj, name, fg, bg) \ |
||||
SLtt_set_color(obj,(char *)name, (char *)fg, (char *)bg) |
||||
#else |
||||
#define sltt_set_color SLtt_set_color |
||||
#endif |
||||
|
||||
newtComponent newt_form__new(void); |
||||
|
||||
int ui_browser__percent_color(double percent, bool current) |
||||
{ |
||||
if (current) |
||||
return HE_COLORSET_SELECTED; |
||||
if (percent >= MIN_RED) |
||||
return HE_COLORSET_TOP; |
||||
if (percent >= MIN_GREEN) |
||||
return HE_COLORSET_MEDIUM; |
||||
return HE_COLORSET_NORMAL; |
||||
} |
||||
|
||||
void ui_browser__list_head_seek(struct ui_browser *self, off_t offset, int whence) |
||||
{ |
||||
struct list_head *head = self->entries; |
||||
struct list_head *pos; |
||||
|
||||
switch (whence) { |
||||
case SEEK_SET: |
||||
pos = head->next; |
||||
break; |
||||
case SEEK_CUR: |
||||
pos = self->top; |
||||
break; |
||||
case SEEK_END: |
||||
pos = head->prev; |
||||
break; |
||||
default: |
||||
return; |
||||
} |
||||
|
||||
if (offset > 0) { |
||||
while (offset-- != 0) |
||||
pos = pos->next; |
||||
} else { |
||||
while (offset++ != 0) |
||||
pos = pos->prev; |
||||
} |
||||
|
||||
self->top = pos; |
||||
} |
||||
|
||||
void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence) |
||||
{ |
||||
struct rb_root *root = self->entries; |
||||
struct rb_node *nd; |
||||
|
||||
switch (whence) { |
||||
case SEEK_SET: |
||||
nd = rb_first(root); |
||||
break; |
||||
case SEEK_CUR: |
||||
nd = self->top; |
||||
break; |
||||
case SEEK_END: |
||||
nd = rb_last(root); |
||||
break; |
||||
default: |
||||
return; |
||||
} |
||||
|
||||
if (offset > 0) { |
||||
while (offset-- != 0) |
||||
nd = rb_next(nd); |
||||
} else { |
||||
while (offset++ != 0) |
||||
nd = rb_prev(nd); |
||||
} |
||||
|
||||
self->top = nd; |
||||
} |
||||
|
||||
unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self) |
||||
{ |
||||
struct rb_node *nd; |
||||
int row = 0; |
||||
|
||||
if (self->top == NULL) |
||||
self->top = rb_first(self->entries); |
||||
|
||||
nd = self->top; |
||||
|
||||
while (nd != NULL) { |
||||
SLsmg_gotorc(self->y + row, self->x); |
||||
self->write(self, nd, row); |
||||
if (++row == self->height) |
||||
break; |
||||
nd = rb_next(nd); |
||||
} |
||||
|
||||
return row; |
||||
} |
||||
|
||||
bool ui_browser__is_current_entry(struct ui_browser *self, unsigned row) |
||||
{ |
||||
return self->top_idx + row == self->index; |
||||
} |
||||
|
||||
void ui_browser__refresh_dimensions(struct ui_browser *self) |
||||
{ |
||||
int cols, rows; |
||||
newtGetScreenSize(&cols, &rows); |
||||
|
||||
if (self->width > cols - 4) |
||||
self->width = cols - 4; |
||||
self->height = rows - 5; |
||||
if (self->height > self->nr_entries) |
||||
self->height = self->nr_entries; |
||||
self->y = (rows - self->height) / 2; |
||||
self->x = (cols - self->width) / 2; |
||||
} |
||||
|
||||
void ui_browser__reset_index(struct ui_browser *self) |
||||
{ |
||||
self->index = self->top_idx = 0; |
||||
self->seek(self, 0, SEEK_SET); |
||||
} |
||||
|
||||
int ui_browser__show(struct ui_browser *self, const char *title, |
||||
const char *helpline, ...) |
||||
{ |
||||
va_list ap; |
||||
|
||||
if (self->form != NULL) { |
||||
newtFormDestroy(self->form); |
||||
newtPopWindow(); |
||||
} |
||||
ui_browser__refresh_dimensions(self); |
||||
newtCenteredWindow(self->width, self->height, title); |
||||
self->form = newt_form__new(); |
||||
if (self->form == NULL) |
||||
return -1; |
||||
|
||||
self->sb = newtVerticalScrollbar(self->width, 0, self->height, |
||||
HE_COLORSET_NORMAL, |
||||
HE_COLORSET_SELECTED); |
||||
if (self->sb == NULL) |
||||
return -1; |
||||
|
||||
newtFormAddHotKey(self->form, NEWT_KEY_UP); |
||||
newtFormAddHotKey(self->form, NEWT_KEY_DOWN); |
||||
newtFormAddHotKey(self->form, NEWT_KEY_PGUP); |
||||
newtFormAddHotKey(self->form, NEWT_KEY_PGDN); |
||||
newtFormAddHotKey(self->form, NEWT_KEY_HOME); |
||||
newtFormAddHotKey(self->form, NEWT_KEY_END); |
||||
newtFormAddHotKey(self->form, ' '); |
||||
newtFormAddComponent(self->form, self->sb); |
||||
|
||||
va_start(ap, helpline); |
||||
ui_helpline__vpush(helpline, ap); |
||||
va_end(ap); |
||||
return 0; |
||||
} |
||||
|
||||
void ui_browser__hide(struct ui_browser *self) |
||||
{ |
||||
newtFormDestroy(self->form); |
||||
newtPopWindow(); |
||||
self->form = NULL; |
||||
ui_helpline__pop(); |
||||
} |
||||
|
||||
int ui_browser__refresh(struct ui_browser *self) |
||||
{ |
||||
int row; |
||||
|
||||
newtScrollbarSet(self->sb, self->index, self->nr_entries - 1); |
||||
row = self->refresh(self); |
||||
SLsmg_set_color(HE_COLORSET_NORMAL); |
||||
SLsmg_fill_region(self->y + row, self->x, |
||||
self->height - row, self->width, ' '); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int ui_browser__run(struct ui_browser *self, struct newtExitStruct *es) |
||||
{ |
||||
if (ui_browser__refresh(self) < 0) |
||||
return -1; |
||||
|
||||
while (1) { |
||||
off_t offset; |
||||
|
||||
newtFormRun(self->form, es); |
||||
|
||||
if (es->reason != NEWT_EXIT_HOTKEY) |
||||
break; |
||||
if (is_exit_key(es->u.key)) |
||||
return es->u.key; |
||||
switch (es->u.key) { |
||||
case NEWT_KEY_DOWN: |
||||
if (self->index == self->nr_entries - 1) |
||||
break; |
||||
++self->index; |
||||
if (self->index == self->top_idx + self->height) { |
||||
++self->top_idx; |
||||
self->seek(self, +1, SEEK_CUR); |
||||
} |
||||
break; |
||||
case NEWT_KEY_UP: |
||||
if (self->index == 0) |
||||
break; |
||||
--self->index; |
||||
if (self->index < self->top_idx) { |
||||
--self->top_idx; |
||||
self->seek(self, -1, SEEK_CUR); |
||||
} |
||||
break; |
||||
case NEWT_KEY_PGDN: |
||||
case ' ': |
||||
if (self->top_idx + self->height > self->nr_entries - 1) |
||||
break; |
||||
|
||||
offset = self->height; |
||||
if (self->index + offset > self->nr_entries - 1) |
||||
offset = self->nr_entries - 1 - self->index; |
||||
self->index += offset; |
||||
self->top_idx += offset; |
||||
self->seek(self, +offset, SEEK_CUR); |
||||
break; |
||||
case NEWT_KEY_PGUP: |
||||
if (self->top_idx == 0) |
||||
break; |
||||
|
||||
if (self->top_idx < self->height) |
||||
offset = self->top_idx; |
||||
else |
||||
offset = self->height; |
||||
|
||||
self->index -= offset; |
||||
self->top_idx -= offset; |
||||
self->seek(self, -offset, SEEK_CUR); |
||||
break; |
||||
case NEWT_KEY_HOME: |
||||
ui_browser__reset_index(self); |
||||
break; |
||||
case NEWT_KEY_END: |
||||
offset = self->height - 1; |
||||
if (offset >= self->nr_entries) |
||||
offset = self->nr_entries - 1; |
||||
|
||||
self->index = self->nr_entries - 1; |
||||
self->top_idx = self->index - offset; |
||||
self->seek(self, -offset, SEEK_END); |
||||
break; |
||||
default: |
||||
return es->u.key; |
||||
} |
||||
if (ui_browser__refresh(self) < 0) |
||||
return -1; |
||||
} |
||||
return 0; |
||||
} |
||||
|
||||
unsigned int ui_browser__list_head_refresh(struct ui_browser *self) |
||||
{ |
||||
struct list_head *pos; |
||||
struct list_head *head = self->entries; |
||||
int row = 0; |
||||
|
||||
if (self->top == NULL || self->top == self->entries) |
||||
self->top = head->next; |
||||
|
||||
pos = self->top; |
||||
|
||||
list_for_each_from(pos, head) { |
||||
SLsmg_gotorc(self->y + row, self->x); |
||||
self->write(self, pos, row); |
||||
if (++row == self->height) |
||||
break; |
||||
} |
||||
|
||||
return row; |
||||
} |
||||
|
||||
static struct newtPercentTreeColors { |
||||
const char *topColorFg, *topColorBg; |
||||
const char *mediumColorFg, *mediumColorBg; |
||||
const char *normalColorFg, *normalColorBg; |
||||
const char *selColorFg, *selColorBg; |
||||
const char *codeColorFg, *codeColorBg; |
||||
} defaultPercentTreeColors = { |
||||
"red", "lightgray", |
||||
"green", "lightgray", |
||||
"black", "lightgray", |
||||
"lightgray", "magenta", |
||||
"blue", "lightgray", |
||||
}; |
||||
|
||||
void ui_browser__init(void) |
||||
{ |
||||
struct newtPercentTreeColors *c = &defaultPercentTreeColors; |
||||
|
||||
sltt_set_color(HE_COLORSET_TOP, NULL, c->topColorFg, c->topColorBg); |
||||
sltt_set_color(HE_COLORSET_MEDIUM, NULL, c->mediumColorFg, c->mediumColorBg); |
||||
sltt_set_color(HE_COLORSET_NORMAL, NULL, c->normalColorFg, c->normalColorBg); |
||||
sltt_set_color(HE_COLORSET_SELECTED, NULL, c->selColorFg, c->selColorBg); |
||||
sltt_set_color(HE_COLORSET_CODE, NULL, c->codeColorFg, c->codeColorBg); |
||||
} |
||||
@ -0,0 +1,46 @@ |
||||
#ifndef _PERF_UI_BROWSER_H_ |
||||
#define _PERF_UI_BROWSER_H_ 1 |
||||
|
||||
#include <stdbool.h> |
||||
#include <newt.h> |
||||
#include <sys/types.h> |
||||
#include "../types.h" |
||||
|
||||
#define HE_COLORSET_TOP 50 |
||||
#define HE_COLORSET_MEDIUM 51 |
||||
#define HE_COLORSET_NORMAL 52 |
||||
#define HE_COLORSET_SELECTED 53 |
||||
#define HE_COLORSET_CODE 54 |
||||
|
||||
struct ui_browser { |
||||
newtComponent form, sb; |
||||
u64 index, top_idx; |
||||
void *top, *entries; |
||||
u16 y, x, width, height; |
||||
void *priv; |
||||
unsigned int (*refresh)(struct ui_browser *self); |
||||
void (*write)(struct ui_browser *self, void *entry, int row); |
||||
void (*seek)(struct ui_browser *self, off_t offset, int whence); |
||||
u32 nr_entries; |
||||
}; |
||||
|
||||
|
||||
int ui_browser__percent_color(double percent, bool current); |
||||
bool ui_browser__is_current_entry(struct ui_browser *self, unsigned row); |
||||
void ui_browser__refresh_dimensions(struct ui_browser *self); |
||||
void ui_browser__reset_index(struct ui_browser *self); |
||||
|
||||
int ui_browser__show(struct ui_browser *self, const char *title, |
||||
const char *helpline, ...); |
||||
void ui_browser__hide(struct ui_browser *self); |
||||
int ui_browser__refresh(struct ui_browser *self); |
||||
int ui_browser__run(struct ui_browser *self, struct newtExitStruct *es); |
||||
|
||||
void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence); |
||||
unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self); |
||||
|
||||
void ui_browser__list_head_seek(struct ui_browser *self, off_t offset, int whence); |
||||
unsigned int ui_browser__list_head_refresh(struct ui_browser *self); |
||||
|
||||
void ui_browser__init(void); |
||||
#endif /* _PERF_UI_BROWSER_H_ */ |
||||
@ -0,0 +1,240 @@ |
||||
#include "../browser.h" |
||||
#include "../helpline.h" |
||||
#include "../libslang.h" |
||||
#include "../../hist.h" |
||||
#include "../../sort.h" |
||||
#include "../../symbol.h" |
||||
|
||||
static void ui__error_window(const char *fmt, ...) |
||||
{ |
||||
va_list ap; |
||||
|
||||
va_start(ap, fmt); |
||||
newtWinMessagev((char *)"Error", (char *)"Ok", (char *)fmt, ap); |
||||
va_end(ap); |
||||
} |
||||
|
||||
struct annotate_browser { |
||||
struct ui_browser b; |
||||
struct rb_root entries; |
||||
struct rb_node *curr_hot; |
||||
}; |
||||
|
||||
struct objdump_line_rb_node { |
||||
struct rb_node rb_node; |
||||
double percent; |
||||
u32 idx; |
||||
}; |
||||
|
||||
static inline |
||||
struct objdump_line_rb_node *objdump_line__rb(struct objdump_line *self) |
||||
{ |
||||
return (struct objdump_line_rb_node *)(self + 1); |
||||
} |
||||
|
||||
static void annotate_browser__write(struct ui_browser *self, void *entry, int row) |
||||
{ |
||||
struct objdump_line *ol = rb_entry(entry, struct objdump_line, node); |
||||
bool current_entry = ui_browser__is_current_entry(self, row); |
||||
int width = self->width; |
||||
|
||||
if (ol->offset != -1) { |
||||
struct objdump_line_rb_node *olrb = objdump_line__rb(ol); |
||||
int color = ui_browser__percent_color(olrb->percent, current_entry); |
||||
SLsmg_set_color(color); |
||||
slsmg_printf(" %7.2f ", olrb->percent); |
||||
if (!current_entry) |
||||
SLsmg_set_color(HE_COLORSET_CODE); |
||||
} else { |
||||
int color = ui_browser__percent_color(0, current_entry); |
||||
SLsmg_set_color(color); |
||||
slsmg_write_nstring(" ", 9); |
||||
} |
||||
|
||||
SLsmg_write_char(':'); |
||||
slsmg_write_nstring(" ", 8); |
||||
if (!*ol->line) |
||||
slsmg_write_nstring(" ", width - 18); |
||||
else |
||||
slsmg_write_nstring(ol->line, width - 18); |
||||
} |
||||
|
||||
static double objdump_line__calc_percent(struct objdump_line *self, |
||||
struct list_head *head, |
||||
struct symbol *sym) |
||||
{ |
||||
double percent = 0.0; |
||||
|
||||
if (self->offset != -1) { |
||||
int len = sym->end - sym->start; |
||||
unsigned int hits = 0; |
||||
struct sym_priv *priv = symbol__priv(sym); |
||||
struct sym_ext *sym_ext = priv->ext; |
||||
struct sym_hist *h = priv->hist; |
||||
s64 offset = self->offset; |
||||
struct objdump_line *next = objdump__get_next_ip_line(head, self); |
||||
|
||||
|
||||
while (offset < (s64)len && |
||||
(next == NULL || offset < next->offset)) { |
||||
if (sym_ext) { |
||||
percent += sym_ext[offset].percent; |
||||
} else |
||||
hits += h->ip[offset]; |
||||
|
||||
++offset; |
||||
} |
||||
|
||||
if (sym_ext == NULL && h->sum) |
||||
percent = 100.0 * hits / h->sum; |
||||
} |
||||
|
||||
return percent; |
||||
} |
||||
|
||||
static void objdump__insert_line(struct rb_root *self, |
||||
struct objdump_line_rb_node *line) |
||||
{ |
||||
struct rb_node **p = &self->rb_node; |
||||
struct rb_node *parent = NULL; |
||||
struct objdump_line_rb_node *l; |
||||
|
||||
while (*p != NULL) { |
||||
parent = *p; |
||||
l = rb_entry(parent, struct objdump_line_rb_node, rb_node); |
||||
if (line->percent < l->percent) |
||||
p = &(*p)->rb_left; |
||||
else |
||||
p = &(*p)->rb_right; |
||||
} |
||||
rb_link_node(&line->rb_node, parent, p); |
||||
rb_insert_color(&line->rb_node, self); |
||||
} |
||||
|
||||
static void annotate_browser__set_top(struct annotate_browser *self, |
||||
struct rb_node *nd) |
||||
{ |
||||
struct objdump_line_rb_node *rbpos; |
||||
struct objdump_line *pos; |
||||
unsigned back; |
||||
|
||||
ui_browser__refresh_dimensions(&self->b); |
||||
back = self->b.height / 2; |
||||
rbpos = rb_entry(nd, struct objdump_line_rb_node, rb_node); |
||||
pos = ((struct objdump_line *)rbpos) - 1; |
||||
self->b.top_idx = self->b.index = rbpos->idx; |
||||
|
||||
while (self->b.top_idx != 0 && back != 0) { |
||||
pos = list_entry(pos->node.prev, struct objdump_line, node); |
||||
|
||||
--self->b.top_idx; |
||||
--back; |
||||
} |
||||
|
||||
self->b.top = pos; |
||||
self->curr_hot = nd; |
||||
} |
||||
|
||||
static int annotate_browser__run(struct annotate_browser *self, |
||||
struct newtExitStruct *es) |
||||
{ |
||||
struct rb_node *nd; |
||||
struct hist_entry *he = self->b.priv; |
||||
|
||||
if (ui_browser__show(&self->b, he->ms.sym->name, |
||||
"<- or ESC: exit, TAB/shift+TAB: cycle thru samples") < 0) |
||||
return -1; |
||||
|
||||
newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT); |
||||
|
||||
nd = self->curr_hot; |
||||
if (nd) { |
||||
newtFormAddHotKey(self->b.form, NEWT_KEY_TAB); |
||||
newtFormAddHotKey(self->b.form, NEWT_KEY_UNTAB); |
||||
} |
||||
|
||||
while (1) { |
||||
ui_browser__run(&self->b, es); |
||||
|
||||
if (es->reason != NEWT_EXIT_HOTKEY) |
||||
break; |
||||
|
||||
switch (es->u.key) { |
||||
case NEWT_KEY_TAB: |
||||
nd = rb_prev(nd); |
||||
if (nd == NULL) |
||||
nd = rb_last(&self->entries); |
||||
annotate_browser__set_top(self, nd); |
||||
break; |
||||
case NEWT_KEY_UNTAB: |
||||
nd = rb_next(nd); |
||||
if (nd == NULL) |
||||
nd = rb_first(&self->entries); |
||||
annotate_browser__set_top(self, nd); |
||||
break; |
||||
default: |
||||
goto out; |
||||
} |
||||
} |
||||
out: |
||||
ui_browser__hide(&self->b); |
||||
return 0; |
||||
} |
||||
|
||||
int hist_entry__tui_annotate(struct hist_entry *self) |
||||
{ |
||||
struct newtExitStruct es; |
||||
struct objdump_line *pos, *n; |
||||
struct objdump_line_rb_node *rbpos; |
||||
LIST_HEAD(head); |
||||
struct annotate_browser browser = { |
||||
.b = { |
||||
.entries = &head, |
||||
.refresh = ui_browser__list_head_refresh, |
||||
.seek = ui_browser__list_head_seek, |
||||
.write = annotate_browser__write, |
||||
.priv = self, |
||||
}, |
||||
}; |
||||
int ret; |
||||
|
||||
if (self->ms.sym == NULL) |
||||
return -1; |
||||
|
||||
if (self->ms.map->dso->annotate_warned) |
||||
return -1; |
||||
|
||||
if (hist_entry__annotate(self, &head, sizeof(*rbpos)) < 0) { |
||||
ui__error_window(ui_helpline__last_msg); |
||||
return -1; |
||||
} |
||||
|
||||
ui_helpline__push("Press <- or ESC to exit"); |
||||
|
||||
list_for_each_entry(pos, &head, node) { |
||||
size_t line_len = strlen(pos->line); |
||||
if (browser.b.width < line_len) |
||||
browser.b.width = line_len; |
||||
rbpos = objdump_line__rb(pos); |
||||
rbpos->idx = browser.b.nr_entries++; |
||||
rbpos->percent = objdump_line__calc_percent(pos, &head, self->ms.sym); |
||||
if (rbpos->percent < 0.01) |
||||
continue; |
||||
objdump__insert_line(&browser.entries, rbpos); |
||||
} |
||||
|
||||
/*
|
||||
* Position the browser at the hottest line. |
||||
*/ |
||||
browser.curr_hot = rb_last(&browser.entries); |
||||
if (browser.curr_hot) |
||||
annotate_browser__set_top(&browser, browser.curr_hot); |
||||
|
||||
browser.b.width += 18; /* Percentage */ |
||||
ret = annotate_browser__run(&browser, &es); |
||||
list_for_each_entry_safe(pos, n, &head, node) { |
||||
list_del(&pos->node); |
||||
objdump_line__free(pos); |
||||
} |
||||
return ret; |
||||
} |
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,161 @@ |
||||
#include "../libslang.h" |
||||
#include <elf.h> |
||||
#include <newt.h> |
||||
#include <sys/ttydefaults.h> |
||||
#include <ctype.h> |
||||
#include <string.h> |
||||
#include <linux/bitops.h> |
||||
#include "../../debug.h" |
||||
#include "../../symbol.h" |
||||
#include "../browser.h" |
||||
#include "../helpline.h" |
||||
#include "map.h" |
||||
|
||||
static int ui_entry__read(const char *title, char *bf, size_t size, int width) |
||||
{ |
||||
struct newtExitStruct es; |
||||
newtComponent form, entry; |
||||
const char *result; |
||||
int err = -1; |
||||
|
||||
newtCenteredWindow(width, 1, title); |
||||
form = newtForm(NULL, NULL, 0); |
||||
if (form == NULL) |
||||
return -1; |
||||
|
||||
entry = newtEntry(0, 0, "0x", width, &result, NEWT_FLAG_SCROLL); |
||||
if (entry == NULL) |
||||
goto out_free_form; |
||||
|
||||
newtFormAddComponent(form, entry); |
||||
newtFormAddHotKey(form, NEWT_KEY_ENTER); |
||||
newtFormAddHotKey(form, NEWT_KEY_ESCAPE); |
||||
newtFormAddHotKey(form, NEWT_KEY_LEFT); |
||||
newtFormAddHotKey(form, CTRL('c')); |
||||
newtFormRun(form, &es); |
||||
|
||||
if (result != NULL) { |
||||
strncpy(bf, result, size); |
||||
err = 0; |
||||
} |
||||
out_free_form: |
||||
newtPopWindow(); |
||||
newtFormDestroy(form); |
||||
return 0; |
||||
} |
||||
|
||||
struct map_browser { |
||||
struct ui_browser b; |
||||
struct map *map; |
||||
u16 namelen; |
||||
u8 addrlen; |
||||
}; |
||||
|
||||
static void map_browser__write(struct ui_browser *self, void *nd, int row) |
||||
{ |
||||
struct symbol *sym = rb_entry(nd, struct symbol, rb_node); |
||||
struct map_browser *mb = container_of(self, struct map_browser, b); |
||||
bool current_entry = ui_browser__is_current_entry(self, row); |
||||
int color = ui_browser__percent_color(0, current_entry); |
||||
|
||||
SLsmg_set_color(color); |
||||
slsmg_printf("%*llx %*llx %c ", |
||||
mb->addrlen, sym->start, mb->addrlen, sym->end, |
||||
sym->binding == STB_GLOBAL ? 'g' : |
||||
sym->binding == STB_LOCAL ? 'l' : 'w'); |
||||
slsmg_write_nstring(sym->name, mb->namelen); |
||||
} |
||||
|
||||
/* FIXME uber-kludgy, see comment on cmd_report... */ |
||||
static u32 *symbol__browser_index(struct symbol *self) |
||||
{ |
||||
return ((void *)self) - sizeof(struct rb_node) - sizeof(u32); |
||||
} |
||||
|
||||
static int map_browser__search(struct map_browser *self) |
||||
{ |
||||
char target[512]; |
||||
struct symbol *sym; |
||||
int err = ui_entry__read("Search by name/addr", target, sizeof(target), 40); |
||||
|
||||
if (err) |
||||
return err; |
||||
|
||||
if (target[0] == '0' && tolower(target[1]) == 'x') { |
||||
u64 addr = strtoull(target, NULL, 16); |
||||
sym = map__find_symbol(self->map, addr, NULL); |
||||
} else |
||||
sym = map__find_symbol_by_name(self->map, target, NULL); |
||||
|
||||
if (sym != NULL) { |
||||
u32 *idx = symbol__browser_index(sym); |
||||
|
||||
self->b.top = &sym->rb_node; |
||||
self->b.index = self->b.top_idx = *idx; |
||||
} else |
||||
ui_helpline__fpush("%s not found!", target); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
static int map_browser__run(struct map_browser *self, struct newtExitStruct *es) |
||||
{ |
||||
if (ui_browser__show(&self->b, self->map->dso->long_name, |
||||
"Press <- or ESC to exit, %s / to search", |
||||
verbose ? "" : "restart with -v to use") < 0) |
||||
return -1; |
||||
|
||||
newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT); |
||||
newtFormAddHotKey(self->b.form, NEWT_KEY_ENTER); |
||||
if (verbose) |
||||
newtFormAddHotKey(self->b.form, '/'); |
||||
|
||||
while (1) { |
||||
ui_browser__run(&self->b, es); |
||||
|
||||
if (es->reason != NEWT_EXIT_HOTKEY) |
||||
break; |
||||
if (verbose && es->u.key == '/') |
||||
map_browser__search(self); |
||||
else |
||||
break; |
||||
} |
||||
|
||||
ui_browser__hide(&self->b); |
||||
return 0; |
||||
} |
||||
|
||||
int map__browse(struct map *self) |
||||
{ |
||||
struct map_browser mb = { |
||||
.b = { |
||||
.entries = &self->dso->symbols[self->type], |
||||
.refresh = ui_browser__rb_tree_refresh, |
||||
.seek = ui_browser__rb_tree_seek, |
||||
.write = map_browser__write, |
||||
}, |
||||
.map = self, |
||||
}; |
||||
struct newtExitStruct es; |
||||
struct rb_node *nd; |
||||
char tmp[BITS_PER_LONG / 4]; |
||||
u64 maxaddr = 0; |
||||
|
||||
for (nd = rb_first(mb.b.entries); nd; nd = rb_next(nd)) { |
||||
struct symbol *pos = rb_entry(nd, struct symbol, rb_node); |
||||
|
||||
if (mb.namelen < pos->namelen) |
||||
mb.namelen = pos->namelen; |
||||
if (maxaddr < pos->end) |
||||
maxaddr = pos->end; |
||||
if (verbose) { |
||||
u32 *idx = symbol__browser_index(pos); |
||||
*idx = mb.b.nr_entries; |
||||
} |
||||
++mb.b.nr_entries; |
||||
} |
||||
|
||||
mb.addrlen = snprintf(tmp, sizeof(tmp), "%llx", maxaddr); |
||||
mb.b.width += mb.addrlen * 2 + 4 + mb.namelen; |
||||
return map_browser__run(&mb, &es); |
||||
} |
||||
@ -0,0 +1,6 @@ |
||||
#ifndef _PERF_UI_MAP_BROWSER_H_ |
||||
#define _PERF_UI_MAP_BROWSER_H_ 1 |
||||
struct map; |
||||
|
||||
int map__browse(struct map *self); |
||||
#endif /* _PERF_UI_MAP_BROWSER_H_ */ |
||||
@ -0,0 +1,69 @@ |
||||
#define _GNU_SOURCE |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
#include <newt.h> |
||||
|
||||
#include "../debug.h" |
||||
#include "helpline.h" |
||||
|
||||
void ui_helpline__pop(void) |
||||
{ |
||||
newtPopHelpLine(); |
||||
} |
||||
|
||||
void ui_helpline__push(const char *msg) |
||||
{ |
||||
newtPushHelpLine(msg); |
||||
} |
||||
|
||||
void ui_helpline__vpush(const char *fmt, va_list ap) |
||||
{ |
||||
char *s; |
||||
|
||||
if (vasprintf(&s, fmt, ap) < 0) |
||||
vfprintf(stderr, fmt, ap); |
||||
else { |
||||
ui_helpline__push(s); |
||||
free(s); |
||||
} |
||||
} |
||||
|
||||
void ui_helpline__fpush(const char *fmt, ...) |
||||
{ |
||||
va_list ap; |
||||
|
||||
va_start(ap, fmt); |
||||
ui_helpline__vpush(fmt, ap); |
||||
va_end(ap); |
||||
} |
||||
|
||||
void ui_helpline__puts(const char *msg) |
||||
{ |
||||
ui_helpline__pop(); |
||||
ui_helpline__push(msg); |
||||
} |
||||
|
||||
void ui_helpline__init(void) |
||||
{ |
||||
ui_helpline__puts(" "); |
||||
} |
||||
|
||||
char ui_helpline__last_msg[1024]; |
||||
|
||||
int ui_helpline__show_help(const char *format, va_list ap) |
||||
{ |
||||
int ret; |
||||
static int backlog; |
||||
|
||||
ret = vsnprintf(ui_helpline__last_msg + backlog, |
||||
sizeof(ui_helpline__last_msg) - backlog, format, ap); |
||||
backlog += ret; |
||||
|
||||
if (ui_helpline__last_msg[backlog - 1] == '\n') { |
||||
ui_helpline__puts(ui_helpline__last_msg); |
||||
newtRefresh(); |
||||
backlog = 0; |
||||
} |
||||
|
||||
return ret; |
||||
} |
||||
@ -0,0 +1,11 @@ |
||||
#ifndef _PERF_UI_HELPLINE_H_ |
||||
#define _PERF_UI_HELPLINE_H_ 1 |
||||
|
||||
void ui_helpline__init(void); |
||||
void ui_helpline__pop(void); |
||||
void ui_helpline__push(const char *msg); |
||||
void ui_helpline__vpush(const char *fmt, va_list ap); |
||||
void ui_helpline__fpush(const char *fmt, ...); |
||||
void ui_helpline__puts(const char *msg); |
||||
|
||||
#endif /* _PERF_UI_HELPLINE_H_ */ |
||||
@ -0,0 +1,27 @@ |
||||
#ifndef _PERF_UI_SLANG_H_ |
||||
#define _PERF_UI_SLANG_H_ 1 |
||||
/*
|
||||
* slang versions <= 2.0.6 have a "#if HAVE_LONG_LONG" that breaks |
||||
* the build if it isn't defined. Use the equivalent one that glibc |
||||
* has on features.h. |
||||
*/ |
||||
#include <features.h> |
||||
#ifndef HAVE_LONG_LONG |
||||
#define HAVE_LONG_LONG __GLIBC_HAVE_LONG_LONG |
||||
#endif |
||||
#include <slang.h> |
||||
|
||||
#if SLANG_VERSION < 20104 |
||||
#define slsmg_printf(msg, args...) \ |
||||
SLsmg_printf((char *)msg, ##args) |
||||
#define slsmg_write_nstring(msg, len) \ |
||||
SLsmg_write_nstring((char *)msg, len) |
||||
#define sltt_set_color(obj, name, fg, bg) \ |
||||
SLtt_set_color(obj,(char *)name, (char *)fg, (char *)bg) |
||||
#else |
||||
#define slsmg_printf SLsmg_printf |
||||
#define slsmg_write_nstring SLsmg_write_nstring |
||||
#define sltt_set_color SLtt_set_color |
||||
#endif |
||||
|
||||
#endif /* _PERF_UI_SLANG_H_ */ |
||||
@ -0,0 +1,60 @@ |
||||
#include <stdlib.h> |
||||
#include <newt.h> |
||||
#include "../cache.h" |
||||
#include "progress.h" |
||||
|
||||
struct ui_progress { |
||||
newtComponent form, scale; |
||||
}; |
||||
|
||||
struct ui_progress *ui_progress__new(const char *title, u64 total) |
||||
{ |
||||
struct ui_progress *self = malloc(sizeof(*self)); |
||||
|
||||
if (self != NULL) { |
||||
int cols; |
||||
|
||||
if (use_browser <= 0) |
||||
return self; |
||||
newtGetScreenSize(&cols, NULL); |
||||
cols -= 4; |
||||
newtCenteredWindow(cols, 1, title); |
||||
self->form = newtForm(NULL, NULL, 0); |
||||
if (self->form == NULL) |
||||
goto out_free_self; |
||||
self->scale = newtScale(0, 0, cols, total); |
||||
if (self->scale == NULL) |
||||
goto out_free_form; |
||||
newtFormAddComponent(self->form, self->scale); |
||||
newtRefresh(); |
||||
} |
||||
|
||||
return self; |
||||
|
||||
out_free_form: |
||||
newtFormDestroy(self->form); |
||||
out_free_self: |
||||
free(self); |
||||
return NULL; |
||||
} |
||||
|
||||
void ui_progress__update(struct ui_progress *self, u64 curr) |
||||
{ |
||||
/*
|
||||
* FIXME: We should have a per UI backend way of showing progress, |
||||
* stdio will just show a percentage as NN%, etc. |
||||
*/ |
||||
if (use_browser <= 0) |
||||
return; |
||||
newtScaleSet(self->scale, curr); |
||||
newtRefresh(); |
||||
} |
||||
|
||||
void ui_progress__delete(struct ui_progress *self) |
||||
{ |
||||
if (use_browser > 0) { |
||||
newtFormDestroy(self->form); |
||||
newtPopWindow(); |
||||
} |
||||
free(self); |
||||
} |
||||
@ -0,0 +1,11 @@ |
||||
#ifndef _PERF_UI_PROGRESS_H_ |
||||
#define _PERF_UI_PROGRESS_H_ 1 |
||||
|
||||
struct ui_progress; |
||||
|
||||
struct ui_progress *ui_progress__new(const char *title, u64 total); |
||||
void ui_progress__delete(struct ui_progress *self); |
||||
|
||||
void ui_progress__update(struct ui_progress *self, u64 curr); |
||||
|
||||
#endif |
||||
@ -0,0 +1,42 @@ |
||||
#include <newt.h> |
||||
#include <signal.h> |
||||
#include <stdbool.h> |
||||
|
||||
#include "../cache.h" |
||||
#include "../debug.h" |
||||
#include "browser.h" |
||||
#include "helpline.h" |
||||
|
||||
static void newt_suspend(void *d __used) |
||||
{ |
||||
newtSuspend(); |
||||
raise(SIGTSTP); |
||||
newtResume(); |
||||
} |
||||
|
||||
void setup_browser(void) |
||||
{ |
||||
if (!isatty(1) || !use_browser || dump_trace) { |
||||
use_browser = 0; |
||||
setup_pager(); |
||||
return; |
||||
} |
||||
|
||||
use_browser = 1; |
||||
newtInit(); |
||||
newtCls(); |
||||
newtSetSuspendCallback(newt_suspend, NULL); |
||||
ui_helpline__init(); |
||||
ui_browser__init(); |
||||
} |
||||
|
||||
void exit_browser(bool wait_for_ok) |
||||
{ |
||||
if (use_browser > 0) { |
||||
if (wait_for_ok) { |
||||
char title[] = "Fatal Error", ok[] = "Ok"; |
||||
newtWinMessage(title, ok, ui_helpline__last_msg); |
||||
} |
||||
newtFinished(); |
||||
} |
||||
} |
||||
@ -0,0 +1,114 @@ |
||||
#include <newt.h> |
||||
#include <signal.h> |
||||
#include <stdio.h> |
||||
#include <stdbool.h> |
||||
#include <string.h> |
||||
#include <sys/ttydefaults.h> |
||||
|
||||
#include "../cache.h" |
||||
#include "../debug.h" |
||||
#include "browser.h" |
||||
#include "helpline.h" |
||||
#include "util.h" |
||||
|
||||
newtComponent newt_form__new(void); |
||||
|
||||
static void newt_form__set_exit_keys(newtComponent self) |
||||
{ |
||||
newtFormAddHotKey(self, NEWT_KEY_LEFT); |
||||
newtFormAddHotKey(self, NEWT_KEY_ESCAPE); |
||||
newtFormAddHotKey(self, 'Q'); |
||||
newtFormAddHotKey(self, 'q'); |
||||
newtFormAddHotKey(self, CTRL('c')); |
||||
} |
||||
|
||||
newtComponent newt_form__new(void) |
||||
{ |
||||
newtComponent self = newtForm(NULL, NULL, 0); |
||||
if (self) |
||||
newt_form__set_exit_keys(self); |
||||
return self; |
||||
} |
||||
|
||||
int ui__popup_menu(int argc, char * const argv[]) |
||||
{ |
||||
struct newtExitStruct es; |
||||
int i, rc = -1, max_len = 5; |
||||
newtComponent listbox, form = newt_form__new(); |
||||
|
||||
if (form == NULL) |
||||
return -1; |
||||
|
||||
listbox = newtListbox(0, 0, argc, NEWT_FLAG_RETURNEXIT); |
||||
if (listbox == NULL) |
||||
goto out_destroy_form; |
||||
|
||||
newtFormAddComponent(form, listbox); |
||||
|
||||
for (i = 0; i < argc; ++i) { |
||||
int len = strlen(argv[i]); |
||||
if (len > max_len) |
||||
max_len = len; |
||||
if (newtListboxAddEntry(listbox, argv[i], (void *)(long)i)) |
||||
goto out_destroy_form; |
||||
} |
||||
|
||||
newtCenteredWindow(max_len, argc, NULL); |
||||
newtFormRun(form, &es); |
||||
rc = newtListboxGetCurrent(listbox) - NULL; |
||||
if (es.reason == NEWT_EXIT_HOTKEY) |
||||
rc = -1; |
||||
newtPopWindow(); |
||||
out_destroy_form: |
||||
newtFormDestroy(form); |
||||
return rc; |
||||
} |
||||
|
||||
int ui__help_window(const char *text) |
||||
{ |
||||
struct newtExitStruct es; |
||||
newtComponent tb, form = newt_form__new(); |
||||
int rc = -1; |
||||
int max_len = 0, nr_lines = 0; |
||||
const char *t; |
||||
|
||||
if (form == NULL) |
||||
return -1; |
||||
|
||||
t = text; |
||||
while (1) { |
||||
const char *sep = strchr(t, '\n'); |
||||
int len; |
||||
|
||||
if (sep == NULL) |
||||
sep = strchr(t, '\0'); |
||||
len = sep - t; |
||||
if (max_len < len) |
||||
max_len = len; |
||||
++nr_lines; |
||||
if (*sep == '\0') |
||||
break; |
||||
t = sep + 1; |
||||
} |
||||
|
||||
tb = newtTextbox(0, 0, max_len, nr_lines, 0); |
||||
if (tb == NULL) |
||||
goto out_destroy_form; |
||||
|
||||
newtTextboxSetText(tb, text); |
||||
newtFormAddComponent(form, tb); |
||||
newtCenteredWindow(max_len, nr_lines, NULL); |
||||
newtFormRun(form, &es); |
||||
newtPopWindow(); |
||||
rc = 0; |
||||
out_destroy_form: |
||||
newtFormDestroy(form); |
||||
return rc; |
||||
} |
||||
|
||||
bool ui__dialog_yesno(const char *msg) |
||||
{ |
||||
/* newtWinChoice should really be accepting const char pointers... */ |
||||
char yes[] = "Yes", no[] = "No"; |
||||
return newtWinChoice(NULL, yes, no, (char *)msg) == 1; |
||||
} |
||||
@ -0,0 +1,10 @@ |
||||
#ifndef _PERF_UI_UTIL_H_ |
||||
#define _PERF_UI_UTIL_H_ 1 |
||||
|
||||
#include <stdbool.h> |
||||
|
||||
int ui__popup_menu(int argc, char * const argv[]); |
||||
int ui__help_window(const char *text); |
||||
bool ui__dialog_yesno(const char *msg); |
||||
|
||||
#endif /* _PERF_UI_UTIL_H_ */ |
||||
Loading…
Reference in new issue