X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gprof%2Fgprof.c;h=da1411b30a6e20d964cedd287ce77020a854af88;hb=915808f652b63746052b1ef59403650b45a30e4f;hp=3c29e09f00fe0348166854ee6c5ebf73ae31cb0a;hpb=6d9c411afd0301f0262ff63d6dc59dac38f58e63;p=deliverable%2Fbinutils-gdb.git diff --git a/gprof/gprof.c b/gprof/gprof.c index 3c29e09f00..da1411b30a 100644 --- a/gprof/gprof.c +++ b/gprof/gprof.c @@ -1,24 +1,35 @@ /* - * Copyright (c) 1983, 1998, 2001 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1983, 1993, 1998, 2001, 2002 + * The Regents of the University of California. All rights reserved. * - * Redistribution and use in source and binary forms are permitted - * provided that: (1) source distributions retain this entire copyright - * notice and comment, and (2) distributions including binaries display - * the following acknowledgement: ``This product includes software - * developed by the University of California, Berkeley and its contributors'' - * in the documentation or other materials provided with the distribution - * and in all advertising materials mentioning features or use of this - * software. Neither the name of the University nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ -#include "getopt.h" -#include "libiberty.h" + #include "gprof.h" +#include "libiberty.h" +#include "bfdver.h" #include "search_list.h" #include "source.h" #include "symtab.h" @@ -32,10 +43,14 @@ #include "hist.h" #include "sym_ids.h" #include "demangle.h" +#include "getopt.h" -const char *whoami; -const char *function_mapping_file; -const char *a_out_name = A_OUTNAME; +static void usage (FILE *, int) ATTRIBUTE_NORETURN; + +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; /* @@ -44,19 +59,19 @@ long hz = HZ_WRONG; int debug_level = 0; int output_style = 0; int output_width = 80; -bool bsd_style_output = FALSE; -bool demangle = TRUE; -bool discard_underscores = 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; +bfd_boolean bsd_style_output = FALSE; +bfd_boolean demangle = 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; +bfd_boolean inline_file_names = FALSE; File_Format file_format = FF_AUTO; -bool first_output = TRUE; +bfd_boolean first_output = TRUE; char copyright[] = "@(#) Copyright (c) 1983 Regents of the University of California.\n\ @@ -64,8 +79,6 @@ char copyright[] = static char *gmon_name = GMONNAME; /* profile filename */ -bfd *abfd; - /* * Functions that get excluded by default: */ @@ -73,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: */ @@ -111,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'}, @@ -142,31 +157,31 @@ static struct option long_options[] = static void -DEFUN (usage, (stream, status), FILE * stream AND int status) +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); } int -DEFUN (main, (argc, argv), int argc AND char **argv) +main (int argc, char **argv) { char **sp, *str; Sym **cg = 0; @@ -178,14 +193,18 @@ DEFUN (main, (argc, argv), int argc AND char **argv) #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) { @@ -240,14 +259,20 @@ DEFUN (main, (argc, argv), int argc AND 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; @@ -384,6 +409,10 @@ DEFUN (main, (argc, argv), int argc AND 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) @@ -396,7 +425,7 @@ DEFUN (main, (argc, argv), int argc AND char **argv) 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")); @@ -427,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; @@ -450,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); } @@ -465,141 +497,87 @@ This program is free software. This program has absolutely no warranty.\n")); done (1); } - /* --sum implies --line, otherwise we'd lose b-b counts in gmon.sum */ + /* --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); sym_id_add (*sp, EXCL_GRAPH); -#ifdef __alpha__ sym_id_add (*sp, EXCL_FLAT); -#endif } - /* - * 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: - */ + /* Read symbol table from core file. */ core_init (a_out_name); - /* - * If we should ignore direct function calls, we need to load - * to core's text-space: - */ + /* If we should ignore direct function calls, we need to load to + core's text-space. */ if (ignore_direct_calls) - { - core_get_text_space (core_bfd); - } + core_get_text_space (core_bfd); - /* - * Create symbols from core image: - */ - if (line_granularity) - { - core_create_line_syms (core_bfd); - } + /* Create symbols from core image. */ + if (external_symbol_table) + core_create_syms_from (external_symbol_table); + else if (line_granularity) + core_create_line_syms (); else - { - core_create_function_syms (core_bfd); - } + core_create_function_syms (); - /* - * Translate sym specs into syms: - */ + /* Translate sym specs into syms. */ sym_id_parse (); if (file_format == FF_PROF) { -#ifdef PROF_SUPPORT_IMPLEMENTED - /* - * Get information about mon.out file(s): - */ - do - { - mon_out_read (gmon_name); - if (optind < argc) - { - gmon_name = argv[optind]; - } - } - while (optind++ < argc); -#else fprintf (stderr, _("%s: sorry, file format `prof' is not yet supported\n"), whoami); done (1); -#endif } else { - /* - * Get information about gmon.out file(s): - */ + /* Get information about gmon.out file(s). */ do { 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; - } + output_style = STYLE_EXEC_COUNTS; + output_style &= ~user_specified; } - /* - * Dump a gmon.sum file if requested (before any other processing!): - */ + /* Dump a gmon.sum file if requested (before any other + processing!) */ if (output_style & STYLE_SUMMARY_FILE) { gmon_out_write (GMONSUM); @@ -615,8 +593,7 @@ This program is free software. This program has absolutely no warranty.\n")); cg = cg_assemble (); } - /* do some simple sanity checks: */ - + /* Do some simple sanity checks. */ if ((output_style & STYLE_FLAT_PROFILE) && !(gmon_input & INPUT_HISTOGRAM)) { @@ -631,50 +608,46 @@ 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; } void -done (status) - int status; +done (int status) { exit (status); }