Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1351523 - Reorder profiler_get_start_params() arguments. r=mstange.

Browse Source 
profiler_start() and nsProfilerStartParams() both have features before filters.
This patch makes profiler_get_start_params() follow suit.
This commit is contained in:
Nicholas Nethercote 2017-03-29 13:22:29 +11:00
parent d6f74d9372
commit 37a83290da
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/profiler/core/platform.cpp
View File

@ -2165,14 +2165,14 @@ profiler_save_profile_to_file_async(double aSinceTime, const char* aFileName)
void
profiler_get_start_params(int* aEntries, double* aInterval,
mozilla::Vector<const char*>* aFilters,
mozilla::Vector<const char*>* aFeatures)
mozilla::Vector<const char*>* aFeatures,
mozilla::Vector<const char*>* aFilters)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
MOZ_RELEASE_ASSERT(gPS);
if (NS_WARN_IF(!aEntries) || NS_WARN_IF(!aInterval) ||
NS_WARN_IF(!aFilters) || NS_WARN_IF(!aFeatures)) {
NS_WARN_IF(!aFeatures) || NS_WARN_IF(!aFilters)) {
return;
}
@ -2181,17 +2181,17 @@ profiler_get_start_params(int* aEntries, double* aInterval,
*aEntries = gPS->Entries(lock);
*aInterval = gPS->Interval(lock);
const Vector<std::string>& threadNameFilters = gPS->ThreadNameFilters(lock);
MOZ_ALWAYS_TRUE(aFilters->resize(threadNameFilters.length()));
for (uint32_t i = 0; i < threadNameFilters.length(); ++i) {
(*aFilters)[i] = threadNameFilters[i].c_str();
}
const Vector<std::string>& features = gPS->Features(lock);
MOZ_ALWAYS_TRUE(aFeatures->resize(features.length()));
for (size_t i = 0; i < features.length(); ++i) {
(*aFeatures)[i] = features[i].c_str();
}
const Vector<std::string>& threadNameFilters = gPS->ThreadNameFilters(lock);
MOZ_ALWAYS_TRUE(aFilters->resize(threadNameFilters.length()));
for (uint32_t i = 0; i < threadNameFilters.length(); ++i) {
(*aFilters)[i] = threadNameFilters[i].c_str();
}
}
void

17
tools/profiler/gecko/nsProfiler.cpp
View File

@ -276,25 +276,24 @@ nsProfiler::GetStartParams(nsIProfilerStartParams** aRetVal)
if (!profiler_is_active()) {
*aRetVal = nullptr;
} else {
int entrySize = 0;
int entries = 0;
double interval = 0;
mozilla::Vector<const char*> filters;
mozilla::Vector<const char*> features;
profiler_get_start_params(&entrySize, &interval, &filters, &features);
nsTArray<nsCString> filtersArray;
for (uint32_t i = 0; i < filters.length(); ++i) {
filtersArray.AppendElement(filters[i]);
}
profiler_get_start_params(&entries, &interval, &features, &filters);
nsTArray<nsCString> featuresArray;
for (size_t i = 0; i < features.length(); ++i) {
featuresArray.AppendElement(features[i]);
}
nsTArray<nsCString> filtersArray;
for (uint32_t i = 0; i < filters.length(); ++i) {
filtersArray.AppendElement(filters[i]);
}
nsCOMPtr<nsIProfilerStartParams> startParams =
new nsProfilerStartParams(entrySize, interval, featuresArray,
filtersArray);
new nsProfilerStartParams(entries, interval, featuresArray, filtersArray);
startParams.forget(aRetVal);
}

4
tools/profiler/public/GeckoProfiler.h
View File

@ -231,8 +231,8 @@ PROFILER_FUNC_VOID(profiler_get_profile_jsobject_async(double aSinceTime = 0,
// outparams) if the profile is inactive.
PROFILER_FUNC_VOID(profiler_get_start_params(int* aEntrySize,
double* aInterval,
mozilla::Vector<const char*>* aFilters,
mozilla::Vector<const char*>* aFeatures))
mozilla::Vector<const char*>* aFeatures,
mozilla::Vector<const char*>* aFilters))
// Get the profile and write it into a file. A no-op if the profile is
// inactive.