summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2022-03-23 18:42:33 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-03-23 18:42:33 +0000
commit9fc6ef04b019bb7411c1f43aecf0172a9ca0689c (patch)
tree9cb0744499d588e7e273009f5574f1a8dd8f35bc
parente311048d80007c529e323b3e17d6c021d8c80c23 (diff)
parente0353e6273367af081e6f0ba44d32cb056752e64 (diff)
downloadextras-9fc6ef04b019bb7411c1f43aecf0172a9ca0689c.tar.gz
Merge "simpleperf: modify SetSampleFilter in report interface."
-rw-r--r--simpleperf/report_lib_interface.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/simpleperf/report_lib_interface.cpp b/simpleperf/report_lib_interface.cpp
index c55209ab..1025c325 100644
--- a/simpleperf/report_lib_interface.cpp
+++ b/simpleperf/report_lib_interface.cpp
@@ -199,7 +199,7 @@ class ReportLib {
}
const char* GetSupportedTraceOffCpuModes();
bool SetTraceOffCpuMode(const char* mode);
- bool SetSampleFilter(const char* filter);
+ bool SetSampleFilter(const char** filters, int filters_len);
Sample* GetNextSample();
Event* GetEventOfCurrentSample() { return &current_event_; }
@@ -296,8 +296,11 @@ bool ReportLib::SetTraceOffCpuMode(const char* mode) {
return true;
}
-bool ReportLib::SetSampleFilter(const char* filter) {
- std::vector<std::string> args = android::base::Split(filter, " ");
+bool ReportLib::SetSampleFilter(const char** filters, int filters_len) {
+ std::vector<std::string> args;
+ for (int i = 0; i < filters_len; i++) {
+ args.emplace_back(filters[i]);
+ }
OptionFormatMap option_formats = GetRecordFilterOptionFormats(false);
OptionValueMap options;
std::vector<std::pair<OptionName, OptionValue>> ordered_options;
@@ -595,7 +598,7 @@ void MergeJavaMethods(ReportLib* report_lib, bool merge) EXPORT;
bool AddProguardMappingFile(ReportLib* report_lib, const char* mapping_file) EXPORT;
const char* GetSupportedTraceOffCpuModes(ReportLib* report_lib) EXPORT;
bool SetTraceOffCpuMode(ReportLib* report_lib, const char* mode) EXPORT;
-bool SetSampleFilter(ReportLib* report_lib, const char* filter) EXPORT;
+bool SetSampleFilter(ReportLib* report_lib, const char** filters, int filters_len) EXPORT;
Sample* GetNextSample(ReportLib* report_lib) EXPORT;
Event* GetEventOfCurrentSample(ReportLib* report_lib) EXPORT;
@@ -656,8 +659,8 @@ bool SetTraceOffCpuMode(ReportLib* report_lib, const char* mode) {
return report_lib->SetTraceOffCpuMode(mode);
}
-bool SetSampleFilter(ReportLib* report_lib, const char* filter) {
- return report_lib->SetSampleFilter(filter);
+bool SetSampleFilter(ReportLib* report_lib, const char** filters, int filters_len) {
+ return report_lib->SetSampleFilter(filters, filters_len);
}
Sample* GetNextSample(ReportLib* report_lib) {