X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gprof%2Fgprof.c;h=6ed88ff47764682e2ace33c50aaa3cdcd60431ed;hb=caf606c90d55305967b9253447dda93d2f1835ab;hp=727aca41ba78a95ddbd6e715b1e2aa97a182b05f;hpb=3e8f6abf1e13bfd39a48b297f2679f5dd5fe6a3a;p=binutils-gdb.git diff --git a/gprof/gprof.c b/gprof/gprof.c index 727aca41ba7..6ed88ff4776 100644 --- a/gprof/gprof.c +++ b/gprof/gprof.c @@ -27,8 +27,9 @@ * SUCH DAMAGE. */ -#include "libiberty.h" #include "gprof.h" +#include "libiberty.h" +#include "bfdver.h" #include "search_list.h" #include "source.h" #include "symtab.h" @@ -45,11 +46,11 @@ #include "getopt.h" static void usage (FILE *, int) ATTRIBUTE_NORETURN; -int main (int, char **); -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; /* @@ -58,19 +59,19 @@ long hz = HZ_WRONG; int debug_level = 0; int output_style = 0; int output_width = 80; -bfd_boolean bsd_style_output = FALSE; -bfd_boolean demangle = TRUE; -bfd_boolean discard_underscores = TRUE; -bfd_boolean ignore_direct_calls = FALSE; -bfd_boolean ignore_static_funcs = FALSE; -bfd_boolean ignore_zeros = TRUE; -bfd_boolean line_granularity = FALSE; -bfd_boolean print_descriptions = TRUE; -bfd_boolean print_path = FALSE; -bfd_boolean ignore_non_functions = FALSE; +bool bsd_style_output = false; +bool demangle = true; +bool ignore_direct_calls = false; +bool ignore_static_funcs = false; +bool ignore_zeros = true; +bool line_granularity = false; +bool print_descriptions = true; +bool print_path = false; +bool ignore_non_functions = false; +bool inline_file_names = false; File_Format file_format = FF_AUTO; -bfd_boolean first_output = TRUE; +bool first_output = true; char copyright[] = "@(#) Copyright (c) 1983 Regents of the University of California.\n\ @@ -78,8 +79,6 @@ char copyright[] = static char *gmon_name = GMONNAME; /* profile filename */ -bfd *abfd; - /* * Functions that get excluded by default: */ @@ -87,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: */ @@ -125,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'}, @@ -159,21 +160,21 @@ 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]\n\ + [--demangle[=STYLE]] [--no-demangle] [--external-symbol-table=name] [@FILE]\n\ [image-file] [profile-file...]\n"), whoami); - if (status == 0) + if (REPORT_BUGS_TO[0] && status == 0) fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO); done (status); } @@ -186,27 +187,29 @@ main (int argc, char **argv) Sym **cg = 0; int ch, user_specified = 0; -#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) +#ifdef HAVE_LC_MESSAGES setlocale (LC_MESSAGES, ""); #endif -#if defined (HAVE_SETLOCALE) setlocale (LC_CTYPE, ""); -#endif +#ifdef ENABLE_NLS bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); +#endif whoami = argv[0]; xmalloc_set_program_name (whoami); + expandargv (&argc, &argv); + while ((ch = getopt_long (argc, argv, - "aA::bBcCd::De:E:f:F:hiI:J::k:lLm:n::N::O:p::P::q::Q::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) { switch (ch) { case 'a': - ignore_static_funcs = TRUE; + ignore_static_funcs = true; break; case 'A': if (optarg) @@ -217,14 +220,14 @@ main (int argc, char **argv) user_specified |= STYLE_ANNOTATED_SOURCE; break; case 'b': - print_descriptions = FALSE; + print_descriptions = false; break; case 'B': output_style |= STYLE_CALL_GRAPH; user_specified |= STYLE_CALL_GRAPH; break; case 'c': - ignore_direct_calls = TRUE; + ignore_direct_calls = true; break; case 'C': if (optarg) @@ -250,18 +253,24 @@ main (int argc, char **argv) #endif /* DEBUG */ break; case 'D': - ignore_non_functions = TRUE; + ignore_non_functions = true; 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; @@ -293,10 +302,10 @@ main (int argc, char **argv) sym_id_add (optarg, EXCL_ARCS); break; case 'l': - line_granularity = TRUE; + line_granularity = true; break; case 'L': - print_path = TRUE; + print_path = true; break; case 'm': bb_min_calls = (unsigned long) strtoul (optarg, (char **) NULL, 10); @@ -398,6 +407,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) @@ -406,11 +419,11 @@ main (int argc, char **argv) } break; case 'T': - bsd_style_output = TRUE; + bsd_style_output = true; break; case 'v': /* This output is intended to follow the GNU standards document. */ - printf (_("GNU gprof %s\n"), VERSION); + printf (_("GNU gprof %s\n"), BFD_VERSION_STRING); printf (_("Based on BSD gprof, copyright 1983 Regents of the University of California.\n")); printf (_("\ This program is free software. This program has absolutely no warranty.\n")); @@ -423,13 +436,13 @@ This program is free software. This program has absolutely no warranty.\n")); } break; case 'x': - bb_annotate_all_lines = TRUE; + bb_annotate_all_lines = true; break; case 'y': - create_annotation_files = TRUE; + create_annotation_files = true; break; case 'z': - ignore_zeros = FALSE; + ignore_zeros = false; break; case 'Z': if (optarg) @@ -441,10 +454,10 @@ 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; + demangle = true; if (optarg != NULL) { enum demangling_styles style; @@ -462,7 +475,10 @@ This program is free software. This program has absolutely no warranty.\n")); } break; case OPTION_NO_DEMANGLE: - demangle = FALSE; + demangle = false; + break; + case OPTION_INLINE_FILE_NAMES: + inline_file_names = true; break; default: usage (stderr, 1); @@ -482,29 +498,20 @@ This program is free software. This program has absolutely no warranty.\n")); /* --sum implies --line, otherwise we'd lose basic block counts in gmon.sum */ if (output_style & STYLE_SUMMARY_FILE) - { - line_granularity = 1; - } + line_granularity = 1; /* append value of GPROF_PATH to source search list if set: */ str = (char *) getenv ("GPROF_PATH"); if (str) - { - search_list_append (&src_search_list, str); - } + search_list_append (&src_search_list, str); if (optind < argc) - { - a_out_name = argv[optind++]; - } + a_out_name = argv[optind++]; + if (optind < argc) - { - gmon_name = argv[optind++]; - } + gmon_name = argv[optind++]; - /* - * Turn off default functions: - */ + /* Turn off default functions. */ for (sp = &default_excluded_list[0]; *sp; sp++) { sym_id_add (*sp, EXCL_TIME); @@ -512,14 +519,6 @@ This program is free software. This program has absolutely no warranty.\n")); sym_id_add (*sp, EXCL_FLAT); } - /* - * For line-by-line profiling, also want to keep those - * functions off the flat profile: - */ - if (line_granularity) - for (sp = &default_excluded_list[0]; *sp; sp++) - sym_id_add (*sp, EXCL_FLAT); - /* Read symbol table from core file. */ core_init (a_out_name); @@ -529,7 +528,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 (); @@ -551,21 +552,22 @@ This program is free software. This program has absolutely no warranty.\n")); { gmon_out_read (gmon_name); if (optind < argc) - { - gmon_name = argv[optind]; - } + gmon_name = argv[optind]; } while (optind++ < argc); } - /* - * If user did not specify output style, try to guess something - * reasonable: - */ + /* If user did not specify output style, try to guess something + reasonable. */ if (output_style == 0) { if (gmon_input & (INPUT_HISTOGRAM | INPUT_CALL_GRAPH)) - output_style = STYLE_FLAT_PROFILE | STYLE_CALL_GRAPH; + { + if (gmon_input & INPUT_HISTOGRAM) + output_style |= STYLE_FLAT_PROFILE; + if (gmon_input & INPUT_CALL_GRAPH) + output_style |= STYLE_CALL_GRAPH; + } else output_style = STYLE_EXEC_COUNTS; @@ -604,44 +606,41 @@ This program is free software. This program has absolutely no warranty.\n")); done (1); } - /* output whatever user whishes to see: */ - + /* Output whatever user whishes to see. */ if (cg && (output_style & STYLE_CALL_GRAPH) && bsd_style_output) { - cg_print (cg); /* print the dynamic profile */ + /* Print the dynamic profile. */ + cg_print (cg); } if (output_style & STYLE_FLAT_PROFILE) { - hist_print (); /* print the flat profile */ + /* Print the flat profile. */ + hist_print (); } if (cg && (output_style & STYLE_CALL_GRAPH)) { if (!bsd_style_output) { - cg_print (cg); /* print the dynamic profile */ + /* Print the dynamic profile. */ + cg_print (cg); } cg_print_index (); } if (output_style & STYLE_EXEC_COUNTS) - { - print_exec_counts (); - } + print_exec_counts (); if (output_style & STYLE_ANNOTATED_SOURCE) - { - print_annotated_source (); - } + print_annotated_source (); + if (output_style & STYLE_FUNCTION_ORDER) - { - cg_print_function_ordering (); - } + cg_print_function_ordering (); + if (output_style & STYLE_FILE_ORDER) - { - cg_print_file_ordering (); - } + cg_print_file_ordering (); + return 0; }