From: John L. <mov...@us...> - 2002-06-05 03:46:41
|
Update of /cvsroot/oprofile/oprofile/pp In directory usw-pr-cvs1:/tmp/cvs-serv31403/pp Modified Files: op_time_options.cpp op_time_options.h op_to_source_options.h oprofpp_options.h Log Message: small cleanup Index: op_time_options.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/op_time_options.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- op_time_options.cpp 5 Jun 2002 03:31:25 -0000 1.5 +++ op_time_options.cpp 5 Jun 2002 03:46:37 -0000 1.6 @@ -28,7 +28,6 @@ namespace options { string session; string counter_str("0"); - string output_format; bool list_symbols; bool show_image_name; bool demangle; @@ -46,12 +45,13 @@ namespace { bool verbose; +string output_format; option options_array[] = { option(verbose, "verbose", 'V', "verbose output"), + option(output_format, "output-format", 't', "choose the output format", "output-format strings"), option(options::session, "session", 's', "session to use", "name"), option(options::counter_str, "counter", 'c', "which counter to use", "counter_nr[,counter_nr]"), - option(options::output_format, "output-format", 't', "choose the output format", "output-format strings"), option(options::list_symbols, "list-symbols", 'l', "list samples by symbol"), option(options::show_image_name, "show-image-name", 'n', "show the image name from where come symbols"), option(options::path, "path", 'p', "add path for retrieving image", "path_name[,path_name]"), Index: op_time_options.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/op_time_options.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- op_time_options.h 5 Jun 2002 02:12:09 -0000 1.3 +++ op_time_options.h 5 Jun 2002 03:46:37 -0000 1.4 @@ -21,22 +21,37 @@ typedef std::multimap<std::string, std::string> alt_filename_t; namespace options { + /// session name extern std::string session; + /// samples directory + extern std::string samples_dir; + /// counter to use + extern int counter; + // FIXME: should be exposed only as a mask + /// selected counters (comma-separated) extern std::string counter_str; - extern std::string output_format; - extern bool list_symbols; - extern bool show_image_name; + /// output format to use + extern OutSymbFlag output_format_flags; + /// which symbols to exclude + extern std::vector<std::string> exclude_symbols; + /// FIXME: doc extern std::vector<std::string> path; + /// FIXME: doc extern std::vector<std::string> recursive_path; + /// FIXME: doc + extern alt_filename_t alternate_filename; + /// whether to do symbol-based summary + extern bool list_symbols; + /// whether to show image name + extern bool show_image_name; + /// reverse the sort extern bool reverse_sort; + /// show dependent shared library samples extern bool show_shared_libs; + /// counter to sort by extern int sort_by_counter; - extern std::string samples_dir; - extern int counter; - extern OutSymbFlag output_format_flags; + /// whether to demangle extern bool demangle; - extern std::vector<std::string> exclude_symbols; - extern alt_filename_t alternate_filename; } /** Index: op_to_source_options.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/op_to_source_options.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- op_to_source_options.h 5 Jun 2002 02:12:09 -0000 1.3 +++ op_to_source_options.h 5 Jun 2002 03:46:37 -0000 1.4 @@ -15,27 +15,34 @@ #include <string> #include <vector> -// FIXME - /// command line option values namespace options { + /// sample file to work on + extern std::string sample_file; + /// image file to work on + extern std::string image_file; + /// show files with more than this nr. of samples extern int with_more_than_samples; + /// FIXME: doc extern int until_more_than_samples; + /// counter to sort by extern int sort_by_counter; + /// top-level source directory extern std::string source_dir; + /// top-level output directory extern std::string output_dir; + /// comma-separated mask of files to output extern std::string output_filter; + /// comma-separated mask of files to not output extern std::string no_output_filter; + /// which symbols to exclude + extern std::vector<std::string> exclude_symbols; + /// whether to generate assembly extern bool assembly; + /// whether to generate mixed source/assembly extern bool source_with_assembly; - /** control the behavior of demangle_symbol() */ + /// whether to demangle extern bool demangle; - /** a sample filename */ - extern std::string sample_file; - /** an image filename */ - extern std::string image_file; - /** the set of symbols to ignore */ - extern std::vector<std::string> exclude_symbols; }; /** Index: oprofpp_options.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/oprofpp_options.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- oprofpp_options.h 5 Jun 2002 03:31:25 -0000 1.5 +++ oprofpp_options.h 5 Jun 2002 03:46:37 -0000 1.6 @@ -19,23 +19,33 @@ /// command line option values namespace options { - extern int counter_mask; - extern int sort_by_counter; + /// sample file to work on + extern std::string sample_file; + /// image file to work on + extern std::string image_file; + /// gprof file to output to extern std::string gprof_file; + /// symbol to show in detail extern std::string symbol; + /// mask of counters to show + extern int counter_mask; + /// counters to sort by + extern int sort_by_counter; + /// show symbol summary extern bool list_symbols; + /// show all symbol's details + extern bool list_all_symbols_details; + /// show debug info extern bool output_linenr_info; + /// reverse sort extern bool reverse_sort; + /// show shared library symbols extern bool show_shared_libs; - extern OutSymbFlag output_format_flags; - extern bool list_all_symbols_details; - /** control the behavior of demangle_symbol() */ + /// demangle symbols extern bool demangle; - /** a sample filename */ - extern std::string sample_file; - /** an image filename */ - extern std::string image_file; - /** the set of symbols to ignore */ + /// what format to output + extern OutSymbFlag output_format_flags; + /// symbols to exclude extern std::vector<std::string> exclude_symbols; }; |