forked from Minki/linux
fb7d0b3cef
GCC 4.6.0 in Fedora rawhide turned up some compile errors in tools/perf due to the -Werror=unused-but-set-variable flag. I've gone through and annotated some of the assignments that had side effects (ie: return value from a function) with the __used annotation, and in some cases, just removed unused code. In a few cases, we were assigning something useful, but not using it in later parts of the function. kyle@dreadnought:~/src% gcc --version gcc (GCC) 4.6.0 20110122 (Red Hat 4.6.0-0.3) Cc: Ingo Molnar <mingo@redhat.com> LKML-Reference: <20110124161304.GK27353@bombadil.infradead.org> Signed-off-by: Kyle McMartin <kyle@redhat.com> [ committer note: Fixed up the annotation fixes, as that code moved recently ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
157 lines
3.6 KiB
C
157 lines
3.6 KiB
C
#include "../libslang.h"
|
|
#include <elf.h>
|
|
#include <inttypes.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 err;
|
|
}
|
|
|
|
struct map_browser {
|
|
struct ui_browser b;
|
|
struct map *map;
|
|
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 width;
|
|
|
|
ui_browser__set_percent_color(self, 0, current_entry);
|
|
slsmg_printf("%*" PRIx64 " %*" PRIx64 " %c ",
|
|
mb->addrlen, sym->start, mb->addrlen, sym->end,
|
|
sym->binding == STB_GLOBAL ? 'g' :
|
|
sym->binding == STB_LOCAL ? 'l' : 'w');
|
|
width = self->width - ((mb->addrlen * 2) + 4);
|
|
if (width > 0)
|
|
slsmg_write_nstring(sym->name, width);
|
|
}
|
|
|
|
/* 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)
|
|
{
|
|
int key;
|
|
|
|
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;
|
|
|
|
if (verbose)
|
|
ui_browser__add_exit_key(&self->b, '/');
|
|
|
|
while (1) {
|
|
key = ui_browser__run(&self->b);
|
|
|
|
if (verbose && key == '/')
|
|
map_browser__search(self);
|
|
else
|
|
break;
|
|
}
|
|
|
|
ui_browser__hide(&self->b);
|
|
return key;
|
|
}
|
|
|
|
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 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 (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), "%" PRIx64, maxaddr);
|
|
return map_browser__run(&mb);
|
|
}
|