mirror of
https://github.com/varun-r-mallya/sysprof.git
synced 2025-12-31 20:36:25 +00:00
Pass map->bin_file to bin_symbol_get_name.
2006-08-21 Soren Sandmann <sandmann@redhat.com> * process.c (process_lookup_symbol): Pass map->bin_file to bin_symbol_get_name. * binfile.h (bin_symbol_get_name): Add BinFile parameter * elfparser.c (elf_demangle): Use options DMGL_PARAMS | DMGL_ANSI * TODO: Updates * binfile.c: Rewrite this file to use ElfParser instead of libbfd. * configure.ac: Drop dependencies on libbfd and libiberty.
This commit is contained in:
Soren Sandmann
committed by
Søren Sandmann Pedersen
Søren Sandmann Pedersen
parent
ad09fd10cb
commit
a1bddd8d9f
15
ChangeLog
15
ChangeLog
@ -1,3 +1,18 @@
|
||||
2006-08-21 Soren Sandmann <sandmann@redhat.com>
|
||||
|
||||
* process.c (process_lookup_symbol): Pass map->bin_file to
|
||||
bin_symbol_get_name.
|
||||
|
||||
* binfile.h (bin_symbol_get_name): Add BinFile parameter
|
||||
|
||||
* elfparser.c (elf_demangle): Use options DMGL_PARAMS | DMGL_ANSI
|
||||
|
||||
* TODO: Updates
|
||||
|
||||
* binfile.c: Rewrite this file to use ElfParser instead of libbfd.
|
||||
|
||||
* configure.ac: Drop dependencies on libbfd and libiberty.
|
||||
|
||||
2006-08-21 Soren Sandmann <sandmann@redhat.com>
|
||||
|
||||
* TODO: Update
|
||||
|
||||
@ -16,9 +16,13 @@ endif
|
||||
SYSPROF_CORE = \
|
||||
binfile.h \
|
||||
binfile.c \
|
||||
binparser.h \
|
||||
binparser.c \
|
||||
collector.c \
|
||||
collector.h \
|
||||
demangle.c \
|
||||
elfparser.c \
|
||||
elfparser.h \
|
||||
process.h \
|
||||
process.c \
|
||||
profile.h \
|
||||
|
||||
9
TODO
9
TODO
@ -32,6 +32,15 @@ Before 1.0.4:
|
||||
|
||||
Before 1.2:
|
||||
|
||||
* See if we can make "In file <blah>" not be treated as a recursive function.
|
||||
|
||||
* Give more sensible 'error messages'. Ie., if you get permission denied for
|
||||
a file, put "Permission denied" instead of "No map"
|
||||
|
||||
* crc32 checking probably doesn't belong in elfparser.c
|
||||
|
||||
* Add demangling again
|
||||
|
||||
* Rethink binparser. Maybe the default mode should be:
|
||||
- there is a current offset
|
||||
- you can move the cursor
|
||||
|
||||
586
binfile.c
586
binfile.c
@ -23,7 +23,7 @@
|
||||
/* Most interesting code in this file is lifted from bfdutils.c
|
||||
* and process.c from Memprof,
|
||||
*/
|
||||
|
||||
|
||||
#include <glib.h>
|
||||
#include "binfile.h"
|
||||
#include <bfd.h>
|
||||
@ -34,544 +34,152 @@
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include "elfparser.h"
|
||||
|
||||
static void bfd_nonfatal (const char *string);
|
||||
static void bfd_fatal (const char *string);
|
||||
|
||||
/* Symbol */
|
||||
struct BinSymbol
|
||||
{
|
||||
char * name;
|
||||
gulong address;
|
||||
};
|
||||
|
||||
/* Binary File */
|
||||
struct BinFile
|
||||
{
|
||||
char * filename;
|
||||
int n_symbols;
|
||||
BinSymbol *symbols;
|
||||
BinSymbol undefined;
|
||||
int ref_count;
|
||||
ino_t inode;
|
||||
ElfParser *elf;
|
||||
ino_t inode;
|
||||
char *undefined_name;
|
||||
};
|
||||
|
||||
static bfd *
|
||||
open_bfd (const char *file)
|
||||
/* FIXME: error handling */
|
||||
static ino_t
|
||||
read_inode (const char *filename)
|
||||
{
|
||||
bfd *abfd = bfd_openr (file, NULL);
|
||||
struct stat statbuf;
|
||||
|
||||
if (!abfd)
|
||||
return NULL;
|
||||
stat (filename, &statbuf);
|
||||
|
||||
if (!bfd_check_format (abfd, bfd_object))
|
||||
{
|
||||
bfd_close (abfd);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return abfd;
|
||||
return statbuf.st_ino;
|
||||
}
|
||||
|
||||
static unsigned long
|
||||
calc_crc32 (unsigned long crc, unsigned char *buf, size_t len)
|
||||
{
|
||||
static const unsigned long crc32_table[256] = {
|
||||
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
|
||||
0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
|
||||
0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
|
||||
0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
|
||||
0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
|
||||
0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
|
||||
0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
|
||||
0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
|
||||
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
|
||||
0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
|
||||
0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
|
||||
0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
|
||||
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
|
||||
0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
|
||||
0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
|
||||
0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
|
||||
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
|
||||
0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
|
||||
0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
|
||||
0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
|
||||
0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
|
||||
0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
|
||||
0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
|
||||
0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
|
||||
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
|
||||
0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
|
||||
0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
|
||||
0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
|
||||
0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
|
||||
0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
|
||||
0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
|
||||
0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
|
||||
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
|
||||
0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
|
||||
0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
|
||||
0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
|
||||
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
|
||||
0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
|
||||
0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
|
||||
0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
|
||||
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
|
||||
0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
|
||||
0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
|
||||
0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
|
||||
0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
|
||||
0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
|
||||
0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
|
||||
0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
|
||||
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
|
||||
0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
|
||||
0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
|
||||
0x2d02ef8d
|
||||
};
|
||||
unsigned char *end;
|
||||
|
||||
crc = ~crc & 0xffffffff;
|
||||
for (end = buf + len; buf < end; ++buf)
|
||||
crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
|
||||
return ~crc & 0xffffffff;;
|
||||
}
|
||||
|
||||
static char *
|
||||
get_debug_link_info (bfd *abfd, unsigned long *crc32_out)
|
||||
static ElfParser *
|
||||
separate_debug_file_exists (const char *name, guint32 crc)
|
||||
{
|
||||
asection *sect;
|
||||
bfd_size_type debuglink_size;
|
||||
unsigned long crc32;
|
||||
char *contents;
|
||||
int crc_offset;
|
||||
|
||||
sect = bfd_get_section_by_name (abfd, ".gnu_debuglink");
|
||||
|
||||
if (sect == NULL)
|
||||
guint32 file_crc;
|
||||
ElfParser *parser = elf_parser_new_from_file (name, NULL);
|
||||
|
||||
if (!parser)
|
||||
return NULL;
|
||||
|
||||
debuglink_size = bfd_section_size (abfd, sect);
|
||||
|
||||
contents = g_malloc (debuglink_size);
|
||||
bfd_get_section_contents (abfd, sect, contents,
|
||||
(file_ptr)0, (bfd_size_type)debuglink_size);
|
||||
|
||||
/* Crc value is stored after the filename, aligned up to 4 bytes. */
|
||||
crc_offset = strlen (contents) + 1;
|
||||
crc_offset = (crc_offset + 3) & ~3;
|
||||
|
||||
crc32 = bfd_get_32 (abfd, (bfd_byte *) (contents + crc_offset));
|
||||
|
||||
*crc32_out = crc32;
|
||||
return contents;
|
||||
}
|
||||
file_crc = elf_parser_get_crc32 (parser);
|
||||
|
||||
static gboolean
|
||||
separate_debug_file_exists (const char *name, unsigned long crc)
|
||||
{
|
||||
unsigned long file_crc = 0;
|
||||
int fd;
|
||||
guchar buffer[8*1024];
|
||||
int count;
|
||||
|
||||
fd = open (name, O_RDONLY);
|
||||
if (fd < 0)
|
||||
return 0;
|
||||
|
||||
while ((count = read (fd, buffer, sizeof (buffer))) > 0)
|
||||
file_crc = calc_crc32 (file_crc, buffer, count);
|
||||
|
||||
close (fd);
|
||||
|
||||
if (crc != file_crc)
|
||||
if (file_crc != crc)
|
||||
{
|
||||
g_print ("warning: %s has wrong crc\n", name);
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
return TRUE;
|
||||
|
||||
elf_parser_free (parser);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return parser;
|
||||
}
|
||||
|
||||
/* FIXME - not10: this should probably be detected by config.h -- find out what gdb does*/
|
||||
static const char *debug_file_directory = "/usr/lib/debug";
|
||||
static const char *const debug_file_directory = "/usr/lib/debug";
|
||||
|
||||
static char *
|
||||
find_separate_debug_file (bfd *abfd)
|
||||
static ElfParser *
|
||||
find_separate_debug_file (ElfParser *elf,
|
||||
const char *filename)
|
||||
{
|
||||
char *basename;
|
||||
const char *basename;
|
||||
char *dir;
|
||||
char *debugfile;
|
||||
unsigned long crc32;
|
||||
|
||||
basename = get_debug_link_info (abfd, &crc32);
|
||||
if (basename == NULL)
|
||||
return NULL;
|
||||
|
||||
dir = g_path_get_dirname (bfd_get_filename (abfd));
|
||||
|
||||
/* First try in the same directory as the original file: */
|
||||
debugfile = g_build_filename (dir, basename, NULL);
|
||||
if (separate_debug_file_exists (debugfile, crc32))
|
||||
{
|
||||
g_free (basename);
|
||||
g_free (dir);
|
||||
return debugfile;
|
||||
}
|
||||
g_free (debugfile);
|
||||
|
||||
/* Then try in a subdirectory called .debug */
|
||||
debugfile = g_build_filename (dir, ".debug", basename, NULL);
|
||||
if (separate_debug_file_exists (debugfile, crc32))
|
||||
{
|
||||
g_free (basename);
|
||||
g_free (dir);
|
||||
return debugfile;
|
||||
}
|
||||
g_free (debugfile);
|
||||
|
||||
/* Then try in the global debugfile directory */
|
||||
debugfile = g_build_filename (debug_file_directory, dir, basename, NULL);
|
||||
if (separate_debug_file_exists (debugfile, crc32))
|
||||
{
|
||||
g_free (basename);
|
||||
g_free (dir);
|
||||
return debugfile;
|
||||
}
|
||||
g_free (debugfile);
|
||||
|
||||
g_free (basename);
|
||||
g_free (dir);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static asymbol **
|
||||
slurp_symtab (bfd *abfd, long *symcount)
|
||||
{
|
||||
asymbol **sy = (asymbol **) NULL;
|
||||
long storage;
|
||||
|
||||
if (!(bfd_get_file_flags (abfd) & HAS_SYMS))
|
||||
{
|
||||
*symcount = 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
storage = bfd_get_symtab_upper_bound (abfd);
|
||||
if (storage < 0)
|
||||
bfd_fatal (bfd_get_filename (abfd));
|
||||
|
||||
if (storage)
|
||||
sy = (asymbol **) malloc (storage);
|
||||
|
||||
*symcount = bfd_canonicalize_symtab (abfd, sy);
|
||||
if (*symcount < 0)
|
||||
bfd_fatal (bfd_get_filename (abfd));
|
||||
|
||||
return sy;
|
||||
}
|
||||
|
||||
extern char *sysprof_cplus_demangle (const char *mangled, int options);
|
||||
|
||||
#define DMGL_PARAMS (1 << 0) /* Include function args */
|
||||
#define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */
|
||||
|
||||
static char *
|
||||
demangle (bfd *bfd, const char *name)
|
||||
{
|
||||
char *demangled;
|
||||
|
||||
if (bfd_get_symbol_leading_char (bfd) == *name)
|
||||
++name;
|
||||
|
||||
demangled = sysprof_cplus_demangle (name, DMGL_ANSI | DMGL_PARAMS);
|
||||
return demangled ? demangled : g_strdup (name);
|
||||
}
|
||||
|
||||
static gint
|
||||
compare_address (const void *a, const void *b)
|
||||
{
|
||||
const BinSymbol *symbol1 = a;
|
||||
const BinSymbol *symbol2 = b;
|
||||
|
||||
if (symbol1->address < symbol2->address)
|
||||
return -1;
|
||||
else if (symbol1->address == symbol2->address)
|
||||
return 0;
|
||||
else
|
||||
return 1;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
read_inode (const char *filename,
|
||||
ino_t *inode)
|
||||
{
|
||||
struct stat statbuf;
|
||||
|
||||
if (stat (filename, &statbuf) == 0)
|
||||
{
|
||||
*inode = statbuf.st_ino;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
read_symbols (BinFile *bf)
|
||||
{
|
||||
asection *text_section;
|
||||
const char *separate_debug_file;
|
||||
asymbol **bfd_symbols;
|
||||
long n_symbols;
|
||||
guint32 crc32;
|
||||
char *tries[3];
|
||||
int i;
|
||||
bfd *bfd;
|
||||
GArray *symbols;
|
||||
guint load_address;
|
||||
struct bfd_section *sec;
|
||||
ElfParser *result;
|
||||
|
||||
bf->symbols = NULL;
|
||||
bf->n_symbols = 0;
|
||||
if (!elf)
|
||||
return NULL;
|
||||
|
||||
bfd = open_bfd (bf->filename);
|
||||
if (!bfd)
|
||||
return;
|
||||
basename = elf_parser_get_debug_link (elf, &crc32);
|
||||
|
||||
if (!read_inode (bf->filename, &bf->inode))
|
||||
if (!basename)
|
||||
return elf;
|
||||
|
||||
dir = g_path_get_dirname (filename);
|
||||
|
||||
tries[0] = g_build_filename (dir, basename, NULL);
|
||||
tries[1] = g_build_filename (dir, ".debug", NULL);
|
||||
tries[2] = g_build_filename (debug_file_directory, dir, basename, NULL);
|
||||
|
||||
for (i = 0; i < 3; ++i)
|
||||
{
|
||||
bfd_close (bfd);
|
||||
return;
|
||||
result = separate_debug_file_exists (tries[i], crc32);
|
||||
if (result)
|
||||
break;
|
||||
}
|
||||
|
||||
separate_debug_file = find_separate_debug_file (bfd);
|
||||
if (separate_debug_file)
|
||||
g_free (dir);
|
||||
|
||||
for (i = 0; i < 3; ++i)
|
||||
g_free (tries[i]);
|
||||
|
||||
if (result)
|
||||
{
|
||||
bfd_close (bfd);
|
||||
bfd = open_bfd (separate_debug_file);
|
||||
#if 0
|
||||
g_print ("bfd for %s is %s\n", bf->filename, separate_debug_file);
|
||||
#endif
|
||||
if (!bfd)
|
||||
return;
|
||||
elf_parser_free (elf);
|
||||
return result;
|
||||
}
|
||||
|
||||
bfd_symbols = slurp_symtab (bfd, &n_symbols);
|
||||
|
||||
if (!bfd_symbols)
|
||||
{
|
||||
bfd_close (bfd);
|
||||
return;
|
||||
}
|
||||
|
||||
load_address = 0xffffffff;
|
||||
for (sec = bfd->sections; sec != NULL; sec = sec->next)
|
||||
{
|
||||
if (sec->flags & SEC_ALLOC)
|
||||
{
|
||||
if ((gulong)sec->vma < load_address)
|
||||
load_address = sec->vma & ~4095;
|
||||
}
|
||||
}
|
||||
|
||||
text_section = bfd_get_section_by_name (bfd, ".text");
|
||||
if (!text_section)
|
||||
return;
|
||||
|
||||
symbols = g_array_new (FALSE, FALSE, sizeof (BinSymbol));
|
||||
|
||||
/* g_print ("%s: text vma: %x\n", bf->filename, text_section->vma); */
|
||||
|
||||
for (i = 0; i < n_symbols; i++)
|
||||
{
|
||||
BinSymbol symbol;
|
||||
|
||||
if ((bfd_symbols[i]->flags & BSF_FUNCTION) &&
|
||||
(bfd_symbols[i]->section == text_section))
|
||||
{
|
||||
/* Store the address in file coordinates:
|
||||
* - all addresses are already offset by section->vma
|
||||
* - the section is positioned at section->filepos
|
||||
*/
|
||||
symbol.address = bfd_asymbol_value (bfd_symbols[i]) - load_address;
|
||||
symbol.name = demangle (bfd, bfd_asymbol_name (bfd_symbols[i]));
|
||||
g_array_append_vals (symbols, &symbol, 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (n_symbols)
|
||||
free (bfd_symbols);
|
||||
|
||||
#if 0
|
||||
if (!n_symbols)
|
||||
g_print ("no symbols found for %s\n", bf->filename);
|
||||
else
|
||||
g_print ("symbols found for %s\n", bf->filename);
|
||||
#endif
|
||||
|
||||
/* Sort the symbols by address */
|
||||
qsort (symbols->data, symbols->len, sizeof (BinSymbol), compare_address);
|
||||
|
||||
bf->n_symbols = symbols->len;
|
||||
bf->symbols = (BinSymbol *)g_array_free (symbols, FALSE);
|
||||
}
|
||||
|
||||
static GHashTable *bin_files;
|
||||
{
|
||||
return elf;
|
||||
}
|
||||
}
|
||||
|
||||
BinFile *
|
||||
bin_file_new (const char *filename)
|
||||
{
|
||||
/* FIXME: should be able to return an error */
|
||||
BinFile *bf;
|
||||
|
||||
if (!bin_files)
|
||||
bin_files = g_hash_table_new (g_str_hash, g_str_equal);
|
||||
|
||||
bf = g_hash_table_lookup (bin_files, filename);
|
||||
if (bf)
|
||||
{
|
||||
bf->ref_count++;
|
||||
}
|
||||
else
|
||||
{
|
||||
bf = g_new0 (BinFile, 1);
|
||||
bf = g_new0 (BinFile, 1);
|
||||
bf->elf = elf_parser_new_from_file (filename, NULL);
|
||||
bf->elf = find_separate_debug_file (bf->elf, filename);
|
||||
bf->inode = read_inode (filename);
|
||||
bf->undefined_name = g_strdup_printf ("In file %s", filename);
|
||||
|
||||
bf->filename = g_strdup (filename);
|
||||
|
||||
read_symbols (bf);
|
||||
|
||||
bf->undefined.name = g_strdup_printf ("In file %s", filename);
|
||||
bf->undefined.address = 0x0;
|
||||
bf->ref_count = 1;
|
||||
g_hash_table_insert (bin_files, bf->filename, bf);
|
||||
}
|
||||
|
||||
return bf;
|
||||
}
|
||||
|
||||
void
|
||||
bin_file_free (BinFile *bin_file)
|
||||
{
|
||||
if (bin_file->elf)
|
||||
elf_parser_free (bin_file->elf);
|
||||
|
||||
g_free (bin_file->undefined_name);
|
||||
g_free (bin_file);
|
||||
}
|
||||
|
||||
const BinSymbol *
|
||||
bin_file_lookup_symbol (BinFile *bin_file,
|
||||
gulong address)
|
||||
{
|
||||
if (bin_file->elf)
|
||||
{
|
||||
const ElfSym *sym = elf_parser_lookup_symbol (bin_file->elf, address);
|
||||
|
||||
if (sym)
|
||||
return (const BinSymbol *)sym;
|
||||
}
|
||||
|
||||
return (const BinSymbol *)bin_file->undefined_name;
|
||||
}
|
||||
|
||||
ino_t
|
||||
bin_file_get_inode (BinFile *bin_file)
|
||||
bin_file_get_inode (BinFile *bin_file)
|
||||
{
|
||||
return bin_file->inode;
|
||||
}
|
||||
|
||||
void
|
||||
bin_file_free (BinFile *bf)
|
||||
{
|
||||
if (--bf->ref_count == 0)
|
||||
{
|
||||
int i;
|
||||
|
||||
g_hash_table_remove (bin_files, bf->filename);
|
||||
|
||||
g_free (bf->filename);
|
||||
|
||||
for (i = 0; i < bf->n_symbols; ++i)
|
||||
g_free (bf->symbols[i].name);
|
||||
g_free (bf->symbols);
|
||||
g_free (bf->undefined.name);
|
||||
g_free (bf);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* bin_file_lookup_symbol:
|
||||
* @bf: A BinFile
|
||||
* @address: The address to lookup
|
||||
*
|
||||
* Look up a symbol. @address should be in file coordinates
|
||||
*
|
||||
**/
|
||||
const BinSymbol *
|
||||
bin_file_lookup_symbol (BinFile *bf,
|
||||
gulong address)
|
||||
{
|
||||
int first = 0;
|
||||
int last = bf->n_symbols - 1;
|
||||
int middle = last;
|
||||
BinSymbol *data;
|
||||
BinSymbol *result;
|
||||
|
||||
if (!bf->symbols || (bf->n_symbols == 0))
|
||||
return &(bf->undefined);
|
||||
|
||||
if (address == 0x0)
|
||||
return &(bf->undefined);
|
||||
|
||||
data = bf->symbols;
|
||||
|
||||
#if 0
|
||||
g_print ("looking up %p in %s ", address, bf->filename);
|
||||
#endif
|
||||
|
||||
if (address < data[last].address)
|
||||
{
|
||||
/* Invariant: data[first].addr <= val < data[last].addr */
|
||||
|
||||
while (first < last - 1)
|
||||
{
|
||||
middle = (first + last) / 2;
|
||||
if (address < data[middle].address)
|
||||
last = middle;
|
||||
else
|
||||
first = middle;
|
||||
}
|
||||
/* Size is not included in generic bfd data, so we
|
||||
* ignore it for now. (It is ELF specific)
|
||||
*/
|
||||
result = &data[first];
|
||||
}
|
||||
else
|
||||
{
|
||||
result = &data[last];
|
||||
}
|
||||
|
||||
#if 0
|
||||
g_print ("-> %s\n", result->name);
|
||||
#endif
|
||||
|
||||
/* If the name is "call_gmon_start", the file probably doesn't
|
||||
* have any other symbols
|
||||
*/
|
||||
if (strcmp (result->name, "call_gmon_start") == 0)
|
||||
return &(bf->undefined);
|
||||
else if (strncmp (result->name, "__do_global_ctors_aux", strlen ("__do_global_ctors_aux")) == 0)
|
||||
{
|
||||
#if 0
|
||||
g_print ("ctors: %p, pos: %p\n", address, result->address);
|
||||
#endif
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
const char *
|
||||
bin_symbol_get_name (const BinSymbol *symbol)
|
||||
bin_symbol_get_name (BinFile *file, const BinSymbol *symbol)
|
||||
{
|
||||
return symbol->name;
|
||||
}
|
||||
|
||||
static void
|
||||
bfd_nonfatal (const char *string)
|
||||
{
|
||||
const char *errmsg = bfd_errmsg (bfd_get_error ());
|
||||
|
||||
if (string)
|
||||
{
|
||||
fprintf (stderr, "%s: %s: %s\n",
|
||||
g_get_application_name(), string, errmsg);
|
||||
}
|
||||
if (file->undefined_name == (char *)symbol)
|
||||
return file->undefined_name;
|
||||
else
|
||||
{
|
||||
fprintf (stderr, "%s: %s\n",
|
||||
g_get_application_name(), errmsg);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
bfd_fatal (const char *string)
|
||||
{
|
||||
bfd_nonfatal (string);
|
||||
exit (1);
|
||||
return elf_sym_get_name ((const ElfSym *)symbol);
|
||||
}
|
||||
|
||||
@ -39,6 +39,7 @@ const BinSymbol *bin_file_lookup_symbol (BinFile *bin_file,
|
||||
ino_t bin_file_get_inode (BinFile *bin_file);
|
||||
|
||||
|
||||
const char * bin_symbol_get_name (const BinSymbol *symbol);
|
||||
const char * bin_symbol_get_name (BinFile *bin_file,
|
||||
const BinSymbol *symbol);
|
||||
|
||||
#endif
|
||||
|
||||
13
configure.ac
13
configure.ac
@ -93,19 +93,6 @@ PKG_CHECK_MODULES(GUI_DEP, $gui_dep, [], build_gui=no)
|
||||
|
||||
AM_CONDITIONAL([BUILD_GUI], [test "$build_gui" = yes])
|
||||
|
||||
# libiberty and libbfd
|
||||
|
||||
AC_CHECK_LIB(iberty, cplus_demangle,:,
|
||||
AC_CHECK_LIB(iberty, cplus_demangle_opname, [],
|
||||
AC_MSG_ERROR([libiberty is required to compile sysprof]), -ldl))
|
||||
|
||||
AC_CHECK_LIB(bfd, bfd_get_error,,
|
||||
AC_MSG_ERROR([libbfd is required to compile sysprof]),
|
||||
-liberty)
|
||||
|
||||
CORE_DEP_LIBS="$CORE_DEP_LIBS -lbfd -liberty"
|
||||
GUI_DEP_LIBS="$GUI_DEP_LIBS -lbfd -liberty"
|
||||
|
||||
# emit files
|
||||
|
||||
AC_SUBST(CORE_DEP_LIBS)
|
||||
|
||||
15
elfparser.c
15
elfparser.c
@ -275,7 +275,10 @@ extern char *sysprof_cplus_demangle (const char *name, int options);
|
||||
char *
|
||||
elf_demangle (const char *name)
|
||||
{
|
||||
char *demangled = sysprof_cplus_demangle (name, 0);
|
||||
#define DMGL_PARAMS (1 << 0) /* Include function args */
|
||||
#define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */
|
||||
|
||||
char *demangled = sysprof_cplus_demangle (name, DMGL_PARAMS | DMGL_ANSI);
|
||||
|
||||
if (demangled)
|
||||
return demangled;
|
||||
@ -323,8 +326,10 @@ read_table (ElfParser *parser,
|
||||
parser->n_symbols = sym_table->size / sym_size;
|
||||
parser->symbols = g_new (ElfSym, parser->n_symbols);
|
||||
|
||||
#if 0
|
||||
g_print ("\nreading %d symbols (@%d bytes) from %s\n",
|
||||
parser->n_symbols, sym_size, sym_table->name);
|
||||
#endif
|
||||
|
||||
bin_parser_begin (parser->parser, parser->sym_format, sym_table->offset);
|
||||
|
||||
@ -357,7 +362,9 @@ read_table (ElfParser *parser,
|
||||
|
||||
bin_parser_end (parser->parser);
|
||||
|
||||
#if 0
|
||||
g_print ("found %d functions\n", n_functions);
|
||||
#endif
|
||||
|
||||
parser->sym_strings = str_table->offset;
|
||||
parser->n_symbols = n_functions;
|
||||
@ -411,7 +418,9 @@ elf_parser_get_load_address (ElfParser *parser)
|
||||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
g_print ("load address: %8p\n", (void *)load_address);
|
||||
#endif
|
||||
|
||||
return load_address;
|
||||
}
|
||||
@ -461,7 +470,7 @@ elf_parser_lookup_symbol (ElfParser *parser,
|
||||
|
||||
if (parser->n_symbols == 0)
|
||||
return NULL;
|
||||
|
||||
|
||||
address += elf_parser_get_load_address (parser);
|
||||
|
||||
#if 0
|
||||
@ -491,7 +500,7 @@ parser_from_sym (const ElfSym *sym)
|
||||
{
|
||||
GList *list;
|
||||
|
||||
/* FIXME: This is gross, but the alternatives I can think of
|
||||
/* FIXME: This is gross, but the alternatives I can think of
|
||||
* are all worse.
|
||||
*/
|
||||
for (list = all_elf_parsers; list != NULL; list = list->next)
|
||||
|
||||
@ -8,6 +8,7 @@ ElfParser *elf_parser_new (const guchar *data,
|
||||
ElfParser *elf_parser_new_from_file (const char *filename,
|
||||
GError **err);
|
||||
void elf_parser_free (ElfParser *parser);
|
||||
const char *elf_parser_get_debug_link (ElfParser *parser, guint32 *crc32);
|
||||
|
||||
/* Lookup a symbol in the file.
|
||||
*
|
||||
|
||||
23
process.c
23
process.c
@ -573,8 +573,29 @@ process_lookup_symbol (Process *process, gulong address)
|
||||
return process->undefined;
|
||||
}
|
||||
|
||||
#if 0
|
||||
if (strcmp (map->filename, "/home/ssp/sysprof/sysprof") == 0)
|
||||
{
|
||||
g_print ("YES\n");
|
||||
|
||||
g_print ("map address: %lx\n", map->start);
|
||||
g_print ("map offset: %lx\n", map->offset);
|
||||
g_print ("address before: %lx\n", address);
|
||||
}
|
||||
#endif
|
||||
#if 0
|
||||
g_print ("address before: \n");
|
||||
#endif
|
||||
|
||||
address -= map->start;
|
||||
address += map->offset;
|
||||
|
||||
#if 0
|
||||
if (strcmp (map->filename, "/home/ssp/sysprof/sysprof") == 0)
|
||||
{
|
||||
g_print ("address after: %lx\n", address);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!map->bin_file)
|
||||
map->bin_file = bin_file_new (map->filename);
|
||||
@ -600,7 +621,7 @@ process_lookup_symbol (Process *process, gulong address)
|
||||
|
||||
/* g_print ("(%x) %x %x name; %s\n", address, map->start, map->offset, result->name); */
|
||||
|
||||
return bin_symbol_get_name (result);
|
||||
return bin_symbol_get_name (map->bin_file, result);
|
||||
}
|
||||
|
||||
const char *
|
||||
|
||||
Reference in New Issue
Block a user