X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gprof%2Fgprof.c;h=da1411b30a6e20d964cedd287ce77020a854af88;hb=45c63c0fe8a672574b7a20cd6fcd8af162e5ca7b;hp=e5e88635675821cc3aba272eea6cc944ba72b964;hpb=ecba005fa15c10841bb06839055bd273649861df;p=deliverable%2Fbinutils-gdb.git diff --git a/gprof/gprof.c b/gprof/gprof.c index e5e8863567..da1411b30a 100644 --- a/gprof/gprof.c +++ b/gprof/gprof.c @@ -47,9 +47,10 @@ static void usage (FILE *, int) ATTRIBUTE_NORETURN; -const char *whoami; -const char *function_mapping_file; -const char *a_out_name = A_OUTNAME; +const char * whoami; +const char * function_mapping_file; +static const char * external_symbol_table; +const char * a_out_name = A_OUTNAME; long hz = HZ_WRONG; /* @@ -67,6 +68,7 @@ bfd_boolean line_granularity = FALSE; bfd_boolean print_descriptions = TRUE; bfd_boolean print_path = FALSE; bfd_boolean ignore_non_functions = FALSE; +bfd_boolean inline_file_names = FALSE; File_Format file_format = FF_AUTO; bfd_boolean first_output = TRUE; @@ -84,21 +86,22 @@ static char *default_excluded_list[] = { "_gprof_mcount", "mcount", "_mcount", "__mcount", "__mcount_internal", "__mcleanup", - "", "", 0 }; /* Codes used for the long options with no short synonyms. 150 isn't special; it's just an arbitrary non-ASCII char value. */ -#define OPTION_DEMANGLE (150) -#define OPTION_NO_DEMANGLE (OPTION_DEMANGLE + 1) +#define OPTION_DEMANGLE (150) +#define OPTION_NO_DEMANGLE (OPTION_DEMANGLE + 1) +#define OPTION_INLINE_FILE_NAMES (OPTION_DEMANGLE + 2) static struct option long_options[] = { {"line", no_argument, 0, 'l'}, {"no-static", no_argument, 0, 'a'}, {"ignore-non-functions", no_argument, 0, 'D'}, + {"external-symbol-table", required_argument, 0, 'S'}, /* output styles: */ @@ -122,6 +125,7 @@ static struct option long_options[] = {"no-demangle", no_argument, 0, OPTION_NO_DEMANGLE}, {"directory-path", required_argument, 0, 'I'}, {"display-unused-functions", no_argument, 0, 'z'}, + {"inline-file-names", no_argument, 0, OPTION_INLINE_FILE_NAMES}, {"min-count", required_argument, 0, 'm'}, {"print-path", no_argument, 0, 'L'}, {"separate-files", no_argument, 0, 'y'}, @@ -156,18 +160,18 @@ static void usage (FILE *stream, int status) { fprintf (stream, _("\ -Usage: %s [-[abcDhilLsTvwxyz]] [-[ACeEfFJnNOpPqQZ][name]] [-I dirs]\n\ +Usage: %s [-[abcDhilLrsTvwxyz]] [-[ACeEfFJnNOpPqQRStZ][name]] [-I dirs]\n\ [-d[num]] [-k from/to] [-m min-count] [-t table-length]\n\ [--[no-]annotated-source[=name]] [--[no-]exec-counts[=name]]\n\ [--[no-]flat-profile[=name]] [--[no-]graph[=name]]\n\ [--[no-]time=name] [--all-lines] [--brief] [--debug[=level]]\n\ - [--function-ordering] [--file-ordering]\n\ + [--function-ordering] [--file-ordering] [--inline-file-names]\n\ [--directory-path=dirs] [--display-unused-functions]\n\ [--file-format=name] [--file-info] [--help] [--line] [--min-count=n]\n\ [--no-static] [--print-path] [--separate-files]\n\ [--static-call-graph] [--sum] [--table-length=len] [--traditional]\n\ [--version] [--width=n] [--ignore-non-functions]\n\ - [--demangle[=STYLE]] [--no-demangle] [@FILE]\n\ + [--demangle[=STYLE]] [--no-demangle] [--external-symbol-table=name] [@FILE]\n\ [image-file] [profile-file...]\n"), whoami); if (REPORT_BUGS_TO[0] && status == 0) @@ -200,7 +204,7 @@ main (int argc, char **argv) expandargv (&argc, &argv); while ((ch = getopt_long (argc, argv, - "aA::bBcC::d::De:E:f:F:hiI:J::k:lLm:n:N:O:p::P::q::Q::rR:st:Tvw:xyzZ::", + "aA::bBcC::d::De:E:f:F:hiI:J::k:lLm:n:N:O:p::P::q::Q::rR:sS:t:Tvw:xyzZ::", long_options, 0)) != EOF) { @@ -255,14 +259,20 @@ main (int argc, char **argv) break; case 'E': sym_id_add (optarg, EXCL_TIME); + /* Fall through. */ case 'e': sym_id_add (optarg, EXCL_GRAPH); break; case 'F': sym_id_add (optarg, INCL_TIME); + /* Fall through. */ case 'f': sym_id_add (optarg, INCL_GRAPH); break; + /* FIXME: The -g and -G options are not present in the getopt_long + invocation above, and they are not documented in gprof.texi. + Therefore they appear to be deprecated. Test this theory and + delete them if true. */ case 'g': sym_id_add (optarg, EXCL_FLAT); break; @@ -399,6 +409,10 @@ main (int argc, char **argv) output_style |= STYLE_SUMMARY_FILE; user_specified |= STYLE_SUMMARY_FILE; break; + case 'S': + external_symbol_table = optarg; + DBG (AOUTDEBUG, printf ("external-symbol-table: %s\n", optarg)); + break; case 't': bb_table_length = atoi (optarg); if (bb_table_length < 0) @@ -442,7 +456,7 @@ This program is free software. This program has absolutely no warranty.\n")); { output_style &= ~STYLE_EXEC_COUNTS; } - user_specified |= STYLE_ANNOTATED_SOURCE; + user_specified |= STYLE_EXEC_COUNTS; break; case OPTION_DEMANGLE: demangle = TRUE; @@ -465,6 +479,9 @@ This program is free software. This program has absolutely no warranty.\n")); case OPTION_NO_DEMANGLE: demangle = FALSE; break; + case OPTION_INLINE_FILE_NAMES: + inline_file_names = TRUE; + break; default: usage (stderr, 1); } @@ -513,7 +530,9 @@ This program is free software. This program has absolutely no warranty.\n")); core_get_text_space (core_bfd); /* Create symbols from core image. */ - if (line_granularity) + if (external_symbol_table) + core_create_syms_from (external_symbol_table); + else if (line_granularity) core_create_line_syms (); else core_create_function_syms (); @@ -599,7 +618,7 @@ This program is free software. This program has absolutely no warranty.\n")); if (output_style & STYLE_FLAT_PROFILE) { /* Print the flat profile. */ - hist_print (); + hist_print (); } if (cg && (output_style & STYLE_CALL_GRAPH)) @@ -607,20 +626,20 @@ This program is free software. This program has absolutely no warranty.\n")); if (!bsd_style_output) { /* Print the dynamic profile. */ - cg_print (cg); + cg_print (cg); } cg_print_index (); } if (output_style & STYLE_EXEC_COUNTS) print_exec_counts (); - + if (output_style & STYLE_ANNOTATED_SOURCE) print_annotated_source (); - + if (output_style & STYLE_FUNCTION_ORDER) cg_print_function_ordering (); - + if (output_style & STYLE_FILE_ORDER) cg_print_file_ordering ();