From: John L. <mov...@us...> - 2005-04-06 21:07:46
|
Update of /cvsroot/oprofile/oprofile/libpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13478/libpp Modified Files: callgraph_container.cpp populate.cpp populate.h Log Message: some re-jigging of debug stuff Index: callgraph_container.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/callgraph_container.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -d -r1.30 -r1.31 --- callgraph_container.cpp 4 Apr 2005 23:43:29 -0000 1.30 +++ callgraph_container.cpp 6 Apr 2005 21:07:06 -0000 1.31 @@ -194,8 +194,7 @@ void callgraph_container::populate(strin list<inverted_profile>::const_iterator const end = iprofiles.end(); for (it = iprofiles.begin(); it != end; ++it) { // populate_caller_image take care about empty sample filename - populate_for_image(archive_path, pc, *it, - sym_filter); + populate_for_image(archive_path, pc, *it, sym_filter, 0); } add_symbols(pc); Index: populate.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/populate.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -d -r1.4 -r1.5 --- populate.cpp 9 Jul 2004 00:12:15 -0000 1.4 +++ populate.cpp 6 Apr 2005 21:07:06 -0000 1.5 @@ -48,9 +48,10 @@ populate_from_files(profile_t & profile, } // anon namespace -bool +void populate_for_image(string const & archive_path, profile_container & samples, - inverted_profile const & ip, string_filter const & symbol_filter) + inverted_profile const & ip, string_filter const & symbol_filter, + bool * has_debug_info) { bool ok = ip.error == image_ok; @@ -90,5 +91,6 @@ populate_for_image(string const & archiv if (archive_path.empty() && found == true && ip.error == image_ok) check_mtime(abfd.get_filename(), header); - return abfd.has_debug_info(); + if (has_debug_info) + *has_debug_info = abfd.has_debug_info(); } Index: populate.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/populate.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- populate.h 6 Jul 2004 20:45:59 -0000 1.3 +++ populate.h 6 Apr 2005 21:07:06 -0000 1.4 @@ -18,10 +18,9 @@ class string_filter; /// Load all sample file information for exactly one binary image. -/// return false if none of the image contains debug information -bool +void populate_for_image(std::string const & archive_path, - profile_container & samples, - inverted_profile const & ip, string_filter const & symbol_filter); + profile_container & samples, inverted_profile const & ip, + string_filter const & symbol_filter, bool * has_debug_info); #endif /* POPULATE_H */ |