[oprof-cvs] CVS: oprofile/pp opreport.cpp,1.48,1.49 opreport_options.cpp,1.24,1.25

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/pp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11385/pp

Modified Files:
	opreport.cpp opreport_options.cpp 
Log Message:
implement symbol filtering for opreport -c


Index: opreport.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/opreport.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -d -r1.48 -r1.49
--- opreport.cpp	4 Apr 2005 23:25:45 -0000	1.48
+++ opreport.cpp	4 Apr 2005 23:43:30 -0000	1.49
@@ -452,7 +452,7 @@ int opreport(vector<string> const & non_
 		cg_container.populate(options::archive_path, iprofiles,
 			options::extra_found_images,
 			options::debug_info, options::threshold,
-			options::merge_by.lib);
+			options::merge_by.lib, options::symbol_filter);
 
 		output_cg_symbols(cg_container, multiple_apps);
 	} else {

Index: opreport_options.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/opreport_options.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- opreport_options.cpp	4 Apr 2005 23:25:45 -0000	1.24
+++ opreport_options.cpp	4 Apr 2005 23:43:30 -0000	1.25
@@ -153,18 +153,6 @@ void check_options()
 			cerr << "--callgraph is incompatible with --details" << endl;
 			do_exit = true;
 		}
-
-		if (!include_symbols.empty()) {
-			cerr << "--include-symbols is incompatible with "
- 			        "--callgraph" << endl;
-			do_exit = true;
-		}
-
-		if (!exclude_symbols.empty()) {
-			cerr << "--exclude-symbols is incompatible with "
- 			        "--callgraph" << endl;
-			do_exit = true;
-		}
 	}
 
 	if (!symbols) {