From: John L. <mov...@us...> - 2003-05-29 00:15:32
|
Update of /cvsroot/oprofile/oprofile/pp In directory sc8-pr-cvs1:/tmp/cvs-serv22092/pp Modified Files: Tag: pp-interface-branch opannotate.cpp opreport.cpp Log Message: minor stuff ... Index: opannotate.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/Attic/opannotate.cpp,v retrieving revision 1.1.2.32 retrieving revision 1.1.2.33 diff -u -p -d -r1.1.2.32 -r1.1.2.33 --- opannotate.cpp 21 May 2003 19:34:01 -0000 1.1.2.32 +++ opannotate.cpp 29 May 2003 00:15:27 -0000 1.1.2.33 @@ -128,16 +128,16 @@ symbol_entry const * find_symbol(string void output_info(ostream & out) { - out << begin_comment << endl; + out << begin_comment << '\n'; - out << in_comment << "Command line: " << cmdline << endl - << in_comment << endl; + out << in_comment << "Command line: " << cmdline << '\n' + << in_comment << '\n'; - out << in_comment << "Interpretation of command line:" << endl; + out << in_comment << "Interpretation of command line:" << '\n'; if (!assembly) { out << in_comment - << "Output annotated source file with samples" << endl; + << "Output annotated source file with samples" << '\n'; // FIXME: re-add this #if 0 @@ -146,33 +146,33 @@ void output_info(ostream & out) out << in_comment << "Output files where the selected counter reach " << threshold_percent << "% of the samples" - << endl; + << '\n'; } else { out << in_comment << "output files until " << threshold_percent << "% of the samples is reached on the selected counter" - << endl; + << '\n'; } } else #endif { - out << in_comment << "Output all files" << endl; + out << in_comment << "Output all files" << '\n'; } } else { out << in_comment << "Output annotated assembly listing with samples" - << endl; + << '\n'; if (!objdump_params.empty()) { out << in_comment << "Passing the following " "additional arguments to objdump ; \""; for (size_t i = 0 ; i < objdump_params.size() ; ++i) out << objdump_params[i] << " "; - out << "\"" << endl; + out << "\"" << '\n'; } } - out << in_comment << endl; + out << in_comment << '\n'; stringstream stream; @@ -181,10 +181,10 @@ void output_info(ostream & out) string line; while (getline(stream, line)) { - out << in_comment << line << endl; + out << in_comment << line << '\n'; } - out << end_comment << endl; + out << end_comment << '\n'; } @@ -279,7 +279,7 @@ symbol_entry const * output_objdump_asm_ if (pos == str.length() || !isxdigit(str[pos])) { if (do_output) { - cout << annotation_fill << " :" << str << endl; + cout << annotation_fill << " :" << str << '\n'; return last_symbol; } } @@ -289,7 +289,7 @@ symbol_entry const * output_objdump_asm_ if (pos == str.length() || (!isspace(str[pos]) && str[pos] != ':')) { if (do_output) { - cout << annotation_fill << " :" << str << endl; + cout << annotation_fill << " :" << str << '\n'; return last_symbol; } } @@ -309,13 +309,13 @@ symbol_entry const * output_objdump_asm_ } if (do_output) - cout << str << symbol_annotation(last_symbol) << endl; + cout << str << symbol_annotation(last_symbol) << '\n'; } else { // not a symbol, probably an asm line. if (do_output) cout << asm_line_annotation(last_symbol, str) - << str << endl; + << str << '\n'; } return last_symbol; @@ -456,14 +456,14 @@ string source_symbol_annotation(string c void output_per_file_info(ostream & out, string const & filename, u32 total_count_for_file) { - out << begin_comment << endl + out << begin_comment << '\n' << in_comment << "Total samples for file : " << '"' << filename << '"' - << endl; - out << in_comment << endl << in_comment + << '\n'; + out << in_comment << '\n' << in_comment << counter_str(total_count_for_file, samples->samples_count()) - << endl; - out << end_comment << endl << endl; + << '\n'; + out << end_comment << '\n' << '\n'; } @@ -486,7 +486,7 @@ void do_output_one_file(ostream & out, i if (header) { output_per_file_info(out, filename, count); - out << line0_info(filename) << endl; + out << line0_info(filename) << '\n'; } @@ -512,7 +512,7 @@ void do_output_one_file(ostream & out, i if (!header) { output_per_file_info(out, filename, count); - out << line0_info(filename) << endl; + out << line0_info(filename) << '\n'; } } Index: opreport.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/Attic/opreport.cpp,v retrieving revision 1.1.2.58 retrieving revision 1.1.2.59 diff -u -p -d -r1.1.2.58 -r1.1.2.59 --- opreport.cpp 25 May 2003 23:44:49 -0000 1.1.2.58 +++ opreport.cpp 29 May 2003 00:15:27 -0000 1.1.2.59 @@ -126,7 +126,7 @@ void group_summary::output_deps(double t cout << " " << get_filename(cit->image_name); else cout << " " << get_filename(cit->lib_image); - cout << endl; + cout << '\n'; } } @@ -161,7 +161,7 @@ void group_summary::output(double total) if (options::merge_by.lib && !lib_image.empty()) image = lib_image; - cout << get_filename(image) << endl; + cout << get_filename(image) << '\n'; output_deps(total); } @@ -371,5 +371,6 @@ int opreport(vector<string> const & non_ int main(int argc, char const * argv[]) { + cout.tie(0); return run_pp_tool(argc, argv, opreport); } |
From: Philippe E. <ph...@wa...> - 2003-05-29 05:19:55
|
John Levon wrote: > Modified Files: > Tag: pp-interface-branch > opannotate.cpp opreport.cpp > Log Message: > minor stuff ... > > > > Index: opannotate.cpp > =================================================================== > RCS file: /cvsroot/oprofile/oprofile/pp/Attic/opannotate.cpp,v > retrieving revision 1.1.2.32 > retrieving revision 1.1.2.33 > diff -u -p -d -r1.1.2.32 -r1.1.2.33 > --- opannotate.cpp 21 May 2003 19:34:01 -0000 1.1.2.32 > +++ opannotate.cpp 29 May 2003 00:15:27 -0000 1.1.2.33 > @@ -128,16 +128,16 @@ symbol_entry const * find_symbol(string > > void output_info(ostream & out) > { > - out << begin_comment << endl; > + out << begin_comment << '\n'; patch was lost during merging, I applied it manually regards, Phil |