From: Philippe E. <ph...@us...> - 2003-04-28 01:18:51
|
Update of /cvsroot/oprofile/oprofile/pp In directory sc8-pr-cvs1:/tmp/cvs-serv1928/pp Modified Files: Tag: pp-interface-branch opreport.cpp Log Message: finish to remove use of split_sample_filename regards, Phil Index: opreport.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/pp/Attic/opreport.cpp,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -u -d -r1.1.2.14 -r1.1.2.15 --- opreport.cpp 28 Apr 2003 01:05:33 -0000 1.1.2.14 +++ opreport.cpp 28 Apr 2003 01:18:48 -0000 1.1.2.15 @@ -17,7 +17,6 @@ #include "string_manip.h" #include "file_manip.h" -#include "split_sample_filename.h" #include "opreport_options.h" #include "profile.h" #include "partition_files.h" @@ -31,7 +30,8 @@ struct merged_file_count { merged_file_count() : count(0) {} size_t count; - string filename; + string image_name; + string lib_image; }; struct compare_merged_file_count { @@ -81,7 +81,8 @@ for (it = files.begin(); it != files.end(); ++it) { merged_file_count sub_count; - sub_count.filename = it->sample_filename; + sub_count.image_name = it->image; + sub_count.lib_image = it->lib_image; profile_t samples(it->sample_filename); sub_count.count = samples.accumulate_samples(0, ~0); @@ -139,11 +140,10 @@ ? total_count : files.count; output_counter(tot_count, count.count); - split_sample_filename sp = split_sample_file(count.filename); - if (sp.lib_image.empty()) - cout << " " << get_filename(sp.image); + if (count.lib_image.empty()) + cout << " " << get_filename(count.image_name); else - cout << " " << get_filename(sp.lib_image); + cout << " " << get_filename(count.lib_image); cout << endl; } } |