Menu
▾
▴
[oprof-cvs] CVS: oprofile/pp op_bfd.cpp,1.9,1.10 op_bfd.h,1.7,1.8 op_merge.cpp,1.17,1.18 op_time.cpp,1.48,1.49 op_to_source.cpp,1.7,1.8 opp_symbol.cpp,1.18,1.19 opp_symbol.h,1.15,1.16 oprofpp.cpp,1.62,1.63 oprofpp.h,1.66,1.67 oprofpp_util.cpp,1.62,1.63 samples_container.h,1.6,1.7 samples_file.h,1.8,1.9
|
From: Philippe E. <ph...@us...> - 2002-05-22 03:20:37
|
Update of /cvsroot/oprofile/oprofile/pp
In directory usw-pr-cvs1:/tmp/cvs-serv5701/pp
Modified Files:
op_bfd.cpp op_bfd.h op_merge.cpp op_time.cpp op_to_source.cpp
opp_symbol.cpp opp_symbol.h oprofpp.cpp oprofpp.h
oprofpp_util.cpp samples_container.h samples_file.h
Log Message:
gui:
libdb:
libopt++:
libutil:
libutil++:
oprof_report:
pp:
all C/c++ source/header file, fix a few doxygen warning,
many const type to type const + other minor comestic change.
no functionality change
Phil
Index: op_bfd.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/op_bfd.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- op_bfd.cpp 19 May 2002 02:49:56 -0000 1.9
+++ op_bfd.cpp 22 May 2002 03:20:34 -0000 1.10
@@ -20,7 +20,7 @@
using std::cout;
using std::endl;
-op_bfd::op_bfd(bool is_kernel, std::string const & filename)
+op_bfd::op_bfd(bool is_kernel, string const & filename)
:
ibfd(0),
bfd_syms(0),
@@ -53,7 +53,7 @@
* Failure to open the image a fatal
* gettings zero symbols from the image is not an error
*/
-void op_bfd::open_bfd_image(std::string const & filename, bool is_kernel)
+void op_bfd::open_bfd_image(string const & filename, bool is_kernel)
{
char **matching;
@@ -93,7 +93,7 @@
* symcomp - comparator
*
*/
-static bool symcomp(const op_bfd_symbol & a, const op_bfd_symbol & b)
+static bool symcomp(op_bfd_symbol const & a, op_bfd_symbol const & b)
{
return a.vma() < b.vma();
}
@@ -107,7 +107,7 @@
"_init"
};
-static const size_t nr_boring_symbols =
+static size_t const nr_boring_symbols =
sizeof(boring_symbols) / sizeof(boring_symbols[0]);
/**
@@ -170,14 +170,13 @@
// we can't fill the size member for now, because in
// some case it is calculated from the vma of the
// next symbol
- const asymbol * symbol = bfd_syms[i];
- struct op_bfd_symbol symb(op_bfd_symbol(
- symbol,
+ asymbol const * symbol = bfd_syms[i];
+ op_bfd_symbol symb(symbol,
symbol->value,
symbol->section->filepos,
symbol->section->vma,
0,
- symbol->name));
+ symbol->name);
syms.push_back(symb);
}
}
Index: op_bfd.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/op_bfd.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- op_bfd.h 19 May 2002 02:49:56 -0000 1.7
+++ op_bfd.h 22 May 2002 03:20:34 -0000 1.8
@@ -24,7 +24,7 @@
/** all symbol vector indexation use this type */
typedef size_t symbol_index_t;
-const symbol_index_t nil_symbol_index = symbol_index_t(-1);
+symbol_index_t const nil_symbol_index = symbol_index_t(-1);
/** a symbol description from a bfd point of view. This duplicate
* information pointed by an asymbol, we need this duplication in case
@@ -72,7 +72,8 @@
class op_bfd {
public:
/**
- * @param samples a valid samples file associated with this image
+ * @param is_kernel true if the image is a kernel module or a
+ * vmlinux file
* @param filename the name of the image file
*
* All error are fatal.
@@ -140,7 +141,7 @@
/**
* return the text section filepos if the bfd object is the kernel
* image or a module image, else return 0 */
- const u32 get_start_offset() const { return text_offset; }
+ u32 const get_start_offset() const { return text_offset; }
/** Returns true if the underlined bfd object contains debug info */
bool have_debug_info() const;
Index: op_merge.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/op_merge.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- op_merge.cpp 21 May 2002 23:49:16 -0000 1.17
+++ op_merge.cpp 22 May 2002 03:20:34 -0000 1.18
@@ -73,7 +73,7 @@
* all error are fatal.
*/
static void create_file_list(list<string> & result,
- const vector<string> & images_filename)
+ vector<string> const & images_filename)
{
/* user can not mix binary name and samples files name on the command
* line, this error is captured later because when more one filename
@@ -127,7 +127,7 @@
*
* all error are fatal
*/
-static void check_samples_files_list(const list<string> & filenames)
+static void check_samples_files_list(list<string> const & filenames)
{
if (filenames.empty())
return;
@@ -164,8 +164,8 @@
*
* all error are fatal
*/
-static void output_files(const std::string & filename,
- const list<string>& filenames)
+static void output_files(string const & filename,
+ list<string> const & filenames)
{
if (filenames.empty())
return;
Index: op_time.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/op_time.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- op_time.cpp 21 May 2002 23:49:16 -0000 1.48
+++ op_time.cpp 22 May 2002 03:20:34 -0000 1.49
@@ -55,7 +55,7 @@
/// image_name - class to store name for a samples file
struct image_name
{
- image_name(const string& samplefile_name);
+ image_name(string const & samplefile_name);
/// total number of samples for this samples file, this is a place
/// holder to avoid separate data struct which associate image_name
@@ -80,8 +80,8 @@
struct sort_by_counter_t {
sort_by_counter_t(size_t index_) : index(index_) {}
- bool operator()(const counter_array_t & lhs,
- const counter_array_t & rhs) const {
+ bool operator()(counter_array_t const & lhs,
+ counter_array_t const & rhs) const {
return lhs[index] < rhs[index];
}
@@ -133,7 +133,7 @@
* the set of alternative filename used to retrieve image name when
* a samples image name directory is not accurate
*/
-void add_to_alternate_filename(const vector<string> & path_names,
+void add_to_alternate_filename(vector<string> const & path_names,
bool recursive)
{
vector<string>::const_iterator path;
@@ -234,7 +234,7 @@
/**
* image_name - ctor from a sample file name
*/
-image_name::image_name(const string& samplefile_name)
+image_name::image_name(string const & samplefile_name)
:
samplefile_name(samplefile_name)
{
@@ -247,7 +247,7 @@
*
* return true if filename exist
*/
-static bool file_exist(const std::string & filename)
+static bool file_exist(string const & filename)
{
ifstream in(filename.c_str());
@@ -279,7 +279,7 @@
* treated as application
*/
static void sort_file_list_by_name(map_t & result,
- const list<string> & file_list)
+ list<string> const & file_list)
{
list<string>::const_iterator it;
for (it = file_list.begin() ; it != file_list.end() ; ++it) {
@@ -290,7 +290,7 @@
int i;
for (i = 0 ; i < OP_MAX_COUNTERS ; ++i) {
if ((counter & (1 << i)) != 0) {
- std::ostringstream s;
+ ostringstream s;
s << string(samples_dir) << "/" << *it
<< '#' << i;
if (file_exist(s.str()) == true) {
@@ -310,9 +310,9 @@
/**
* out_filename - display a filename and it associated ratio of samples
*/
-static void out_filename(const string& app_name,
- const counter_array_t & app_count,
- const counter_array_t & count,
+static void out_filename(string const & app_name,
+ counter_array_t const & app_count,
+ counter_array_t const & count,
double total_count[OP_MAX_COUNTERS])
{
for (size_t i = 0 ; i < OP_MAX_COUNTERS; ++i) {
@@ -367,7 +367,7 @@
*/
template <class Iterator>
static void output_image_samples_count(Iterator first, Iterator last,
- const counter_array_t & app_count,
+ counter_array_t const & app_count,
double total_count[OP_MAX_COUNTERS])
{
for (Iterator it = first ; it != last ; ++it) {
@@ -420,7 +420,7 @@
// it.first->first
for ( ; p_it.first != p_it.second ; ++p_it.first) {
for (int i = 0 ; i < OP_MAX_COUNTERS ; ++i) {
- std::ostringstream s;
+ ostringstream s;
s << string(samples_dir) << "/"
<< p_it.first->second.samplefile_name
<< "#" << i;
@@ -530,8 +530,8 @@
* exist. If not it try to retrieve it through the alternate_filename
* location.
*/
-string check_image_name(const string & image_name,
- const string & samples_filename)
+string check_image_name(string const & image_name,
+ string const & samples_filename)
{
// FIXME: this isn't polite enough for a permissions problem.
if (file_exist(image_name))
@@ -617,7 +617,7 @@
}
// select the symbols
- vector<const symbol_entry *> symbols =
+ vector<symbol_entry const *> symbols =
samples.select_symbols(sort_by_counter, 0.0, false);
OutputSymbol out(samples, counter);
Index: op_to_source.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/op_to_source.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- op_to_source.cpp 21 May 2002 23:49:16 -0000 1.7
+++ op_to_source.cpp 22 May 2002 03:20:34 -0000 1.8
@@ -50,7 +50,7 @@
// Free function.
namespace {
-string extract_blank_at_begin(const string & str);
+string extract_blank_at_begin(string const & str);
double do_ratio(size_t a, size_t total);
@@ -91,43 +91,43 @@
~output();
- bool treat_input(const string & image_name, const string & sample_file);
+ bool treat_input(string const & image_name, string const & sample_file);
private:
/// this output a comment containaing the counter setup and command
/// line.
void output_header(ostream & out) const;
- void output_asm(const string & image_name);
- void output_objdump_asm_line(const std::string & str,
- const vector<const symbol_entry *> & output_symbols,
+ void output_asm(string const & image_name);
+ void output_objdump_asm_line(string const & str,
+ vector<symbol_entry const *> const & output_symbols,
bool & do_output);
- void output_objdump_asm(const vector<const symbol_entry *> & output_symbols, const string & app_name);
- void output_dasm_asm(const vector<const symbol_entry *> & output_symbols, const string & image_name);
+ void output_objdump_asm(vector<const symbol_entry *> const & output_symbols, string const & app_name);
+ void output_dasm_asm(vector<const symbol_entry *> const & output_symbols, string const & image_name);
void output_source();
// output one file unconditionally.
- void output_one_file(istream & in, const string & filename,
- const counter_array_t & total_samples_for_file);
- void do_output_one_file(ostream & out, istream & in, const string & filename,
- const counter_array_t & total_samples_for_file);
+ void output_one_file(istream & in, string const & filename,
+ counter_array_t const & total_samples_for_file);
+ void do_output_one_file(ostream & out, istream & in, string const & filename,
+ counter_array_t const & total_samples_for_file);
- bool setup_counter_param(const opp_samples_files & samples_files);
+ bool setup_counter_param(opp_samples_files const & samples_files);
bool calc_total_samples();
- void output_counter_for_file(ostream & out, const string & filename,
+ void output_counter_for_file(ostream & out, string const & filename,
const counter_array_t& count);
void output_counter(ostream & out, const counter_array_t & counter,
- bool comment, const string & prefix = string()) const;
+ bool comment, string const & prefix = string()) const;
void output_one_counter(ostream & out, size_t counter, size_t total) const;
- void find_and_output_symbol(ostream & out, const string & str,
- const string & blank) const;
- void find_and_output_counter(ostream & out, const string & str,
- const string & blank) const;
+ void find_and_output_symbol(ostream & out, string const & str,
+ string const & blank) const;
+ void find_and_output_counter(ostream & out, string const & str,
+ string const & blank) const;
- void find_and_output_counter(ostream & out, const string & filename,
- size_t linenr, const string & blank) const;
+ void find_and_output_counter(ostream & out, string const & filename,
+ size_t linenr, string const & blank) const;
size_t get_sort_counter_nr() const;
@@ -178,7 +178,7 @@
namespace {
// Return the substring at beginning of str which is only made of blank or tabulation.
-string extract_blank_at_begin(const string & str)
+string extract_blank_at_begin(string const & str)
{
size_t end_pos = str.find_first_not_of(" \t");
if (end_pos == string::npos)
@@ -282,7 +282,7 @@
}
// build a counter_setup from a header.
-bool output::setup_counter_param(const opp_samples_files & samples_files)
+bool output::setup_counter_param(opp_samples_files const & samples_files)
{
bool have_counter_info = false;
@@ -325,8 +325,8 @@
out << std::setprecision(4) << (do_ratio(counter, total) * 100.0) << "%";
}
-void output::output_counter(ostream & out, const counter_array_t & counter,
- bool comment, const string & prefix) const
+void output::output_counter(ostream & out, counter_array_t const & counter,
+ bool comment, string const & prefix) const
{
if (comment)
out << begin_comment;
@@ -348,11 +348,11 @@
}
// Complexity: log(nr symbols)
-void output::find_and_output_symbol(ostream & out, const string & str, const string & blank) const
+void output::find_and_output_symbol(ostream & out, string const & str, string const & blank) const
{
bfd_vma vma = strtoul(str.c_str(), NULL, 16);
- const symbol_entry* symbol = samples->find_symbol(vma);
+ symbol_entry const * symbol = samples->find_symbol(vma);
if (symbol) {
out << blank;
@@ -361,11 +361,11 @@
}
// Complexity: log(nr samples))
-void output::find_and_output_counter(ostream & out, const string & str, const string & blank) const
+void output::find_and_output_counter(ostream & out, string const & str, string const & blank) const
{
bfd_vma vma = strtoul(str.c_str(), NULL, 16);
- const sample_entry * sample = samples->find_sample(vma);
+ sample_entry const * sample = samples->find_sample(vma);
if (sample) {
out << blank;
output_counter(out, sample->counter, true, string());
@@ -373,9 +373,9 @@
}
// Complexity: log(nr symbols) + log(nr filename/linenr)
-void output::find_and_output_counter(ostream & out, const string & filename, size_t linenr, const string & blank) const
+void output::find_and_output_counter(ostream & out, string const & filename, size_t linenr, string const & blank) const
{
- const symbol_entry * symbol = samples->find_symbol(filename, linenr);
+ symbol_entry const * symbol = samples->find_symbol(filename, linenr);
if (symbol)
output_counter(out, symbol->sample.counter, true,
demangle_symbol(symbol->name));
@@ -396,8 +396,8 @@
*
*/
void output::
-output_objdump_asm_line(const std::string & str,
- const vector<const symbol_entry *> & output_symbols,
+output_objdump_asm_line(string const & str,
+ vector<symbol_entry const *> const & output_symbols,
bool & do_output)
{
// output of objdump is a human read-able form and can contain some
@@ -431,7 +431,7 @@
// strtoul must work (assuming unsigned long can contain a vma)
bfd_vma vma = strtoul(str.c_str(), NULL, 16);
- const symbol_entry* symbol = samples->find_symbol(vma);
+ symbol_entry const * symbol = samples->find_symbol(vma);
// ! complexity: linear in number of symbol must use sorted
// by address vector and lower_bound ?
@@ -469,7 +469,7 @@
* This is the generic implementation if our own disassembler
* do not work for this architecture.
*/
-void output::output_objdump_asm(const vector<const symbol_entry *> & output_symbols, const string & app_name)
+void output::output_objdump_asm(vector<symbol_entry const *> const & output_symbols, string const & app_name)
{
vector<string> args;
args.push_back("-d");
@@ -513,17 +513,17 @@
* Output asm (optionnaly mixed with source) annotated
* with samples using dasm as external disassembler.
*/
-void output::output_dasm_asm(const vector<const symbol_entry *> & /*output_symbols*/, const string & /*image_name*/)
+void output::output_dasm_asm(vector<symbol_entry const *> const & /*output_symbols*/, string const & /*image_name*/)
{
// Not yet implemented :/
}
-void output::output_asm(const string & image_name)
+void output::output_asm(string const & image_name)
{
// select the subset of symbols which statisfy the user requests
size_t index = get_sort_counter_nr();
- vector<const symbol_entry *> output_symbols;
+ vector<symbol_entry const *> output_symbols;
double threshold = threshold_percent / 100.0;
@@ -535,8 +535,8 @@
output_objdump_asm(output_symbols, image_name);
}
-void output::output_counter_for_file(ostream& out, const string & filename,
- const counter_array_t & total_count_for_file)
+void output::output_counter_for_file(ostream& out, string const & filename,
+ counter_array_t const & total_count_for_file)
{
out << begin_comment << endl
<< " Total samples for file : " << '"' << filename << '"'
@@ -551,8 +551,8 @@
// Post condition:
// the entire file source and the associated samples has been output to
// the standard output.
-void output::output_one_file(istream & in, const string & filename,
- const counter_array_t & total_count_for_file)
+void output::output_one_file(istream & in, string const & filename,
+ counter_array_t const & total_count_for_file)
{
if (!output_separate_file) {
do_output_one_file(cout, in, filename, total_count_for_file);
@@ -609,8 +609,8 @@
// the entire file source and the associated samples has been output to
// the standard output.
void output::do_output_one_file(ostream& out, istream & in,
- const string & filename,
- const counter_array_t & total_count_for_file)
+ string const & filename,
+ counter_array_t const & total_count_for_file)
{
output_counter_for_file(out, filename, total_count_for_file);
@@ -729,7 +729,7 @@
out << endl;
}
-bool output::treat_input(const string & image_name, const string & sample_file)
+bool output::treat_input(string const & image_name, string const & sample_file)
{
// this lexcical scope just optimize the memory use by relaxing
// the op_bfd and opp_samples_files as short as we can.
@@ -885,7 +885,7 @@
return EXIT_FAILURE;
}
- catch (const string & e) {
+ catch (string const & e) {
cerr << "op_to_source: Exception : " << e << endl;
return EXIT_FAILURE;
}
Index: opp_symbol.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/opp_symbol.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- opp_symbol.cpp 15 May 2002 01:53:52 -0000 1.18
+++ opp_symbol.cpp 22 May 2002 03:20:34 -0000 1.19
@@ -32,7 +32,7 @@
char const * help_string;
};
-static const output_option output_options[] = {
+static output_option const output_options[] = {
{ 'v', osf_vma, "vma offset" },
{ 's', osf_nr_samples, "nr samples" },
{ 'S', osf_nr_samples_cumulated, "nr cumulated samples" },
@@ -50,9 +50,9 @@
{ 'd', osf_details, "detailed samples for each selected symbol" }
};
-const size_t nr_output_option = sizeof(output_options) / sizeof(output_options[0]);
+size_t const nr_output_option = sizeof(output_options) / sizeof(output_options[0]);
-static const output_option * find_option(char ch)
+static output_option const * find_option(char ch)
{
for (size_t i = 0 ; i < nr_output_option ; ++i) {
if (ch == output_options[i].option) {
@@ -63,11 +63,11 @@
return 0;
}
-OutSymbFlag OutputSymbol::ParseOutputOption(const string & option)
+OutSymbFlag OutputSymbol::ParseOutputOption(string const & option)
{
size_t flag = 0;
for (size_t i = 0 ; i < option.length() ; ++i) {
- const output_option * opt = find_option(option[i]);
+ output_option const * opt = find_option(option[i]);
if (!opt)
return osf_none;
flag |= opt->flag;
@@ -84,8 +84,8 @@
}
}
-typedef string (OutputSymbol::*fct_format)(const string & symb_name,
- const sample_entry & symb,
+typedef string (OutputSymbol::*fct_format)(string const & symb_name,
+ sample_entry const & symb,
size_t ctr);
/// decribe one field of the colummned output.
@@ -102,7 +102,7 @@
// ratio between 100 and the selected % to grow non fixed field use also
// lib[n?]curses to get the console width (look info source) (so on add a fixed
// field flags)
-static const field_description field_descr[] = {
+static field_description const field_descr[] = {
{ osf_vma, 9,
"vma", &OutputSymbol::format_vma },
{ osf_nr_samples, 9,
@@ -127,9 +127,9 @@
&OutputSymbol::format_short_image_name },
};
-const size_t nr_field_descr = sizeof(field_descr) / sizeof(field_descr[0]);
+size_t const nr_field_descr = sizeof(field_descr) / sizeof(field_descr[0]);
-OutputSymbol::OutputSymbol(const samples_container_t & samples_container_,
+OutputSymbol::OutputSymbol(samples_container_t const & samples_container_,
int counter_)
:
flags(osf_none),
@@ -144,7 +144,7 @@
}
}
-const field_description * OutputSymbol::GetFieldDescr(OutSymbFlag flag)
+field_description const * OutputSymbol::GetFieldDescr(OutSymbFlag flag)
{
for (size_t i = 0 ; i < nr_field_descr ; ++i) {
if (flag == field_descr[i].flag)
@@ -159,12 +159,12 @@
flags = static_cast<OutSymbFlag>(flags | flag);
}
-size_t OutputSymbol::OutputField(std::ostream & out, const std::string & name,
- const sample_entry & sample,
- OutSymbFlag fl, size_t ctr)
+size_t OutputSymbol::OutputField(ostream & out, string const & name,
+ sample_entry const & sample,
+ OutSymbFlag fl, size_t ctr)
{
size_t sz = 0;
- const field_description * field = GetFieldDescr(fl);
+ field_description const * field = GetFieldDescr(fl);
if (field) {
string str = (this->*field->formater)(name, sample, ctr);
out << str;
@@ -177,10 +177,10 @@
return sz;
}
-size_t OutputSymbol::OutputHeaderField(std::ostream & out, OutSymbFlag fl)
+size_t OutputSymbol::OutputHeaderField(ostream & out, OutSymbFlag fl)
{
size_t sz = 0;
- const field_description * field = GetFieldDescr(fl);
+ field_description const * field = GetFieldDescr(fl);
if (field) {
out << field->header_name;
@@ -192,7 +192,7 @@
return sz;
}
-void OutputSymbol::Output(std::ostream & out, const symbol_entry * symb)
+void OutputSymbol::Output(ostream & out, symbol_entry const * symb)
{
DoOutput(out, symb->name, symb->sample, flags);
@@ -201,7 +201,7 @@
}
}
-void OutputSymbol::OutputDetails(std::ostream & out, const symbol_entry * symb)
+void OutputSymbol::OutputDetails(ostream & out, symbol_entry const * symb)
{
// We need to save the accumulated count and to restore it on
// exit so global cumulation and detailed cumulation are separate
@@ -233,8 +233,8 @@
}
}
-void OutputSymbol::DoOutput(std::ostream & out, const std::string & name,
- const sample_entry & sample, OutSymbFlag flag)
+void OutputSymbol::DoOutput(ostream & out, string const & name,
+ sample_entry const & sample, OutSymbFlag flag)
{
OutputHeader(out);
@@ -274,7 +274,7 @@
last_field_pad = OutputField(out, name, sample, fl, 0);
temp_flag &= ~(1 << i);
} else if ((true_flags & fl) != 0) {
- const field_description * field = GetFieldDescr(fl);
+ field_description const * field = GetFieldDescr(fl);
if (field) {
last_field_pad += field->width;
}
@@ -284,7 +284,7 @@
out << "\n";
}
-void OutputSymbol::OutputHeader(std::ostream & out)
+void OutputSymbol::OutputHeader(ostream & out)
{
if (first_output == false) {
return;
@@ -335,25 +335,25 @@
out << "\n";
}
-void OutputSymbol::Output(std::ostream & out,
- const std::vector<const symbol_entry *> & symbols,
+void OutputSymbol::Output(ostream & out,
+ vector<symbol_entry const *> const & symbols,
bool reverse)
{
if (reverse) {
- vector<const symbol_entry*>::const_reverse_iterator it;
+ vector<symbol_entry const *>::const_reverse_iterator it;
for (it = symbols.rbegin(); it != symbols.rend(); ++it) {
Output(out, *it);
}
} else {
- vector<const symbol_entry*>::const_iterator it;
+ vector<symbol_entry const *>::const_iterator it;
for (it = symbols.begin(); it != symbols.end(); ++it) {
Output(out, *it);
}
}
}
-string OutputSymbol::format_vma(const std::string &,
- const sample_entry & sample, size_t)
+string OutputSymbol::format_vma(string const &,
+ sample_entry const & sample, size_t)
{
ostringstream out;
@@ -362,29 +362,29 @@
return out.str();
}
-string OutputSymbol::format_symb_name(const std::string & name,
- const sample_entry &, size_t)
+string OutputSymbol::format_symb_name(string const & name,
+ sample_entry const &, size_t)
{
int const is_anon = name[0] == '?';
return is_anon ? string("(no symbol)") : demangle_symbol(name);
}
-string OutputSymbol::format_image_name(const std::string &,
- const sample_entry & sample, size_t)
+string OutputSymbol::format_image_name(string const &,
+ sample_entry const & sample, size_t)
{
return sample.file_loc.image_name;
}
-string OutputSymbol::format_short_image_name(const std::string &,
- const sample_entry & sample,
+string OutputSymbol::format_short_image_name(string const &,
+ sample_entry const & sample,
size_t)
{
return basename(sample.file_loc.image_name);
}
-string OutputSymbol::format_linenr_info(const std::string &,
- const sample_entry & sample, size_t)
+string OutputSymbol::format_linenr_info(string const &,
+ sample_entry const & sample, size_t)
{
ostringstream out;
@@ -398,8 +398,8 @@
return out.str();
}
-string OutputSymbol::format_short_linenr_info(const std::string &,
- const sample_entry & sample,
+string OutputSymbol::format_short_linenr_info(string const &,
+ sample_entry const & sample,
size_t)
{
ostringstream out;
@@ -414,8 +414,8 @@
return out.str();
}
-string OutputSymbol::format_nr_samples(const std::string &,
- const sample_entry & sample, size_t ctr)
+string OutputSymbol::format_nr_samples(string const &,
+ sample_entry const & sample, size_t ctr)
{
ostringstream out;
@@ -424,8 +424,8 @@
return out.str();
}
-string OutputSymbol::format_nr_cumulated_samples(const std::string &,
- const sample_entry & sample,
+string OutputSymbol::format_nr_cumulated_samples(string const &,
+ sample_entry const & sample,
size_t ctr)
{
ostringstream out;
@@ -437,8 +437,8 @@
return out.str();
}
-string OutputSymbol::format_percent(const std::string &,
- const sample_entry & sample, size_t ctr)
+string OutputSymbol::format_percent(string const &,
+ sample_entry const & sample, size_t ctr)
{
ostringstream out;
@@ -451,8 +451,8 @@
return out.str();
}
-string OutputSymbol::format_cumulated_percent(const std::string &,
- const sample_entry & sample,
+string OutputSymbol::format_cumulated_percent(string const &,
+ sample_entry const & sample,
size_t ctr)
{
ostringstream out;
Index: opp_symbol.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/opp_symbol.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- opp_symbol.h 10 May 2002 18:42:42 -0000 1.15
+++ opp_symbol.h 22 May 2002 03:20:34 -0000 1.16
@@ -35,7 +35,7 @@
/// 0 means invalid or code is generated internally by the compiler
int linenr;
- bool operator<(const file_location & rhs) const {
+ bool operator<(file_location const & rhs) const {
return filename < rhs.filename ||
(filename == rhs.filename && linenr < rhs.linenr);
}
@@ -108,74 +108,74 @@
/**
* class to output in a columned format symbols and associated samples
*/
-/// FIXME: output_symbol not OutputSymbol ?? consistency ...
+// FIXME: output_symbol not OutputSymbol ?? consistency ...
class OutputSymbol {
public:
/// build an OutputSymbol object, the samples_container_t life time
/// object must be > of the life time of the OutputSymbol object.
- OutputSymbol(const samples_container_t & samples_container, int counter);
+ OutputSymbol(samples_container_t const & samples_container, int counter);
/// convenience to set output options flags w/o worrying about cast
void SetFlag(OutSymbFlag flag);
/** output one symbol symb to out according to the output format
* specifier previously set by call(s) to SetFlag() */
- void Output(std::ostream & out, const symbol_entry * symb);
+ void Output(std::ostream & out, symbol_entry const * symb);
/** output a vector of symbols to out according to the output format
* specifier previously set by call(s) to SetFlag() */
void Output(std::ostream & out,
- const std::vector<const symbol_entry *> & v, bool reverse);
+ std::vector<symbol_entry const *> const & v, bool reverse);
/** output to stdout the formating options available */
static void ShowHelp();
/** return osf_none if the option string is ill formed, so you can call
* OutputSymbol::ShowHelp() to notify user on available options */
- static OutSymbFlag ParseOutputOption(const std::string & option);
+ static OutSymbFlag ParseOutputOption(std::string const & option);
/** @defgroup format The set of formatting functions, used internally by Output().
* Exposed as public members for the future oprofpp GUI.
*/
//@{
- std::string format_vma(const std::string & name,
- const sample_entry & sample, size_t);
- std::string format_symb_name(const std::string & name,
- const sample_entry & sample, size_t);
- std::string format_image_name(const std::string & name,
- const sample_entry & sample, size_t);
- std::string format_short_image_name(const std::string & name,
- const sample_entry & sample,
+ std::string format_vma(std::string const & name,
+ sample_entry const & sample, size_t);
+ std::string format_symb_name(std::string const & name,
+ sample_entry const & sample, size_t);
+ std::string format_image_name(std::string const & name,
+ sample_entry const & sample, size_t);
+ std::string format_short_image_name(std::string const & name,
+ sample_entry const & sample,
size_t);
- std::string format_linenr_info(const std::string & name,
- const sample_entry & sample, size_t);
- std::string format_short_linenr_info(const std::string & name,
- const sample_entry & sample,
+ std::string format_linenr_info(std::string const & name,
+ sample_entry const & sample, size_t);
+ std::string format_short_linenr_info(std::string const & name,
+ sample_entry const & sample,
size_t);
- std::string format_nr_samples(const std::string & name,
- const sample_entry & sample, size_t ctr);
- std::string format_nr_cumulated_samples(const std::string & name,
- const sample_entry & sample, size_t);
- std::string format_percent(const std::string & name,
- const sample_entry & sample, size_t);
- std::string format_cumulated_percent(const std::string & name,
- const sample_entry & sample,
+ std::string format_nr_samples(std::string const & name,
+ sample_entry const & sample, size_t ctr);
+ std::string format_nr_cumulated_samples(std::string const & name,
+ sample_entry const & sample, size_t);
+ std::string format_percent(std::string const & name,
+ sample_entry const & sample, size_t);
+ std::string format_cumulated_percent(std::string const & name,
+ sample_entry const & sample,
size_t);
//@}
private:
- void DoOutput(std::ostream & out, const std::string & name,
- const sample_entry & sample, OutSymbFlag flags);
- void OutputDetails(std::ostream & out, const symbol_entry * symb);
+ void DoOutput(std::ostream & out, std::string const & name,
+ sample_entry const & sample, OutSymbFlag flags);
+ void OutputDetails(std::ostream & out, symbol_entry const * symb);
void OutputHeader(std::ostream & out);
// return the nr of char needed to padd this field
- size_t OutputField(std::ostream & out, const std::string & name,
- const sample_entry & sample,
+ size_t OutputField(std::ostream & out, std::string const & name,
+ sample_entry const & sample,
OutSymbFlag fl, size_t ctr);
// return the nr of char needed to padd this field
size_t OutputHeaderField(std::ostream & out, OutSymbFlag fl);
- static const field_description * GetFieldDescr(OutSymbFlag flag);
+ static field_description const * GetFieldDescr(OutSymbFlag flag);
OutSymbFlag flags;
- const samples_container_t & samples_container;
+ samples_container_t const & samples_container;
u32 total_count[OP_MAX_COUNTERS];
u32 cumulated_samples[OP_MAX_COUNTERS];
u32 cumulated_percent[OP_MAX_COUNTERS];
Index: oprofpp.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/oprofpp.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- oprofpp.cpp 22 May 2002 00:46:01 -0000 1.62
+++ oprofpp.cpp 22 May 2002 03:20:34 -0000 1.63
@@ -72,7 +72,7 @@
* opp_treat_options().
*
*/
-static void opp_get_options(int argc, const char **argv, string & image_file,
+static void opp_get_options(int argc, char const **argv, string & image_file,
string & sample_file, int & counter)
{
/* non-option file, either a sample or binary image file */
@@ -142,7 +142,7 @@
static void do_list_symbols(samples_container_t & samples,
OutputSymbol & out, int sort_by_ctr)
{
- vector<const symbol_entry *> symbols =
+ vector<symbol_entry const *> symbols =
samples.select_symbols(sort_by_ctr, 0.0, false);
out.Output(cout, symbols, reverse_sort == 0);
@@ -161,7 +161,7 @@
static void do_list_symbols_details(samples_container_t & samples,
OutputSymbol & out, int sort_by_ctr)
{
- vector<const symbol_entry *> symbols =
+ vector<symbol_entry const *> symbols =
samples.select_symbols(sort_by_ctr, 0.0, false, true);
out.Output(cout, symbols, false);
@@ -211,7 +211,7 @@
* this use the grpof format <= gcc 3.0
*/
static void do_dump_gprof(op_bfd & abfd,
- const opp_samples_files & samples_files,
+ opp_samples_files const & samples_files,
int sort_by_ctr)
{
static gmon_hdr hdr = { { 'g', 'm', 'o', 'n' }, GMON_VERSION, {0,0,0,},};
@@ -286,7 +286,7 @@
*
* return true if filename exist
*/
-static bool file_exist(const std::string & filename)
+static bool file_exist(string const & filename)
{
ifstream in(filename.c_str());
return in;
@@ -349,7 +349,7 @@
int i;
for (i = 0 ; i < OP_MAX_COUNTERS ; ++i) {
if ((counter & (1 << i)) != 0) {
- std::ostringstream s;
+ ostringstream s;
s << *it << '#' << i;
if (file_exist(s.str()) == true) {
break;
Index: oprofpp.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/oprofpp.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- oprofpp.h 21 May 2002 23:49:16 -0000 1.66
+++ oprofpp.h 22 May 2002 03:20:34 -0000 1.67
@@ -29,7 +29,6 @@
#include "db.h"
#include "op_interface.h"
-#include "op_popt.h"
#include "op_sample_file.h"
#include "op_hw_config.h"
#include "op_bfd.h"
@@ -69,7 +68,6 @@
/**
* process command line options
* @param filename a filename passed on the command line, can be NULL
- * @param optcon poptContext to allow better message handling
* @param image_file where to store the image file name
* @param sample_file ditto for sample filename
* @param counter where to put the counter command line argument
@@ -102,18 +100,18 @@
/**
* remangle - convert a filename into the related sample file name
- * @param image the image filename
+ * @param filename the filename string
*/
std::string remangle(std::string const & filename);
/**
* convert a sample filenames into the related image file name
- * @param sample_filename the samples image filename
+ * @param samples_filename the samples image filename
*
* if samples_filename does not contain any %OPD_MANGLE_CHAR
* the string samples_filename itself is returned.
*/
-std::string demangle_filename(const std::string & samples_filename);
+std::string demangle_filename(std::string const & samples_filename);
/**
* check if the symbol is in the exclude list
@@ -121,7 +119,7 @@
*
* return true if symbol is in the list of excluded symbol
*/
-bool is_excluded_symbol(const std::string & symbol);
+bool is_excluded_symbol(std::string const & symbol);
/**
* sanity check of a struct opd_header *
@@ -129,7 +127,7 @@
*
* all error are fatal
*/
-void check_event(const opd_header * header);
+void check_event(opd_header const * header);
/**
* validate the counter number
@@ -145,10 +143,10 @@
* representing each counter. Bit i is on if counter i was specified.
* So we allow up to sizeof(uint) * CHAR_BIT different counter
*/
-uint counter_mask(const std::string &);
+uint counter_mask(std::string const &);
/**
- * @param samples_file the samples files
+ * @param samples the samples files
* @param image_name the image filename
*
* check than the modification time of image_name is the same as provided
@@ -188,7 +186,7 @@
}
/** vectorised += operator */
- counter_array_t & operator+=(const counter_array_t & rhs);
+ counter_array_t & operator+=(counter_array_t const & rhs);
private:
u32 value[OP_MAX_COUNTERS];
Index: oprofpp_util.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/oprofpp_util.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- oprofpp_util.cpp 21 May 2002 23:49:16 -0000 1.62
+++ oprofpp_util.cpp 22 May 2002 03:20:34 -0000 1.63
@@ -77,15 +77,11 @@
}
}
-/**
- * remangle - convert a filename into the related sample file name
- * @param image the image filename
- */
string remangle(string const & filename)
{
string result = filename;
- replace(result.begin(), result.end(), '/', OPD_MANGLE_CHAR);
+ std::replace(result.begin(), result.end(), '/', OPD_MANGLE_CHAR);
return result;
}
@@ -98,11 +94,11 @@
* if samples_filename does not contain any %OPD_MANGLE_CHAR
* the string samples_filename itself is returned.
*/
-std::string demangle_filename(const std::string & samples_filename)
+string demangle_filename(string const & samples_filename)
{
- std::string result(samples_filename);
+ string result(samples_filename);
size_t pos = samples_filename.find_first_of(OPD_MANGLE_CHAR);
- if (pos != std::string::npos) {
+ if (pos != string::npos) {
result.erase(0, pos);
std::replace(result.begin(), result.end(), OPD_MANGLE_CHAR, '/');
}
@@ -116,7 +112,7 @@
*
* return true if symbol is in the list of excluded symbol
*/
-bool is_excluded_symbol(const std::string & symbol)
+bool is_excluded_symbol(string const & symbol)
{
return std::find(exclude_symbols.begin(), exclude_symbols.end(),
symbol) != exclude_symbols.end();
@@ -275,7 +271,7 @@
* representing each counter. Bit i is on if counter i was specified.
* So we allow up to sizeof(uint) * CHAR_BIT different counter
*/
-uint counter_mask(const std::string & str)
+uint counter_mask(string const & str)
{
vector<string> result;
separate_token(result, str, ',');
@@ -297,7 +293,7 @@
value[i] = 0;
}
-counter_array_t & counter_array_t::operator+=(const counter_array_t & rhs)
+counter_array_t & counter_array_t::operator+=(counter_array_t const & rhs)
{
for (size_t i = 0 ; i < OP_MAX_COUNTERS ; ++i)
value[i] += rhs.value[i];
@@ -305,7 +301,7 @@
return *this;
}
-void check_event(const struct opd_header * header)
+void check_event(opd_header const * header)
{
char * ctr_name;
char * ctr_desc;
Index: samples_container.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/samples_container.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- samples_container.h 15 May 2002 18:32:17 -0000 1.6
+++ samples_container.h 22 May 2002 03:20:34 -0000 1.7
@@ -33,9 +33,6 @@
* on what will be required as information in future. Avoid to pass
* osf_linenr_info greatly improve performance of add. Avoiding
* osf_details is also an improvement.
- * @param add_shared_libs record to the set of symbols/samples shared
- * libs which belongs to this image, only meaningfull if samples files
- * come from a --separate-samples session
* @param counter_mask which counter we must record
*/
samples_container_t(bool add_zero_samples_symbols, OutSymbFlag flags,
@@ -52,7 +49,7 @@
* Obviously you can add only samples files which are coherent (same
* sampling rate, same events etc.)
*/
- void add(const opp_samples_files & samples_files, const op_bfd & abfd);
+ void add(opp_samples_files const & samples_files, op_bfd const & abfd);
/// Find a symbol from its vma, return zero if no symbol at this vma
symbol_entry const * find_symbol(bfd_vma vma) const;
@@ -62,7 +59,7 @@
/// Find a symbol from its filename, linenr, return zero if no symbol
/// at this location
- symbol_entry const * find_symbol(const std::string & filename,
+ symbol_entry const * find_symbol(std::string const & filename,
size_t linenr) const;
/// Find a sample by its vma, return zero if no sample at this vma
Index: samples_file.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/samples_file.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- samples_file.h 16 May 2002 04:34:22 -0000 1.8
+++ samples_file.h 22 May 2002 03:20:34 -0000 1.9
@@ -147,7 +147,7 @@
/**
* accumulate_samples - lookup samples from a vma address
* @param counter where to accumulate the samples
- * @param index index of the samples.
+ * @param vma index of the samples.
*
* return false if no samples has been found
*/
@@ -173,7 +173,7 @@
void output_header() const;
/// return the header of the first opened samples file
- struct opd_header const & first_header() const {
+ opd_header const & first_header() const {
return samples[first_file]->header();
}
|