From: Philippe E. <ph...@us...> - 2002-06-09 17:12:52
|
Update of /cvsroot/oprofile/oprofile/pp In directory usw-pr-cvs1:/tmp/cvs-serv23627/pp Modified Files: op_merge.cpp op_time_options.cpp op_to_source_options.cpp oprofpp_options.cpp Log Message: utils/Mkaefile.in: typo for librairies dependencies cverb.h/cverb.cpp: new file for verbose ostream init use it in all pp utilities. Phil Index: op_merge.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/op_merge.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- op_merge.cpp 7 Jun 2002 03:38:34 -0000 1.25 +++ op_merge.cpp 9 Jun 2002 17:12:49 -0000 1.26 @@ -22,6 +22,7 @@ #include "version.h" #include "popt_options.h" #include "file_manip.h" +#include "cverb.h" #include "db.h" #include "op_config.h" @@ -49,9 +50,6 @@ option(counter, "use-counter", 'c', "use counter", "counter nr") }; -static ofstream fout("/dev/null"); -std::ostream cverb(fout.rdbuf()); - /** * get_options - process command line * @param argc program arg count @@ -64,10 +62,7 @@ { parse_options(argc, argv, images); - if (verbose) - cverb.rdbuf(std::cout.rdbuf()); - else - cverb.clear(std::ios::badbit); + set_verbose(verbose); if (images.size() == 0) { cerr << "Neither samples filename or image filename" Index: op_time_options.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/op_time_options.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- op_time_options.cpp 7 Jun 2002 03:38:34 -0000 1.10 +++ op_time_options.cpp 9 Jun 2002 17:12:49 -0000 1.11 @@ -15,6 +15,7 @@ #include "popt_options.h" #include "file_manip.h" +#include "cverb.h" #include <list> #include <fstream> @@ -123,9 +124,6 @@ } // namespace anon -static std::ofstream fout("/dev/null"); -std::ostream cverb(fout.rdbuf()); - /** * get_options - process command line * @param argc program arg count @@ -140,10 +138,8 @@ string file; parse_options(argc, argv, file); - if (verbose) - cverb.rdbuf(std::cout.rdbuf()); - else - cverb.clear(std::ios::badbit); + + set_verbose(verbose); if (file.length()) session = file; Index: op_to_source_options.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/op_to_source_options.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- op_to_source_options.cpp 7 Jun 2002 03:38:34 -0000 1.7 +++ op_to_source_options.cpp 9 Jun 2002 17:12:49 -0000 1.8 @@ -15,6 +15,8 @@ #include <fstream> #include <iostream> +#include "cverb.h" + using std::vector; using std::string; using std::cerr; @@ -61,9 +63,6 @@ } -static std::ofstream fout("/dev/null"); -std::ostream cverb(fout.rdbuf()); - /** * get_options - process command line * @param argc program arg count @@ -77,10 +76,7 @@ parse_options(argc, argv, arg); - if (verbose) - cverb.rdbuf(std::cout.rdbuf()); - else - cverb.clear(std::ios::badbit); + set_verbose(verbose); if (options::with_more_than_samples && options::until_more_than_samples) { Index: oprofpp_options.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/oprofpp_options.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- oprofpp_options.cpp 7 Jun 2002 03:38:34 -0000 1.10 +++ oprofpp_options.cpp 9 Jun 2002 17:12:49 -0000 1.11 @@ -15,6 +15,7 @@ #include "oprofpp_options.h" #include "opp_symbol.h" #include "counter_util.h" +#include "cverb.h" #include <sstream> @@ -78,9 +79,6 @@ } // namespace anon -static std::ofstream fout("/dev/null"); -std::ostream cverb(fout.rdbuf()); - string const get_options(int argc, char const **argv) { /* non-option file, either a sample or binary image file */ @@ -90,10 +88,7 @@ counter_mask = parse_counter_mask(counter_str); - if (verbose) - cverb.rdbuf(std::cout.rdbuf()); - else - cverb.clear(std::ios::badbit); + set_verbose(verbose); if (!list_all_symbols_details && !list_symbols && gprof_file.empty() && symbol.empty()) |