Update of /cvsroot/oprofile/oprofile/libpp In directory sc8-pr-cvs1:/tmp/cvs-serv13347/libpp Modified Files: count_array.cpp count_array.h locate_images.h parse_filename.cpp profile.cpp profile.h profile_spec.cpp symbol_sort.cpp Log Message: minor tidy Index: count_array.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/count_array.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -d -r1.4 -r1.5 --- count_array.cpp 14 Sep 2003 02:31:18 -0000 1.4 +++ count_array.cpp 28 Oct 2003 06:27:53 -0000 1.5 @@ -16,11 +16,6 @@ using namespace std; -count_array_t::count_array_t() -{ -} - - u32 count_array_t::operator[](size_type index) const { if (index >= container.size()) @@ -42,7 +37,8 @@ count_array_t & count_array_t::operator+ if (rhs.container.size() > container.size()) container.resize(rhs.container.size()); - for (size_type i = 0 ; i < min(container.size(), rhs.container.size()); ++i) + size_type min_size = min(container.size(), rhs.container.size()); + for (size_type i = 0 ; i < min_size; ++i) container[i] += rhs.container[i]; return *this; @@ -54,7 +50,8 @@ count_array_t & count_array_t::operator- if (rhs.container.size() > container.size()) container.resize(rhs.container.size()); - for (size_type i = 0 ; i < min(container.size(), rhs.container.size()); ++i) + size_type min_size = min(container.size(), rhs.container.size()); + for (size_type i = 0 ; i < min_size; ++i) container[i] -= rhs.container[i]; return *this; Index: count_array.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/count_array.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -d -r1.4 -r1.5 --- count_array.h 21 Sep 2003 02:44:47 -0000 1.4 +++ count_array.h 28 Oct 2003 06:27:53 -0000 1.5 @@ -23,9 +23,6 @@ */ class count_array_t { public: - /// all counts are intialized to zero - count_array_t(); - typedef std::vector<u32> container_type; typedef container_type::size_type size_type; Index: locate_images.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/locate_images.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -d -r1.9 -r1.10 --- locate_images.h 1 Oct 2003 14:32:30 -0000 1.9 +++ locate_images.h 28 Oct 2003 06:27:53 -0000 1.10 @@ -28,8 +28,6 @@ */ class extra_images { public: - extra_images() {} - /// add all filenames found in the given paths, recursively void populate(std::vector<std::string> const & paths); Index: parse_filename.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/parse_filename.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- parse_filename.cpp 14 Sep 2003 04:19:23 -0000 1.1 +++ parse_filename.cpp 28 Oct 2003 06:27:53 -0000 1.2 @@ -101,8 +101,9 @@ parsed_filename parse_filename(string co remove_base_dir(path); // pp_interface PP:3.19 to PP:3.23 path must start either with {root} - // or {kern} and we must found at least 2 component - if (path.size() < 2 || (path[0] != "{root}" && path[0] != "{kern}")) { + // or {kern} and we must found at least 2 component, remove_base_dir() + // return an empty path if {root} or {kern} are not found + if (path.size() < 2) { throw invalid_argument("parse_filename() invalid filename: " + filename); } Index: profile.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/profile.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -d -r1.15 -r1.16 --- profile.cpp 24 Sep 2003 21:53:50 -0000 1.15 +++ profile.cpp 28 Oct 2003 06:27:53 -0000 1.16 @@ -33,11 +33,6 @@ profile_t::profile_t() } -profile_t::~profile_t() -{ -} - - // static member unsigned int profile_t::sample_count(string const & filename) { @@ -126,9 +121,9 @@ profile_t::samples_range(unsigned int st // if the image contains no symbol the vma range is [0 - filesize] // in this case we can't substract start_offset else we will underflow // and the iterator range will be empty. - if (start) { + if (start) start -= start_offset; - } + end -= start_offset; ordered_samples_t::const_iterator first = Index: profile.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/profile.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -d -r1.12 -r1.13 --- profile.h 21 Sep 2003 02:44:47 -0000 1.12 +++ profile.h 28 Oct 2003 06:27:53 -0000 1.13 @@ -35,8 +35,6 @@ public: * profile_t - construct an empty profile_t object */ profile_t(); - - ~profile_t(); /// return the header of the last opened samples file opd_header const & get_header() const { Index: profile_spec.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/profile_spec.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -d -r1.11 -r1.12 --- profile_spec.cpp 20 Oct 2003 03:41:53 -0000 1.11 +++ profile_spec.cpp 28 Oct 2003 06:27:53 -0000 1.12 @@ -405,11 +405,11 @@ list<string> profile_spec::generate_file if (sessions.empty()) { ostringstream os; - os << "No session given" << endl; - os << "included session was:" << endl; + os << "No session given\n" + << "included session was:\n"; copy(session.begin(), session.end(), ostream_iterator<string>(os, "\n")); - os << "excluded session was:" << endl; + os << "excluded session was:\n"; copy(session_exclude.begin(), session_exclude.end(), ostream_iterator<string>(os, "\n")); throw invalid_argument(os.str()); Index: symbol_sort.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/symbol_sort.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -d -r1.7 -r1.8 --- symbol_sort.cpp 10 Aug 2003 02:09:39 -0000 1.7 +++ symbol_sort.cpp 28 Oct 2003 06:27:53 -0000 1.8 @@ -128,11 +128,10 @@ void sort_options::sort(symbol_collectio long_filenames = lf; std::vector<sort_order> sort_option(options); - for (sort_order cur = first; cur != last; ) { + for (sort_order cur = first; cur != last; cur = sort_order(cur + 1)) { if (find(sort_option.begin(), sort_option.end(), cur) == sort_option.end()) sort_option.push_back(cur); - cur = sort_order(cur + 1); } stable_sort(syms.begin(), syms.end(), |