gecko-dev/tools/profiler/core/platform.cpp

3171 строка
92 KiB
C++
Исходник Обычный вид История

/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
#include <algorithm>
#include <ostream>
#include <fstream>
#include <sstream>
#include <errno.h>
#include "platform.h"
#include "PlatformMacros.h"
#include "mozilla/ArrayUtils.h"
#include "mozilla/Atomics.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/Vector.h"
#include "GeckoProfiler.h"
#include "ProfilerIOInterposeObserver.h"
#include "mozilla/StackWalk.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/ThreadLocal.h"
#include "mozilla/TimeStamp.h"
#include "mozilla/Sprintf.h"
#include "mozilla/StaticPtr.h"
#include "PseudoStack.h"
#include "ThreadInfo.h"
#include "nsIHttpProtocolHandler.h"
#include "nsIObserverService.h"
#include "nsIProfileSaveEvent.h"
#include "nsIXULAppInfo.h"
#include "nsIXULRuntime.h"
#include "nsDirectoryServiceUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "nsMemoryReporterManager.h"
#include "nsXULAppAPI.h"
#include "nsProfilerStartParams.h"
#include "mozilla/Services.h"
#include "nsThreadUtils.h"
#include "ProfileGatherer.h"
#include "ProfilerMarkers.h"
#include "shared-libraries.h"
#ifdef MOZ_TASK_TRACER
#include "GeckoTaskTracer.h"
#endif
#if defined(PROFILE_JAVA)
# include "FennecJNINatives.h"
# include "FennecJNIWrappers.h"
#endif
#if defined(MOZ_PROFILING) && \
(defined(GP_OS_windows) || defined(GP_OS_darwin))
# define HAVE_NATIVE_UNWIND
# define USE_NS_STACKWALK
#endif
// This should also work on ARM Linux, but not tested there yet.
#if defined(GP_PLAT_arm_android)
# define HAVE_NATIVE_UNWIND
# define USE_EHABI_STACKWALK
# include "EHABIStackWalk.h"
#endif
#if defined(GP_PLAT_amd64_linux) || defined(GP_PLAT_x86_linux)
# define HAVE_NATIVE_UNWIND
# define USE_LUL_STACKWALK
Bug 1178892 - Split the profiler into Core & Gecko files and break apart monolithic headers. r=mstange --HG-- rename : tools/profiler/EHABIStackWalk.cpp => tools/profiler/core/EHABIStackWalk.cpp rename : tools/profiler/EHABIStackWalk.h => tools/profiler/core/EHABIStackWalk.h rename : tools/profiler/TableTicker.cpp => tools/profiler/core/GeckoSampler.cpp rename : tools/profiler/TableTicker.h => tools/profiler/core/GeckoSampler.h rename : tools/profiler/IntelPowerGadget.cpp => tools/profiler/core/IntelPowerGadget.cpp rename : tools/profiler/IntelPowerGadget.h => tools/profiler/core/IntelPowerGadget.h rename : tools/profiler/PlatformMacros.h => tools/profiler/core/PlatformMacros.h rename : tools/profiler/ProfileEntry.cpp => tools/profiler/core/ProfileEntry.cpp rename : tools/profiler/ProfileEntry.h => tools/profiler/core/ProfileEntry.h rename : tools/profiler/ProfileJSONWriter.cpp => tools/profiler/core/ProfileJSONWriter.cpp rename : tools/profiler/ProfileJSONWriter.h => tools/profiler/core/ProfileJSONWriter.h rename : tools/profiler/ProfilerBacktrace.cpp => tools/profiler/core/ProfilerBacktrace.cpp rename : tools/profiler/ProfilerMarkers.cpp => tools/profiler/core/ProfilerMarkers.cpp rename : tools/profiler/SyncProfile.cpp => tools/profiler/core/SyncProfile.cpp rename : tools/profiler/SyncProfile.h => tools/profiler/core/SyncProfile.h rename : tools/profiler/platform-linux.cc => tools/profiler/core/platform-linux.cc rename : tools/profiler/platform-macos.cc => tools/profiler/core/platform-macos.cc rename : tools/profiler/platform-win32.cc => tools/profiler/core/platform-win32.cc rename : tools/profiler/platform.cpp => tools/profiler/core/platform.cpp rename : tools/profiler/platform.h => tools/profiler/core/platform.h rename : tools/profiler/shared-libraries-linux.cc => tools/profiler/core/shared-libraries-linux.cc rename : tools/profiler/shared-libraries-macos.cc => tools/profiler/core/shared-libraries-macos.cc rename : tools/profiler/shared-libraries-win32.cc => tools/profiler/core/shared-libraries-win32.cc rename : tools/profiler/shim_mac_dump_syms.h => tools/profiler/core/shim_mac_dump_syms.h rename : tools/profiler/shim_mac_dump_syms.mm => tools/profiler/core/shim_mac_dump_syms.mm rename : tools/profiler/v8-support.h => tools/profiler/core/v8-support.h rename : tools/profiler/ProfileGatherer.cpp => tools/profiler/gecko/ProfileGatherer.cpp rename : tools/profiler/Profiler.jsm => tools/profiler/gecko/Profiler.jsm rename : tools/profiler/ProfilerIOInterposeObserver.cpp => tools/profiler/gecko/ProfilerIOInterposeObserver.cpp rename : tools/profiler/ProfilerIOInterposeObserver.h => tools/profiler/gecko/ProfilerIOInterposeObserver.h rename : tools/profiler/SaveProfileTask.cpp => tools/profiler/gecko/SaveProfileTask.cpp rename : tools/profiler/SaveProfileTask.h => tools/profiler/gecko/SaveProfileTask.h rename : tools/profiler/ThreadResponsiveness.cpp => tools/profiler/gecko/ThreadResponsiveness.cpp rename : tools/profiler/ThreadResponsiveness.h => tools/profiler/gecko/ThreadResponsiveness.h rename : tools/profiler/local_debug_info_symbolizer.cc => tools/profiler/gecko/local_debug_info_symbolizer.cc rename : tools/profiler/local_debug_info_symbolizer.h => tools/profiler/gecko/local_debug_info_symbolizer.h rename : tools/profiler/nsIProfileSaveEvent.idl => tools/profiler/gecko/nsIProfileSaveEvent.idl rename : tools/profiler/nsIProfiler.idl => tools/profiler/gecko/nsIProfiler.idl rename : tools/profiler/nsProfiler.cpp => tools/profiler/gecko/nsProfiler.cpp rename : tools/profiler/nsProfiler.h => tools/profiler/gecko/nsProfiler.h rename : tools/profiler/nsProfilerCIID.h => tools/profiler/gecko/nsProfilerCIID.h rename : tools/profiler/nsProfilerFactory.cpp => tools/profiler/gecko/nsProfilerFactory.cpp rename : tools/profiler/nsProfilerStartParams.cpp => tools/profiler/gecko/nsProfilerStartParams.cpp rename : tools/profiler/nsProfilerStartParams.h => tools/profiler/gecko/nsProfilerStartParams.h rename : tools/profiler/AutoObjectMapper.cpp => tools/profiler/lul/AutoObjectMapper.cpp rename : tools/profiler/AutoObjectMapper.h => tools/profiler/lul/AutoObjectMapper.h rename : tools/profiler/LulCommon.cpp => tools/profiler/lul/LulCommon.cpp rename : tools/profiler/LulCommonExt.h => tools/profiler/lul/LulCommonExt.h rename : tools/profiler/LulDwarf.cpp => tools/profiler/lul/LulDwarf.cpp rename : tools/profiler/LulDwarfExt.h => tools/profiler/lul/LulDwarfExt.h rename : tools/profiler/LulDwarfInt.h => tools/profiler/lul/LulDwarfInt.h rename : tools/profiler/LulDwarfSummariser.cpp => tools/profiler/lul/LulDwarfSummariser.cpp rename : tools/profiler/LulDwarfSummariser.h => tools/profiler/lul/LulDwarfSummariser.h rename : tools/profiler/LulElf.cpp => tools/profiler/lul/LulElf.cpp rename : tools/profiler/LulElfExt.h => tools/profiler/lul/LulElfExt.h rename : tools/profiler/LulElfInt.h => tools/profiler/lul/LulElfInt.h rename : tools/profiler/LulMain.cpp => tools/profiler/lul/LulMain.cpp rename : tools/profiler/LulMain.h => tools/profiler/lul/LulMain.h rename : tools/profiler/LulMainInt.h => tools/profiler/lul/LulMainInt.h rename : tools/profiler/LulPlatformMacros.h => tools/profiler/lul/LulPlatformMacros.h rename : tools/profiler/platform-linux-lul.cpp => tools/profiler/lul/platform-linux-lul.cpp rename : tools/profiler/platform-linux-lul.h => tools/profiler/lul/platform-linux-lul.h rename : tools/profiler/GeckoProfiler.h => tools/profiler/public/GeckoProfiler.h rename : tools/profiler/GeckoProfilerFunc.h => tools/profiler/public/GeckoProfilerFunc.h rename : tools/profiler/GeckoProfilerImpl.h => tools/profiler/public/GeckoProfilerImpl.h rename : tools/profiler/ProfileGatherer.h => tools/profiler/public/ProfileGatherer.h rename : tools/profiler/ProfilerBacktrace.h => tools/profiler/public/ProfilerBacktrace.h rename : tools/profiler/ProfilerMarkers.h => tools/profiler/public/ProfilerMarkers.h rename : tools/profiler/PseudoStack.h => tools/profiler/public/PseudoStack.h rename : tools/profiler/shared-libraries.h => tools/profiler/public/shared-libraries.h rename : tools/profiler/GeckoTaskTracer.cpp => tools/profiler/tasktracer/GeckoTaskTracer.cpp rename : tools/profiler/GeckoTaskTracer.h => tools/profiler/tasktracer/GeckoTaskTracer.h rename : tools/profiler/GeckoTaskTracerImpl.h => tools/profiler/tasktracer/GeckoTaskTracerImpl.h rename : tools/profiler/SourceEventTypeMap.h => tools/profiler/tasktracer/SourceEventTypeMap.h rename : tools/profiler/TracedTaskCommon.cpp => tools/profiler/tasktracer/TracedTaskCommon.cpp rename : tools/profiler/TracedTaskCommon.h => tools/profiler/tasktracer/TracedTaskCommon.h extra : commitid : EGgqHIgsN6z
2015-06-30 22:03:45 +03:00
# include "lul/LulMain.h"
# include "lul/platform-linux-lul.h"
#endif
#ifdef MOZ_VALGRIND
# include <valgrind/memcheck.h>
#else
# define VALGRIND_MAKE_MEM_DEFINED(_addr,_len) ((void)0)
#endif
#if defined(GP_OS_windows)
typedef CONTEXT tick_context_t;
#elif defined(GP_OS_darwin)
typedef void tick_context_t; // this type isn't used meaningfully on Mac
#elif defined(GP_OS_linux) || defined(GP_OS_android)
#include <ucontext.h>
typedef ucontext_t tick_context_t;
#endif
using namespace mozilla;
mozilla::LazyLogModule gProfilerLog("prof");
#if defined(PROFILE_JAVA)
class GeckoJavaSampler : public mozilla::java::GeckoJavaSampler::Natives<GeckoJavaSampler>
{
private:
GeckoJavaSampler();
public:
static double GetProfilerTime() {
if (!profiler_is_active()) {
return 0.0;
}
return profiler_time();
};
};
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
class SamplerThread;
// Per-thread state.
MOZ_THREAD_LOCAL(PseudoStack *) tlsPseudoStack;
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// This class contains most of the profiler's global state. gPS is the single
// instance. Most profile operations can't do anything useful when gPS is not
// instantiated, so we release-assert its non-nullness in all such operations.
//
// Accesses to gPS are guarded by gPSMutex. Every getter and setter takes a
// PS::AutoLock reference as an argument as proof that the gPSMutex is
// currently locked. This makes it clear when gPSMutex is locked and helps
// avoid accidental unlocked accesses to global state. There are ways to
// circumvent this mechanism, but please don't do so without *very* good reason
// and a detailed explanation.
//
// Other from the lock protection, this class is essentially a thin wrapper and
// contains very little "smarts" itself.
//
class ProfilerState
{
public:
// Shorter names for local use.
typedef ProfilerStateMutex Mutex;
typedef mozilla::BaseAutoLock<Mutex> AutoLock;
// Only functions that take a LockRef arg can modify this class's fields.
typedef const AutoLock& LockRef;
typedef std::vector<ThreadInfo*> ThreadVector;
ProfilerState()
: mEnvVarEntries(0)
, mEntries(0)
, mEnvVarInterval(0)
, mInterval(0)
, mFeatureDisplayListDump(false)
, mFeatureGPU(false)
, mFeatureJava(false)
, mFeatureJS(false)
, mFeatureLayersDump(false)
, mFeatureLeaf(false)
, mFeatureMemory(false)
, mFeaturePrivacy(false)
, mFeatureRestyle(false)
, mFeatureStackWalk(false)
, mFeatureTaskTracer(false)
, mFeatureThreads(false)
, mBuffer(nullptr)
, mGatherer(nullptr)
, mIsPaused(false)
#if defined(GP_OS_linux) || defined(GP_OS_android)
, mWasPaused(false)
#endif
, mSamplerThread(nullptr)
#ifdef USE_LUL_STACKWALK
, mLUL(nullptr)
#endif
, mInterposeObserver(nullptr)
, mFrameNumber(0)
, mLatestRecordedFrameNumber(0)
{}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
#define GET_AND_SET(type_, name_) \
type_ name_(LockRef) const { return m##name_; } \
void Set##name_(LockRef, type_ a##name_) { m##name_ = a##name_; }
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
GET_AND_SET(TimeStamp, StartTime)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
GET_AND_SET(int, EnvVarEntries)
GET_AND_SET(int, Entries)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
GET_AND_SET(int, EnvVarInterval)
GET_AND_SET(double, Interval)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
Vector<std::string>& Features(LockRef) { return mFeatures; }
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
Vector<std::string>& ThreadNameFilters(LockRef) { return mThreadNameFilters; }
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
GET_AND_SET(bool, FeatureDisplayListDump)
GET_AND_SET(bool, FeatureGPU)
GET_AND_SET(bool, FeatureJava)
GET_AND_SET(bool, FeatureJS)
GET_AND_SET(bool, FeatureLayersDump)
GET_AND_SET(bool, FeatureLeaf)
GET_AND_SET(bool, FeatureMemory)
GET_AND_SET(bool, FeaturePrivacy)
GET_AND_SET(bool, FeatureRestyle)
GET_AND_SET(bool, FeatureStackWalk)
GET_AND_SET(bool, FeatureTaskTracer)
GET_AND_SET(bool, FeatureThreads)
GET_AND_SET(ProfileBuffer*, Buffer)
GET_AND_SET(ProfileGatherer*, Gatherer)
ThreadVector& Threads(LockRef) { return mThreads; }
static bool IsActive(LockRef) { return sActivityGeneration > 0; }
static uint32_t ActivityGeneration(LockRef) { return sActivityGeneration; }
static void SetInactive(LockRef) { sActivityGeneration = 0; }
static void SetActive(LockRef)
{
sActivityGeneration = sNextActivityGeneration;
// On overflow, reset to 1 instead of 0, because 0 means inactive.
sNextActivityGeneration = (sNextActivityGeneration == 0xffffffff)
? 1
: sNextActivityGeneration + 1;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
GET_AND_SET(bool, IsPaused)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
#if defined(GP_OS_linux) || defined(GP_OS_android)
GET_AND_SET(bool, WasPaused)
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
GET_AND_SET(class SamplerThread*, SamplerThread)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
#ifdef USE_LUL_STACKWALK
GET_AND_SET(lul::LUL*, LUL)
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
GET_AND_SET(mozilla::ProfilerIOInterposeObserver*, InterposeObserver)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
GET_AND_SET(int, FrameNumber)
GET_AND_SET(int, LatestRecordedFrameNumber)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
#undef GET_AND_SET
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
private:
// When profiler_init() or profiler_start() was most recently called.
mozilla::TimeStamp mStartTime;
// The number of entries in mBuffer. mEnvVarEntries comes from an environment
// variable and can override the value passed in to profiler_start(). Zeroed
// when the profiler is inactive.
int mEnvVarEntries;
int mEntries;
// The interval between samples, measured in milliseconds. mEnvVarInterval
// comes from an environment variable and can override the value passed in to
// profiler_start(). Zeroed when the profiler is inactive.
int mEnvVarInterval;
double mInterval;
// The profile features that are enabled. Cleared when the profiler is
// inactive.
Vector<std::string> mFeatures;
// Substrings of names of threads we want to profile. Cleared when the
// profiler is inactive
Vector<std::string> mThreadNameFilters;
// Configuration flags derived from mFeatures. Cleared when the profiler is
// inactive.
bool mFeatureDisplayListDump;
bool mFeatureGPU;
bool mFeatureJava;
bool mFeatureJS;
bool mFeatureLayersDump;
bool mFeatureLeaf;
bool mFeatureMemory;
bool mFeaturePrivacy;
bool mFeatureRestyle;
bool mFeatureStackWalk;
bool mFeatureTaskTracer;
bool mFeatureThreads;
// The buffer into which all samples are recorded. Always used in conjunction
// with mThreads. Null when the profiler is inactive.
ProfileBuffer* mBuffer;
// A helper class that is used when saving profiles. Null when the profiler
// is inactive.
RefPtr<mozilla::ProfileGatherer> mGatherer;
// All the registered threads.
ThreadVector mThreads;
// Is the profiler active? The obvious way to track this is with a bool,
// sIsActive, but then we could have the following scenario.
//
// - profiler_stop() locks gPSMutex, zeroes sIsActive, unlocks gPSMutex,
// deletes the SamplerThread (which does a join).
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
//
// - profiler_start() runs on a different thread, locks gPSMutex, sets
// sIsActive, unlocks gPSMutex -- all before the join completes.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
//
// - SamplerThread::Run() locks gPSMutex, sees that sIsActive is set, and
// continues as if the start/stop pair didn't occur. Also profiler_stop()
// is stuck, unable to finish.
//
// Instead, we use an integer, sActivityGeneration; zero means inactive,
// non-zero means active. Furthermore, each time the profiler is activated
// the value increases by 1 (as tracked by sNextActivityGeneration). This
// allows SamplerThread::Run() to distinguish the current activation from any
// subsequent activations.
//
// These variables are static because they can be referred to by
// SamplerThread::Run() even after gPS has been destroyed by
// profiler_shutdown().
static uint32_t sActivityGeneration;
static uint32_t sNextActivityGeneration;
// Is the profiler paused? False when the profiler is inactive.
bool mIsPaused;
#if defined(GP_OS_linux) || defined(GP_OS_android)
// Used to record whether the profiler was paused just before forking. False
// at all times except just before/after forking.
bool mWasPaused;
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// The current sampler thread. Null when the profiler is inactive.
class SamplerThread* mSamplerThread;
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
#ifdef USE_LUL_STACKWALK
// LUL's state. Null prior to the first activation, non-null thereafter.
lul::LUL* mLUL;
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// The interposer that records main thread I/O. Null when the profiler is
// inactive.
mozilla::ProfilerIOInterposeObserver* mInterposeObserver;
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// The current frame number and the most recent frame number recorded in a
// sample.
int mFrameNumber;
int mLatestRecordedFrameNumber;
};
// A shorter name for use within this compilation unit.
typedef ProfilerState PS;
uint32_t PS::sActivityGeneration = 0;
uint32_t PS::sNextActivityGeneration = 1;
// The profiler state. Set by profiler_init(), cleared by profiler_shutdown().
PS* gPS = nullptr;
// The mutex that guards accesses to gPS.
static PS::Mutex gPSMutex;
// The name of the main thread.
static const char* const kMainThreadName = "GeckoMain";
static bool
CanNotifyObservers()
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
#if defined(GP_OS_android)
// Android ANR reporter uses the profiler off the main thread.
return NS_IsMainThread();
#else
return true;
#endif
}
////////////////////////////////////////////////////////////////////////
// BEGIN tick/unwinding code
// TickSample captures the information collected for each sample.
class TickSample {
public:
explicit TickSample(ThreadInfo* aThreadInfo)
: mPC(nullptr)
, mSP(nullptr)
, mFP(nullptr)
, mLR(nullptr)
, mContext(nullptr)
, mIsSamplingCurrentThread(false)
, mThreadInfo(aThreadInfo)
, mTimeStamp(mozilla::TimeStamp::Now())
, mRSSMemory(0)
, mUSSMemory(0)
{}
void PopulateContext(tick_context_t* aContext);
Address mPC; // Instruction pointer.
Address mSP; // Stack pointer.
Address mFP; // Frame pointer.
Address mLR; // ARM link register.
void* mContext; // The context from the signal handler, if available. On
// Win32 this may contain the windows thread context.
bool mIsSamplingCurrentThread;
ThreadInfo* mThreadInfo;
mozilla::TimeStamp mTimeStamp;
int64_t mRSSMemory;
int64_t mUSSMemory;
};
static void
AddDynamicCodeLocationTag(ProfileBuffer* aBuffer, const char* aStr)
{
aBuffer->addTag(ProfileBufferEntry::CodeLocation(""));
size_t strLen = strlen(aStr) + 1; // +1 for the null terminator
for (size_t j = 0; j < strLen; ) {
// Store as many characters in the void* as the platform allows.
char text[sizeof(void*)];
size_t len = sizeof(void*) / sizeof(char);
if (j+len >= strLen) {
len = strLen - j;
}
memcpy(text, &aStr[j], len);
j += sizeof(void*) / sizeof(char);
// Cast to *((void**) to pass the text data to a void*.
aBuffer->addTag(ProfileBufferEntry::EmbeddedString(*((void**)(&text[0]))));
}
}
static const int SAMPLER_MAX_STRING_LENGTH = 128;
static void
AddPseudoEntry(ProfileBuffer* aBuffer, volatile js::ProfileEntry& entry,
PseudoStack* stack, void* lastpc)
{
// Pseudo-frames with the BEGIN_PSEUDO_JS flag are just annotations and
// should not be recorded in the profile.
if (entry.hasFlag(js::ProfileEntry::BEGIN_PSEUDO_JS)) {
return;
}
int lineno = -1;
// First entry has kind CodeLocation. Check for magic pointer bit 1 to
// indicate copy.
const char* sampleLabel = entry.label();
const char* dynamicString = entry.getDynamicString();
char combinedStringBuffer[SAMPLER_MAX_STRING_LENGTH];
if (entry.isCopyLabel() || dynamicString) {
if (dynamicString) {
int bytesWritten =
SprintfLiteral(combinedStringBuffer, "%s %s", sampleLabel, dynamicString);
if (bytesWritten > 0) {
sampleLabel = combinedStringBuffer;
}
}
// Store the string using 1 or more EmbeddedString tags.
// That will happen to the preceding tag.
AddDynamicCodeLocationTag(aBuffer, sampleLabel);
if (entry.isJs()) {
JSScript* script = entry.script();
if (script) {
if (!entry.pc()) {
// The JIT only allows the top-most entry to have a nullptr pc.
MOZ_ASSERT(&entry == &stack->mStack[stack->stackSize() - 1]);
// If stack-walking was disabled, then that's just unfortunate.
if (lastpc) {
jsbytecode* jspc = js::ProfilingGetPC(stack->mContext, script,
lastpc);
if (jspc) {
lineno = JS_PCToLineNumber(script, jspc);
}
}
} else {
lineno = JS_PCToLineNumber(script, entry.pc());
}
}
} else {
lineno = entry.line();
}
} else {
aBuffer->addTag(ProfileBufferEntry::CodeLocation(sampleLabel));
// XXX: Bug 1010578. Don't assume a CPP entry and try to get the line for
// js entries as well.
if (entry.isCpp()) {
lineno = entry.line();
}
}
if (lineno != -1) {
aBuffer->addTag(ProfileBufferEntry::LineNumber(lineno));
}
uint32_t category = entry.category();
MOZ_ASSERT(!(category & js::ProfileEntry::IS_CPP_ENTRY));
MOZ_ASSERT(!(category & js::ProfileEntry::FRAME_LABEL_COPY));
if (category) {
aBuffer->addTag(ProfileBufferEntry::Category((int)category));
}
}
struct NativeStack
{
void** pc_array;
void** sp_array;
size_t size;
size_t count;
};
mozilla::Atomic<bool> WALKING_JS_STACK(false);
struct AutoWalkJSStack
{
bool walkAllowed;
AutoWalkJSStack() : walkAllowed(false) {
walkAllowed = WALKING_JS_STACK.compareExchange(false, true);
}
~AutoWalkJSStack() {
if (walkAllowed) {
WALKING_JS_STACK = false;
}
}
};
static void
MergeStacksIntoProfile(ProfileBuffer* aBuffer, TickSample* aSample,
NativeStack& aNativeStack)
{
NotNull<PseudoStack*> pseudoStack = aSample->mThreadInfo->Stack();
volatile js::ProfileEntry* pseudoFrames = pseudoStack->mStack;
uint32_t pseudoCount = pseudoStack->stackSize();
// Make a copy of the JS stack into a JSFrame array. This is necessary since,
// like the native stack, the JS stack is iterated youngest-to-oldest and we
// need to iterate oldest-to-youngest when adding entries to aInfo.
// Synchronous sampling reports an invalid buffer generation to
// ProfilingFrameIterator to avoid incorrectly resetting the generation of
// sampled JIT entries inside the JS engine. See note below concerning 'J'
// entries.
uint32_t startBufferGen;
startBufferGen = aSample->mIsSamplingCurrentThread
? UINT32_MAX
: aBuffer->mGeneration;
uint32_t jsCount = 0;
JS::ProfilingFrameIterator::Frame jsFrames[1000];
// Only walk jit stack if profiling frame iterator is turned on.
if (pseudoStack->mContext &&
JS::IsProfilingEnabledForContext(pseudoStack->mContext)) {
AutoWalkJSStack autoWalkJSStack;
const uint32_t maxFrames = mozilla::ArrayLength(jsFrames);
if (aSample && autoWalkJSStack.walkAllowed) {
JS::ProfilingFrameIterator::RegisterState registerState;
registerState.pc = aSample->mPC;
registerState.sp = aSample->mSP;
registerState.lr = aSample->mLR;
registerState.fp = aSample->mFP;
JS::ProfilingFrameIterator jsIter(pseudoStack->mContext,
registerState,
startBufferGen);
for (; jsCount < maxFrames && !jsIter.done(); ++jsIter) {
// See note below regarding 'J' entries.
if (aSample->mIsSamplingCurrentThread || jsIter.isWasm()) {
uint32_t extracted =
jsIter.extractStack(jsFrames, jsCount, maxFrames);
jsCount += extracted;
if (jsCount == maxFrames) {
break;
}
} else {
mozilla::Maybe<JS::ProfilingFrameIterator::Frame> frame =
jsIter.getPhysicalFrameWithoutLabel();
if (frame.isSome()) {
jsFrames[jsCount++] = frame.value();
}
}
}
}
}
// Start the sample with a root entry.
aBuffer->addTag(ProfileBufferEntry::Sample("(root)"));
// While the pseudo-stack array is ordered oldest-to-youngest, the JS and
// native arrays are ordered youngest-to-oldest. We must add frames to aInfo
// oldest-to-youngest. Thus, iterate over the pseudo-stack forwards and JS
// and native arrays backwards. Note: this means the terminating condition
// jsIndex and nativeIndex is being < 0.
uint32_t pseudoIndex = 0;
int32_t jsIndex = jsCount - 1;
int32_t nativeIndex = aNativeStack.count - 1;
uint8_t* lastPseudoCppStackAddr = nullptr;
// Iterate as long as there is at least one frame remaining.
while (pseudoIndex != pseudoCount || jsIndex >= 0 || nativeIndex >= 0) {
// There are 1 to 3 frames available. Find and add the oldest.
uint8_t* pseudoStackAddr = nullptr;
uint8_t* jsStackAddr = nullptr;
uint8_t* nativeStackAddr = nullptr;
if (pseudoIndex != pseudoCount) {
volatile js::ProfileEntry& pseudoFrame = pseudoFrames[pseudoIndex];
if (pseudoFrame.isCpp()) {
lastPseudoCppStackAddr = (uint8_t*) pseudoFrame.stackAddress();
}
// Skip any pseudo-stack JS frames which are marked isOSR. Pseudostack
// frames are marked isOSR when the JS interpreter enters a jit frame on
// a loop edge (via on-stack-replacement, or OSR). To avoid both the
// pseudoframe and jit frame being recorded (and showing up twice), the
// interpreter marks the interpreter pseudostack entry with the OSR flag
// to ensure that it doesn't get counted.
if (pseudoFrame.isJs() && pseudoFrame.isOSR()) {
pseudoIndex++;
continue;
}
MOZ_ASSERT(lastPseudoCppStackAddr);
pseudoStackAddr = lastPseudoCppStackAddr;
}
if (jsIndex >= 0) {
jsStackAddr = (uint8_t*) jsFrames[jsIndex].stackAddress;
}
if (nativeIndex >= 0) {
nativeStackAddr = (uint8_t*) aNativeStack.sp_array[nativeIndex];
}
// If there's a native stack entry which has the same SP as a pseudo stack
// entry, pretend we didn't see the native stack entry. Ditto for a native
// stack entry which has the same SP as a JS stack entry. In effect this
// means pseudo or JS entries trump conflicting native entries.
if (nativeStackAddr && (pseudoStackAddr == nativeStackAddr ||
jsStackAddr == nativeStackAddr)) {
nativeStackAddr = nullptr;
nativeIndex--;
MOZ_ASSERT(pseudoStackAddr || jsStackAddr);
}
// Sanity checks.
MOZ_ASSERT_IF(pseudoStackAddr, pseudoStackAddr != jsStackAddr &&
pseudoStackAddr != nativeStackAddr);
MOZ_ASSERT_IF(jsStackAddr, jsStackAddr != pseudoStackAddr &&
jsStackAddr != nativeStackAddr);
MOZ_ASSERT_IF(nativeStackAddr, nativeStackAddr != pseudoStackAddr &&
nativeStackAddr != jsStackAddr);
// Check to see if pseudoStack frame is top-most.
if (pseudoStackAddr > jsStackAddr && pseudoStackAddr > nativeStackAddr) {
MOZ_ASSERT(pseudoIndex < pseudoCount);
volatile js::ProfileEntry& pseudoFrame = pseudoFrames[pseudoIndex];
AddPseudoEntry(aBuffer, pseudoFrame, pseudoStack, nullptr);
pseudoIndex++;
continue;
}
// Check to see if JS jit stack frame is top-most
if (jsStackAddr > nativeStackAddr) {
MOZ_ASSERT(jsIndex >= 0);
const JS::ProfilingFrameIterator::Frame& jsFrame = jsFrames[jsIndex];
// Stringifying non-wasm JIT frames is delayed until streaming time. To
// re-lookup the entry in the JitcodeGlobalTable, we need to store the
// JIT code address (OptInfoAddr) in the circular buffer.
//
// Note that we cannot do this when we are sychronously sampling the
// current thread; that is, when called from profiler_get_backtrace. The
// captured backtrace is usually externally stored for an indeterminate
// amount of time, such as in nsRefreshDriver. Problematically, the
// stored backtrace may be alive across a GC during which the profiler
// itself is disabled. In that case, the JS engine is free to discard its
// JIT code. This means that if we inserted such OptInfoAddr entries into
// the buffer, nsRefreshDriver would now be holding on to a backtrace
// with stale JIT code return addresses.
if (aSample->mIsSamplingCurrentThread ||
jsFrame.kind == JS::ProfilingFrameIterator::Frame_Wasm) {
AddDynamicCodeLocationTag(aBuffer, jsFrame.label);
} else {
MOZ_ASSERT(jsFrame.kind == JS::ProfilingFrameIterator::Frame_Ion ||
jsFrame.kind == JS::ProfilingFrameIterator::Frame_Baseline);
aBuffer->addTag(
ProfileBufferEntry::JitReturnAddr(jsFrames[jsIndex].returnAddress));
}
jsIndex--;
continue;
}
// If we reach here, there must be a native stack entry and it must be the
// greatest entry.
if (nativeStackAddr) {
MOZ_ASSERT(nativeIndex >= 0);
void* addr = (void*)aNativeStack.pc_array[nativeIndex];
aBuffer->addTag(ProfileBufferEntry::NativeLeafAddr(addr));
}
if (nativeIndex >= 0) {
nativeIndex--;
}
}
// Update the JS context with the current profile sample buffer generation.
//
// Do not do this for synchronous sampling, which create their own
// ProfileBuffers.
if (!aSample->mIsSamplingCurrentThread && pseudoStack->mContext) {
MOZ_ASSERT(aBuffer->mGeneration >= startBufferGen);
uint32_t lapCount = aBuffer->mGeneration - startBufferGen;
JS::UpdateJSContextProfilerSampleBufferGen(pseudoStack->mContext,
aBuffer->mGeneration,
lapCount);
}
}
#if defined(GP_OS_windows)
static uintptr_t GetThreadHandle(PlatformData* aData);
#endif
#ifdef USE_NS_STACKWALK
static void
StackWalkCallback(uint32_t aFrameNumber, void* aPC, void* aSP, void* aClosure)
{
NativeStack* nativeStack = static_cast<NativeStack*>(aClosure);
MOZ_ASSERT(nativeStack->count < nativeStack->size);
nativeStack->sp_array[nativeStack->count] = aSP;
nativeStack->pc_array[nativeStack->count] = aPC;
nativeStack->count++;
}
static void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
DoNativeBacktrace(PS::LockRef aLock, ProfileBuffer* aBuffer,
TickSample* aSample)
{
void* pc_array[1000];
void* sp_array[1000];
NativeStack nativeStack = {
pc_array,
sp_array,
mozilla::ArrayLength(pc_array),
0
};
// Start with the current function. We use 0 as the frame number here because
// the FramePointerStackWalk() and MozStackWalk() calls below will use 1..N.
// This is a bit weird but it doesn't matter because StackWalkCallback()
// doesn't use the frame number argument.
StackWalkCallback(/* frameNum */ 0, aSample->mPC, aSample->mSP, &nativeStack);
uint32_t maxFrames = uint32_t(nativeStack.size - nativeStack.count);
#if defined(GP_OS_darwin) || (defined(GP_PLAT_x86_windows))
void* stackEnd = aSample->mThreadInfo->StackTop();
if (aSample->mFP >= aSample->mSP && aSample->mFP <= stackEnd) {
FramePointerStackWalk(StackWalkCallback, /* skipFrames */ 0, maxFrames,
&nativeStack, reinterpret_cast<void**>(aSample->mFP),
stackEnd);
}
#else
// Win64 always omits frame pointers so for it we use the slower
// MozStackWalk().
uintptr_t thread = GetThreadHandle(aSample->mThreadInfo->GetPlatformData());
MOZ_ASSERT(thread);
MozStackWalk(StackWalkCallback, /* skipFrames */ 0, maxFrames, &nativeStack,
thread, /* platformData */ nullptr);
#endif
MergeStacksIntoProfile(aBuffer, aSample, nativeStack);
}
#endif
#ifdef USE_EHABI_STACKWALK
static void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
DoNativeBacktrace(PS::LockRef aLock, ProfileBuffer* aBuffer,
TickSample* aSample)
{
void* pc_array[1000];
void* sp_array[1000];
NativeStack nativeStack = {
pc_array,
sp_array,
mozilla::ArrayLength(pc_array),
0
};
const mcontext_t* mcontext =
&reinterpret_cast<ucontext_t*>(aSample->mContext)->uc_mcontext;
mcontext_t savedContext;
NotNull<PseudoStack*> pseudoStack = aSample->mThreadInfo->Stack();
// The pseudostack contains an "EnterJIT" frame whenever we enter
// JIT code with profiling enabled; the stack pointer value points
// the saved registers. We use this to unwind resume unwinding
// after encounting JIT code.
for (uint32_t i = pseudoStack->stackSize(); i > 0; --i) {
// The pseudostack grows towards higher indices, so we iterate
// backwards (from callee to caller).
volatile js::ProfileEntry& entry = pseudoStack->mStack[i - 1];
if (!entry.isJs() && strcmp(entry.label(), "EnterJIT") == 0) {
// Found JIT entry frame. Unwind up to that point (i.e., force
// the stack walk to stop before the block of saved registers;
// note that it yields nondecreasing stack pointers), then restore
// the saved state.
uint32_t* vSP = reinterpret_cast<uint32_t*>(entry.stackAddress());
nativeStack.count += EHABIStackWalk(*mcontext,
/* stackBase = */ vSP,
sp_array + nativeStack.count,
pc_array + nativeStack.count,
nativeStack.size - nativeStack.count);
memset(&savedContext, 0, sizeof(savedContext));
// See also: struct EnterJITStack in js/src/jit/arm/Trampoline-arm.cpp
savedContext.arm_r4 = *vSP++;
savedContext.arm_r5 = *vSP++;
savedContext.arm_r6 = *vSP++;
savedContext.arm_r7 = *vSP++;
savedContext.arm_r8 = *vSP++;
savedContext.arm_r9 = *vSP++;
savedContext.arm_r10 = *vSP++;
savedContext.arm_fp = *vSP++;
savedContext.arm_lr = *vSP++;
savedContext.arm_sp = reinterpret_cast<uint32_t>(vSP);
savedContext.arm_pc = savedContext.arm_lr;
mcontext = &savedContext;
}
}
// Now unwind whatever's left (starting from either the last EnterJIT frame
// or, if no EnterJIT was found, the original registers).
nativeStack.count += EHABIStackWalk(*mcontext,
aSample->mThreadInfo->StackTop(),
sp_array + nativeStack.count,
pc_array + nativeStack.count,
nativeStack.size - nativeStack.count);
MergeStacksIntoProfile(aBuffer, aSample, nativeStack);
}
#endif
#ifdef USE_LUL_STACKWALK
static void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
DoNativeBacktrace(PS::LockRef aLock, ProfileBuffer* aBuffer,
TickSample* aSample)
{
const mcontext_t* mc =
&reinterpret_cast<ucontext_t*>(aSample->mContext)->uc_mcontext;
lul::UnwindRegs startRegs;
memset(&startRegs, 0, sizeof(startRegs));
#if defined(GP_PLAT_amd64_linux)
startRegs.xip = lul::TaggedUWord(mc->gregs[REG_RIP]);
startRegs.xsp = lul::TaggedUWord(mc->gregs[REG_RSP]);
startRegs.xbp = lul::TaggedUWord(mc->gregs[REG_RBP]);
#elif defined(GP_PLAT_arm_android)
startRegs.r15 = lul::TaggedUWord(mc->arm_pc);
startRegs.r14 = lul::TaggedUWord(mc->arm_lr);
startRegs.r13 = lul::TaggedUWord(mc->arm_sp);
startRegs.r12 = lul::TaggedUWord(mc->arm_ip);
startRegs.r11 = lul::TaggedUWord(mc->arm_fp);
startRegs.r7 = lul::TaggedUWord(mc->arm_r7);
#elif defined(GP_PLAT_x86_linux) || defined(GP_PLAT_x86_android)
startRegs.xip = lul::TaggedUWord(mc->gregs[REG_EIP]);
startRegs.xsp = lul::TaggedUWord(mc->gregs[REG_ESP]);
startRegs.xbp = lul::TaggedUWord(mc->gregs[REG_EBP]);
#else
# error "Unknown plat"
#endif
// Copy up to N_STACK_BYTES from rsp-REDZONE upwards, but not going past the
// stack's registered top point. Do some basic sanity checks too. This
// assumes that the TaggedUWord holding the stack pointer value is valid, but
// it should be, since it was constructed that way in the code just above.
lul::StackImage stackImg;
{
#if defined(GP_PLAT_amd64_linux)
uintptr_t rEDZONE_SIZE = 128;
uintptr_t start = startRegs.xsp.Value() - rEDZONE_SIZE;
#elif defined(GP_PLAT_arm_android)
uintptr_t rEDZONE_SIZE = 0;
uintptr_t start = startRegs.r13.Value() - rEDZONE_SIZE;
#elif defined(GP_PLAT_x86_linux) || defined(GP_PLAT_x86_android)
uintptr_t rEDZONE_SIZE = 0;
uintptr_t start = startRegs.xsp.Value() - rEDZONE_SIZE;
#else
# error "Unknown plat"
#endif
uintptr_t end = reinterpret_cast<uintptr_t>(aSample->mThreadInfo->StackTop());
uintptr_t ws = sizeof(void*);
start &= ~(ws-1);
end &= ~(ws-1);
uintptr_t nToCopy = 0;
if (start < end) {
nToCopy = end - start;
if (nToCopy > lul::N_STACK_BYTES)
nToCopy = lul::N_STACK_BYTES;
}
MOZ_ASSERT(nToCopy <= lul::N_STACK_BYTES);
stackImg.mLen = nToCopy;
stackImg.mStartAvma = start;
if (nToCopy > 0) {
memcpy(&stackImg.mContents[0], (void*)start, nToCopy);
(void)VALGRIND_MAKE_MEM_DEFINED(&stackImg.mContents[0], nToCopy);
}
}
// The maximum number of frames that LUL will produce. Setting it
// too high gives a risk of it wasting a lot of time looping on
// corrupted stacks.
const int MAX_NATIVE_FRAMES = 256;
size_t scannedFramesAllowed = 0;
uintptr_t framePCs[MAX_NATIVE_FRAMES];
uintptr_t frameSPs[MAX_NATIVE_FRAMES];
size_t framesAvail = mozilla::ArrayLength(framePCs);
size_t framesUsed = 0;
size_t scannedFramesAcquired = 0;
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
lul::LUL* lul = gPS->LUL(aLock);
lul->Unwind(&framePCs[0], &frameSPs[0],
&framesUsed, &scannedFramesAcquired,
framesAvail, scannedFramesAllowed,
&startRegs, &stackImg);
NativeStack nativeStack = {
reinterpret_cast<void**>(framePCs),
reinterpret_cast<void**>(frameSPs),
mozilla::ArrayLength(framePCs),
0
};
nativeStack.count = framesUsed;
MergeStacksIntoProfile(aBuffer, aSample, nativeStack);
// Update stats in the LUL stats object. Unfortunately this requires
// three global memory operations.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
lul->mStats.mContext += 1;
lul->mStats.mCFI += framesUsed - 1 - scannedFramesAcquired;
lul->mStats.mScanned += scannedFramesAcquired;
}
#endif
static void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
DoSampleStackTrace(PS::LockRef aLock, ProfileBuffer* aBuffer,
TickSample* aSample)
{
NativeStack nativeStack = { nullptr, nullptr, 0, 0 };
MergeStacksIntoProfile(aBuffer, aSample, nativeStack);
if (gPS->FeatureLeaf(aLock)) {
aBuffer->addTag(ProfileBufferEntry::NativeLeafAddr((void*)aSample->mPC));
}
}
// This function is called for each sampling period with the current program
// counter. It is called within a signal and so must be re-entrant.
static void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
Tick(PS::LockRef aLock, ProfileBuffer* aBuffer, TickSample* aSample)
{
ThreadInfo& threadInfo = *aSample->mThreadInfo;
MOZ_ASSERT(threadInfo.LastSample().mThreadId == threadInfo.ThreadId());
aBuffer->addTagThreadId(threadInfo.LastSample());
mozilla::TimeDuration delta = aSample->mTimeStamp - gPS->StartTime(aLock);
aBuffer->addTag(ProfileBufferEntry::Time(delta.ToMilliseconds()));
NotNull<PseudoStack*> stack = threadInfo.Stack();
#if defined(HAVE_NATIVE_UNWIND)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (gPS->FeatureStackWalk(aLock)) {
DoNativeBacktrace(aLock, aBuffer, aSample);
} else
#endif
{
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
DoSampleStackTrace(aLock, aBuffer, aSample);
}
// Don't process the PeudoStack's markers if we're synchronously sampling the
// current thread.
if (!aSample->mIsSamplingCurrentThread) {
ProfilerMarkerLinkedList* pendingMarkersList = stack->getPendingMarkers();
while (pendingMarkersList && pendingMarkersList->peek()) {
ProfilerMarker* marker = pendingMarkersList->popHead();
aBuffer->addStoredMarker(marker);
aBuffer->addTag(ProfileBufferEntry::Marker(marker));
}
}
if (threadInfo.GetThreadResponsiveness()->HasData()) {
mozilla::TimeDuration delta =
threadInfo.GetThreadResponsiveness()->GetUnresponsiveDuration(
aSample->mTimeStamp);
aBuffer->addTag(ProfileBufferEntry::Responsiveness(delta.ToMilliseconds()));
}
// rssMemory is equal to 0 when we are not recording.
if (aSample->mRSSMemory != 0) {
double rssMemory = static_cast<double>(aSample->mRSSMemory);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
aBuffer->addTag(ProfileBufferEntry::ResidentMemory(rssMemory));
}
// ussMemory is equal to 0 when we are not recording.
if (aSample->mUSSMemory != 0) {
double ussMemory = static_cast<double>(aSample->mUSSMemory);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
aBuffer->addTag(ProfileBufferEntry::UnsharedMemory(ussMemory));
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
int frameNumber = gPS->FrameNumber(aLock);
if (frameNumber != gPS->LatestRecordedFrameNumber(aLock)) {
aBuffer->addTag(ProfileBufferEntry::FrameNumber(frameNumber));
gPS->SetLatestRecordedFrameNumber(aLock, frameNumber);
}
}
// END tick/unwinding code
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// BEGIN saving/streaming code
class ProfileSaveEvent final : public nsIProfileSaveEvent
{
public:
typedef void (*AddSubProfileFunc)(const char* aProfile, void* aClosure);
NS_DECL_ISUPPORTS
ProfileSaveEvent(AddSubProfileFunc aFunc, void* aClosure)
: mFunc(aFunc)
, mClosure(aClosure)
{}
NS_IMETHOD AddSubProfile(const char* aProfile) override {
mFunc(aProfile, mClosure);
return NS_OK;
}
private:
~ProfileSaveEvent() {}
AddSubProfileFunc mFunc;
void* mClosure;
};
NS_IMPL_ISUPPORTS(ProfileSaveEvent, nsIProfileSaveEvent)
const static uint64_t kJS_MAX_SAFE_UINTEGER = +9007199254740991ULL;
static int64_t
SafeJSInteger(uint64_t aValue) {
return aValue <= kJS_MAX_SAFE_UINTEGER ? int64_t(aValue) : -1;
}
static void
AddSharedLibraryInfoToStream(JSONWriter& aWriter, const SharedLibrary& aLib)
{
aWriter.StartObjectElement();
aWriter.IntProperty("start", SafeJSInteger(aLib.GetStart()));
aWriter.IntProperty("end", SafeJSInteger(aLib.GetEnd()));
aWriter.IntProperty("offset", SafeJSInteger(aLib.GetOffset()));
Bug 1329111 - Change the nsIProfiler shared library information API. r=njn API before this change: - nsIProfiler::getSharedLibraryInformation() returns a string containing a JSON array of libraries. - The profile format is at version 3. - Every profile has a "libs" field that contains the same JSON string as the return value of nsIProfiler::getSharedLibraryInformation. - The array of libraries is not sorted. - Each library has a "name" field that contains: - The module's debug name on Windows - The full path to the binary on Mac + Linux API after this change: - nsIProfiler::getSharedLibraryInformation() is removed. - nsIProfiler has a readonly property called sharedLibraries. - The profile format is at version 4. - Every profile has a "libs" field that contains the same array as nsIProfiler.sharedLibraries, no longer as a JSON string but as a regular array. - The array of libraries is sorted by start address. - Each library has a "name" field that contains the binary file's basename, on all platforms. - Each library has a "path" field that contains the full path to the binary, on all platforms. - Each library has a "debugName" field that contains the library's debug name, on all platforms. On Windows, the debug name is the filename (basename) of the pdb file for that binary. On other platforms, debugName is the same as |name|. - Each library has a "debugPath" field that contains the absolute path library's pdb file on Windows; on non-Windows, debugPath and path are the same. - Each library has an "arch" field that is either an empty string (Linux + Windows) or the library's architecture; it'll differentiate between the architectures "x86_64" and "x86_64h". (x86_64h is used for binaries that contain instructions that are specific to the Intel Haswell microarchitecture.) MozReview-Commit-ID: 8Nrs4dyHhDS --HG-- extra : rebase_source : 4039926ae4d776bf53ea71df5fe3f8200d3e2784 extra : source : 4e282aa03422de5b8d51e1aaeb3e53ee547293dd
2017-03-15 01:59:20 +03:00
aWriter.StringProperty("name", NS_ConvertUTF16toUTF8(aLib.GetModuleName()).get());
aWriter.StringProperty("path", NS_ConvertUTF16toUTF8(aLib.GetModulePath()).get());
aWriter.StringProperty("debugName", NS_ConvertUTF16toUTF8(aLib.GetDebugName()).get());
aWriter.StringProperty("debugPath", NS_ConvertUTF16toUTF8(aLib.GetDebugPath()).get());
aWriter.StringProperty("breakpadId", aLib.GetBreakpadId().c_str());
Bug 1329111 - Change the nsIProfiler shared library information API. r=njn API before this change: - nsIProfiler::getSharedLibraryInformation() returns a string containing a JSON array of libraries. - The profile format is at version 3. - Every profile has a "libs" field that contains the same JSON string as the return value of nsIProfiler::getSharedLibraryInformation. - The array of libraries is not sorted. - Each library has a "name" field that contains: - The module's debug name on Windows - The full path to the binary on Mac + Linux API after this change: - nsIProfiler::getSharedLibraryInformation() is removed. - nsIProfiler has a readonly property called sharedLibraries. - The profile format is at version 4. - Every profile has a "libs" field that contains the same array as nsIProfiler.sharedLibraries, no longer as a JSON string but as a regular array. - The array of libraries is sorted by start address. - Each library has a "name" field that contains the binary file's basename, on all platforms. - Each library has a "path" field that contains the full path to the binary, on all platforms. - Each library has a "debugName" field that contains the library's debug name, on all platforms. On Windows, the debug name is the filename (basename) of the pdb file for that binary. On other platforms, debugName is the same as |name|. - Each library has a "debugPath" field that contains the absolute path library's pdb file on Windows; on non-Windows, debugPath and path are the same. - Each library has an "arch" field that is either an empty string (Linux + Windows) or the library's architecture; it'll differentiate between the architectures "x86_64" and "x86_64h". (x86_64h is used for binaries that contain instructions that are specific to the Intel Haswell microarchitecture.) MozReview-Commit-ID: 8Nrs4dyHhDS --HG-- extra : rebase_source : 4039926ae4d776bf53ea71df5fe3f8200d3e2784 extra : source : 4e282aa03422de5b8d51e1aaeb3e53ee547293dd
2017-03-15 01:59:20 +03:00
aWriter.StringProperty("arch", aLib.GetArch().c_str());
aWriter.EndObject();
}
Bug 1329111 - Change the nsIProfiler shared library information API. r=njn API before this change: - nsIProfiler::getSharedLibraryInformation() returns a string containing a JSON array of libraries. - The profile format is at version 3. - Every profile has a "libs" field that contains the same JSON string as the return value of nsIProfiler::getSharedLibraryInformation. - The array of libraries is not sorted. - Each library has a "name" field that contains: - The module's debug name on Windows - The full path to the binary on Mac + Linux API after this change: - nsIProfiler::getSharedLibraryInformation() is removed. - nsIProfiler has a readonly property called sharedLibraries. - The profile format is at version 4. - Every profile has a "libs" field that contains the same array as nsIProfiler.sharedLibraries, no longer as a JSON string but as a regular array. - The array of libraries is sorted by start address. - Each library has a "name" field that contains the binary file's basename, on all platforms. - Each library has a "path" field that contains the full path to the binary, on all platforms. - Each library has a "debugName" field that contains the library's debug name, on all platforms. On Windows, the debug name is the filename (basename) of the pdb file for that binary. On other platforms, debugName is the same as |name|. - Each library has a "debugPath" field that contains the absolute path library's pdb file on Windows; on non-Windows, debugPath and path are the same. - Each library has an "arch" field that is either an empty string (Linux + Windows) or the library's architecture; it'll differentiate between the architectures "x86_64" and "x86_64h". (x86_64h is used for binaries that contain instructions that are specific to the Intel Haswell microarchitecture.) MozReview-Commit-ID: 8Nrs4dyHhDS --HG-- extra : rebase_source : 4039926ae4d776bf53ea71df5fe3f8200d3e2784 extra : source : 4e282aa03422de5b8d51e1aaeb3e53ee547293dd
2017-03-15 01:59:20 +03:00
void
AppendSharedLibraries(JSONWriter& aWriter)
{
SharedLibraryInfo info = SharedLibraryInfo::GetInfoForSelf();
Bug 1329111 - Change the nsIProfiler shared library information API. r=njn API before this change: - nsIProfiler::getSharedLibraryInformation() returns a string containing a JSON array of libraries. - The profile format is at version 3. - Every profile has a "libs" field that contains the same JSON string as the return value of nsIProfiler::getSharedLibraryInformation. - The array of libraries is not sorted. - Each library has a "name" field that contains: - The module's debug name on Windows - The full path to the binary on Mac + Linux API after this change: - nsIProfiler::getSharedLibraryInformation() is removed. - nsIProfiler has a readonly property called sharedLibraries. - The profile format is at version 4. - Every profile has a "libs" field that contains the same array as nsIProfiler.sharedLibraries, no longer as a JSON string but as a regular array. - The array of libraries is sorted by start address. - Each library has a "name" field that contains the binary file's basename, on all platforms. - Each library has a "path" field that contains the full path to the binary, on all platforms. - Each library has a "debugName" field that contains the library's debug name, on all platforms. On Windows, the debug name is the filename (basename) of the pdb file for that binary. On other platforms, debugName is the same as |name|. - Each library has a "debugPath" field that contains the absolute path library's pdb file on Windows; on non-Windows, debugPath and path are the same. - Each library has an "arch" field that is either an empty string (Linux + Windows) or the library's architecture; it'll differentiate between the architectures "x86_64" and "x86_64h". (x86_64h is used for binaries that contain instructions that are specific to the Intel Haswell microarchitecture.) MozReview-Commit-ID: 8Nrs4dyHhDS --HG-- extra : rebase_source : 4039926ae4d776bf53ea71df5fe3f8200d3e2784 extra : source : 4e282aa03422de5b8d51e1aaeb3e53ee547293dd
2017-03-15 01:59:20 +03:00
info.SortByAddress();
for (size_t i = 0; i < info.GetSize(); i++) {
Bug 1329111 - Change the nsIProfiler shared library information API. r=njn API before this change: - nsIProfiler::getSharedLibraryInformation() returns a string containing a JSON array of libraries. - The profile format is at version 3. - Every profile has a "libs" field that contains the same JSON string as the return value of nsIProfiler::getSharedLibraryInformation. - The array of libraries is not sorted. - Each library has a "name" field that contains: - The module's debug name on Windows - The full path to the binary on Mac + Linux API after this change: - nsIProfiler::getSharedLibraryInformation() is removed. - nsIProfiler has a readonly property called sharedLibraries. - The profile format is at version 4. - Every profile has a "libs" field that contains the same array as nsIProfiler.sharedLibraries, no longer as a JSON string but as a regular array. - The array of libraries is sorted by start address. - Each library has a "name" field that contains the binary file's basename, on all platforms. - Each library has a "path" field that contains the full path to the binary, on all platforms. - Each library has a "debugName" field that contains the library's debug name, on all platforms. On Windows, the debug name is the filename (basename) of the pdb file for that binary. On other platforms, debugName is the same as |name|. - Each library has a "debugPath" field that contains the absolute path library's pdb file on Windows; on non-Windows, debugPath and path are the same. - Each library has an "arch" field that is either an empty string (Linux + Windows) or the library's architecture; it'll differentiate between the architectures "x86_64" and "x86_64h". (x86_64h is used for binaries that contain instructions that are specific to the Intel Haswell microarchitecture.) MozReview-Commit-ID: 8Nrs4dyHhDS --HG-- extra : rebase_source : 4039926ae4d776bf53ea71df5fe3f8200d3e2784 extra : source : 4e282aa03422de5b8d51e1aaeb3e53ee547293dd
2017-03-15 01:59:20 +03:00
AddSharedLibraryInfoToStream(aWriter, info.GetEntry(i));
}
}
static void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
StreamTaskTracer(PS::LockRef aLock, SpliceableJSONWriter& aWriter)
{
#ifdef MOZ_TASK_TRACER
aWriter.StartArrayProperty("data");
{
UniquePtr<nsTArray<nsCString>> data =
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
mozilla::tasktracer::GetLoggedData(gPS->StartTime(aLock));
for (uint32_t i = 0; i < data->Length(); ++i) {
aWriter.StringElement((data->ElementAt(i)).get());
}
}
aWriter.EndArray();
aWriter.StartArrayProperty("threads");
{
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
const PS::ThreadVector& threads = gPS->Threads(aLock);
for (size_t i = 0; i < threads.size(); i++) {
// Thread meta data
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
ThreadInfo* info = threads.at(i);
aWriter.StartObjectElement();
{
if (XRE_GetProcessType() == GeckoProcessType_Plugin) {
// TODO Add the proper plugin name
aWriter.StringProperty("name", "Plugin");
} else {
aWriter.StringProperty("name", info->Name());
}
aWriter.IntProperty("tid", static_cast<int>(info->ThreadId()));
}
aWriter.EndObject();
}
}
aWriter.EndArray();
aWriter.DoubleProperty(
"start", static_cast<double>(mozilla::tasktracer::GetStartTime()));
#endif
}
static void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
StreamMetaJSCustomObject(PS::LockRef aLock, SpliceableJSONWriter& aWriter)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1329111 - Change the nsIProfiler shared library information API. r=njn API before this change: - nsIProfiler::getSharedLibraryInformation() returns a string containing a JSON array of libraries. - The profile format is at version 3. - Every profile has a "libs" field that contains the same JSON string as the return value of nsIProfiler::getSharedLibraryInformation. - The array of libraries is not sorted. - Each library has a "name" field that contains: - The module's debug name on Windows - The full path to the binary on Mac + Linux API after this change: - nsIProfiler::getSharedLibraryInformation() is removed. - nsIProfiler has a readonly property called sharedLibraries. - The profile format is at version 4. - Every profile has a "libs" field that contains the same array as nsIProfiler.sharedLibraries, no longer as a JSON string but as a regular array. - The array of libraries is sorted by start address. - Each library has a "name" field that contains the binary file's basename, on all platforms. - Each library has a "path" field that contains the full path to the binary, on all platforms. - Each library has a "debugName" field that contains the library's debug name, on all platforms. On Windows, the debug name is the filename (basename) of the pdb file for that binary. On other platforms, debugName is the same as |name|. - Each library has a "debugPath" field that contains the absolute path library's pdb file on Windows; on non-Windows, debugPath and path are the same. - Each library has an "arch" field that is either an empty string (Linux + Windows) or the library's architecture; it'll differentiate between the architectures "x86_64" and "x86_64h". (x86_64h is used for binaries that contain instructions that are specific to the Intel Haswell microarchitecture.) MozReview-Commit-ID: 8Nrs4dyHhDS --HG-- extra : rebase_source : 4039926ae4d776bf53ea71df5fe3f8200d3e2784 extra : source : 4e282aa03422de5b8d51e1aaeb3e53ee547293dd
2017-03-15 01:59:20 +03:00
aWriter.IntProperty("version", 4);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
aWriter.DoubleProperty("interval", gPS->Interval(aLock));
aWriter.IntProperty("stackwalk", gPS->FeatureStackWalk(aLock));
#ifdef DEBUG
aWriter.IntProperty("debug", 1);
#else
aWriter.IntProperty("debug", 0);
#endif
aWriter.IntProperty("gcpoison", JS::IsGCPoisoning() ? 1 : 0);
bool asyncStacks = Preferences::GetBool("javascript.options.asyncstack");
aWriter.IntProperty("asyncstack", asyncStacks);
// The "startTime" field holds the number of milliseconds since midnight
// January 1, 1970 GMT. This grotty code computes (Now - (Now - StartTime))
// to convert gPS->StartTime() into that form.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
mozilla::TimeDuration delta =
mozilla::TimeStamp::Now() - gPS->StartTime(aLock);
aWriter.DoubleProperty(
"startTime", static_cast<double>(PR_Now()/1000.0 - delta.ToMilliseconds()));
aWriter.IntProperty("processType", XRE_GetProcessType());
nsresult res;
nsCOMPtr<nsIHttpProtocolHandler> http =
do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &res);
if (!NS_FAILED(res)) {
nsAutoCString string;
res = http->GetPlatform(string);
if (!NS_FAILED(res)) {
aWriter.StringProperty("platform", string.Data());
}
res = http->GetOscpu(string);
if (!NS_FAILED(res)) {
aWriter.StringProperty("oscpu", string.Data());
}
res = http->GetMisc(string);
if (!NS_FAILED(res)) {
aWriter.StringProperty("misc", string.Data());
}
}
nsCOMPtr<nsIXULRuntime> runtime = do_GetService("@mozilla.org/xre/runtime;1");
if (runtime) {
nsAutoCString string;
res = runtime->GetXPCOMABI(string);
if (!NS_FAILED(res))
aWriter.StringProperty("abi", string.Data());
res = runtime->GetWidgetToolkit(string);
if (!NS_FAILED(res))
aWriter.StringProperty("toolkit", string.Data());
}
nsCOMPtr<nsIXULAppInfo> appInfo =
do_GetService("@mozilla.org/xre/app-info;1");
if (appInfo) {
nsAutoCString string;
res = appInfo->GetName(string);
if (!NS_FAILED(res))
aWriter.StringProperty("product", string.Data());
}
}
struct SubprocessClosure
{
explicit SubprocessClosure(SpliceableJSONWriter* aWriter)
: mWriter(aWriter)
{}
SpliceableJSONWriter* mWriter;
};
static void
SubProcessCallback(const char* aProfile, void* aClosure)
{
// Called by the observer to get their profile data included as a sub profile.
SubprocessClosure* closure = (SubprocessClosure*)aClosure;
// Add the string profile into the profile.
closure->mWriter->StringElement(aProfile);
}
#if defined(PROFILE_JAVA)
static void
BuildJavaThreadJSObject(SpliceableJSONWriter& aWriter)
{
aWriter.StringProperty("name", "Java Main Thread");
aWriter.StartArrayProperty("samples");
{
for (int sampleId = 0; true; sampleId++) {
bool firstRun = true;
for (int frameId = 0; true; frameId++) {
jni::String::LocalRef frameName =
java::GeckoJavaSampler::GetFrameName(0, sampleId, frameId);
// When we run out of frames, we stop looping.
if (!frameName) {
// If we found at least one frame, we have objects to close.
if (!firstRun) {
aWriter.EndArray();
aWriter.EndObject();
}
break;
}
// The first time around, open the sample object and frames array.
if (firstRun) {
firstRun = false;
double sampleTime =
java::GeckoJavaSampler::GetSampleTime(0, sampleId);
aWriter.StartObjectElement();
aWriter.DoubleProperty("time", sampleTime);
aWriter.StartArrayProperty("frames");
}
// Add a frame to the sample.
aWriter.StartObjectElement();
{
aWriter.StringProperty("location",
frameName->ToCString().BeginReading());
}
aWriter.EndObject();
}
// If we found no frames for this sample, we are done.
if (firstRun) {
break;
}
}
}
aWriter.EndArray();
}
#endif
static void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
StreamJSON(PS::LockRef aLock, SpliceableJSONWriter& aWriter, double aSinceTime)
{
LOG("StreamJSON");
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS && gPS->IsActive(aLock));
aWriter.Start(SpliceableJSONWriter::SingleLineStyle);
{
// Put shared library info
Bug 1329111 - Change the nsIProfiler shared library information API. r=njn API before this change: - nsIProfiler::getSharedLibraryInformation() returns a string containing a JSON array of libraries. - The profile format is at version 3. - Every profile has a "libs" field that contains the same JSON string as the return value of nsIProfiler::getSharedLibraryInformation. - The array of libraries is not sorted. - Each library has a "name" field that contains: - The module's debug name on Windows - The full path to the binary on Mac + Linux API after this change: - nsIProfiler::getSharedLibraryInformation() is removed. - nsIProfiler has a readonly property called sharedLibraries. - The profile format is at version 4. - Every profile has a "libs" field that contains the same array as nsIProfiler.sharedLibraries, no longer as a JSON string but as a regular array. - The array of libraries is sorted by start address. - Each library has a "name" field that contains the binary file's basename, on all platforms. - Each library has a "path" field that contains the full path to the binary, on all platforms. - Each library has a "debugName" field that contains the library's debug name, on all platforms. On Windows, the debug name is the filename (basename) of the pdb file for that binary. On other platforms, debugName is the same as |name|. - Each library has a "debugPath" field that contains the absolute path library's pdb file on Windows; on non-Windows, debugPath and path are the same. - Each library has an "arch" field that is either an empty string (Linux + Windows) or the library's architecture; it'll differentiate between the architectures "x86_64" and "x86_64h". (x86_64h is used for binaries that contain instructions that are specific to the Intel Haswell microarchitecture.) MozReview-Commit-ID: 8Nrs4dyHhDS --HG-- extra : rebase_source : 4039926ae4d776bf53ea71df5fe3f8200d3e2784 extra : source : 4e282aa03422de5b8d51e1aaeb3e53ee547293dd
2017-03-15 01:59:20 +03:00
aWriter.StartArrayProperty("libs");
AppendSharedLibraries(aWriter);
aWriter.EndArray();
// Put meta data
aWriter.StartObjectProperty("meta");
{
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
StreamMetaJSCustomObject(aLock, aWriter);
}
aWriter.EndObject();
// Data of TaskTracer doesn't belong in the circular buffer.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (gPS->FeatureTaskTracer(aLock)) {
aWriter.StartObjectProperty("tasktracer");
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
StreamTaskTracer(aLock, aWriter);
aWriter.EndObject();
}
// Lists the samples for each thread profile
aWriter.StartArrayProperty("threads");
{
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetIsPaused(aLock, true);
{
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
const PS::ThreadVector& threads = gPS->Threads(aLock);
for (size_t i = 0; i < threads.size(); i++) {
// Thread not being profiled, skip it
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
ThreadInfo* info = threads.at(i);
if (!info->HasProfile()) {
continue;
}
// Note that we intentionally include thread profiles which
// have been marked for pending delete.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
info->StreamJSON(gPS->Buffer(aLock), aWriter, gPS->StartTime(aLock),
aSinceTime);
}
}
// When notifying observers in other places in this file we are careful
// to do it when gPSMutex is unlocked, to avoid deadlocks. But that's not
// necessary here, because "profiler-subprocess" observers just call back
// into SubprocessCallback, which is simple and doesn't lock gPSMutex.
if (CanNotifyObservers()) {
// Send a event asking any subprocesses (plugins) to
// give us their information
SubprocessClosure closure(&aWriter);
nsCOMPtr<nsIObserverService> os =
mozilla::services::GetObserverService();
if (os) {
RefPtr<ProfileSaveEvent> pse =
new ProfileSaveEvent(SubProcessCallback, &closure);
os->NotifyObservers(pse, "profiler-subprocess", nullptr);
}
}
#if defined(PROFILE_JAVA)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (gPS->FeatureJava(aLock)) {
java::GeckoJavaSampler::Pause();
aWriter.Start();
{
BuildJavaThreadJSObject(aWriter);
}
aWriter.End();
java::GeckoJavaSampler::Unpause();
}
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetIsPaused(aLock, false);
}
aWriter.EndArray();
}
aWriter.End();
}
UniquePtr<char[]>
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
ToJSON(PS::LockRef aLock, double aSinceTime)
{
LOG("ToJSON");
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(NS_IsMainThread());
MOZ_RELEASE_ASSERT(gPS && gPS->IsActive(aLock));
SpliceableChunkedJSONWriter b;
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
StreamJSON(aLock, b, aSinceTime);
return b.WriteFunc()->CopyData();
}
// END saving/streaming code
////////////////////////////////////////////////////////////////////////
ProfilerMarker::ProfilerMarker(const char* aMarkerName,
ProfilerMarkerPayload* aPayload,
double aTime)
: mMarkerName(strdup(aMarkerName))
, mPayload(aPayload)
, mTime(aTime)
{
}
ProfilerMarker::~ProfilerMarker() {
free(mMarkerName);
delete mPayload;
}
void
ProfilerMarker::SetGeneration(uint32_t aGenID) {
mGenID = aGenID;
}
double
ProfilerMarker::GetTime() const {
return mTime;
}
void ProfilerMarker::StreamJSON(SpliceableJSONWriter& aWriter,
const TimeStamp& aStartTime,
UniqueStacks& aUniqueStacks) const
{
// Schema:
// [name, time, data]
aWriter.StartArrayElement();
{
aUniqueStacks.mUniqueStrings.WriteElement(aWriter, GetMarkerName());
aWriter.DoubleElement(mTime);
// TODO: Store the callsite for this marker if available:
// if have location data
// b.NameValue(marker, "location", ...);
if (mPayload) {
aWriter.StartObjectElement();
{
mPayload->StreamPayload(aWriter, aStartTime, aUniqueStacks);
}
aWriter.EndObject();
}
}
aWriter.EndArray();
}
static bool
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
set_profiler_interval(PS::LockRef aLock, const char* aInterval)
{
if (aInterval) {
errno = 0;
long int n = strtol(aInterval, nullptr, 10);
if (errno == 0 && 1 <= n && n <= 1000) {
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetEnvVarInterval(aLock, n);
return true;
}
return false;
}
return true;
}
static bool
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
set_profiler_entries(PS::LockRef aLock, const char* aEntries)
{
if (aEntries) {
errno = 0;
long int n = strtol(aEntries, nullptr, 10);
if (errno == 0 && n > 0) {
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetEnvVarEntries(aLock, n);
return true;
}
return false;
}
return true;
}
static void
profiler_usage(int aExitCode)
{
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(NS_IsMainThread());
MOZ_RELEASE_ASSERT(gPS);
printf(
"\n"
"Profiler environment variable usage:\n"
"\n"
" MOZ_PROFILER_HELP\n"
" If set to any value, prints this message.\n"
"\n"
" MOZ_PROFILER_ENTRIES=<1..>\n"
" The number of entries in the profiler's circular buffer.\n"
" If unset, the platform default is used.\n"
"\n"
" MOZ_PROFILER_INTERVAL=<1..1000>\n"
" The interval between samples, measured in milliseconds.\n"
" If unset, platform default is used.\n"
"\n"
" MOZ_LOG\n"
" Enables logging. The levels of logging available are\n"
" 'prof:3' (least verbose), 'prof:4', 'prof:5' (most verbose).\n"
"\n"
" MOZ_PROFILER_STARTUP\n"
" If set to any value, starts the profiler immediately on start-up.\n"
" Useful if you want profile code that runs very early.\n"
"\n"
" MOZ_PROFILER_SHUTDOWN\n"
" If set, the profiler saves a profile to the named file on shutdown.\n"
"\n"
" MOZ_PROFILER_LUL_TEST\n"
" If set to any value, runs LUL unit tests at startup.\n"
"\n"
" This platform %s native unwinding.\n"
"\n",
#if defined(HAVE_NATIVE_UNWIND)
"supports"
#else
"does not support"
#endif
);
exit(aExitCode);
}
// Read env vars at startup, so as to set:
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// gPS->mEnvVarEntries, gPS->mEnvVarInterval
static void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
ReadProfilerEnvVars(PS::LockRef aLock)
{
const char* help = getenv("MOZ_PROFILER_HELP");
const char* entries = getenv("MOZ_PROFILER_ENTRIES");
const char* interval = getenv("MOZ_PROFILER_INTERVAL");
if (help) {
profiler_usage(0); // terminates execution
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (!set_profiler_entries(aLock, entries) ||
!set_profiler_interval(aLock, interval)) {
profiler_usage(1); // terminates execution
}
LOG("entries = %d (zero means \"platform default\")",
gPS->EnvVarEntries(aLock));
LOG("interval = %d ms (zero means \"platform default\")",
gPS->EnvVarInterval(aLock));
}
Bug 1344169 - Factor out the common parts of SamplerThread::Run(). r=n.nethercote. All three platform-*.cpp files have similar structure, most especially for SamplerThread::Run(), with considerable duplication. This patch factors out the common parts into a single implementation in platform.cpp. * The top level structure of class SamplerThread has been moved to platform.cpp. * The class has some target-dependent fields, relating to signal handling and thread identity. * There's a single implementation of Run() in platform.cpp. * AllocPlatformData() and PlatformDataDestructor::operator() have also been commoned up and moved into platform.cpp. * Time units in SamplerThread have been tidied up. We now use microseconds throughout, except in the constructor. All time interval field and variable names incorporate the unit (microseconds/milliseconds) for clarity. The Windows uses of such values are scaled up/down by 1000 accordingly. * The pre-existing MacOS Run() implementation contained logic that attempted to keep "to schedule" in the presence of inaccuracy in the actual sleep intervals. This now applies to all targets. A couple of comments on this code have been added. * platform-{win32,macos,linux-android}.cpp have had their Run() methods removed, and all other methods placed in the same sequences, to the extent that is possible. * In the Win32 and MacOS implementations, Thread::SampleContext has been renamed to Thread::SuspendSampleAndResumeThread as that better describes what it does. In the Linux/Android implementation there was no such separate method, so one has been created. * The three Thread::SuspendSampleAndResumeThread methods have been commented in such a way as to emphasise their identical top level structure. * The point in platform.cpp where platform-{win32,macos,linux-android}.cpp are #included has been moved slightly earlier in the file, into the SamplerThread encampment, as that seems like a better place for it. --HG-- extra : rebase_source : 0f93e15967b810c09e645fa593dbf85f94b53a9b
2017-03-10 18:10:14 +03:00
////////////////////////////////////////////////////////////////////////
// BEGIN SamplerThread
// This suspends the calling thread for the given number of microseconds.
// Best effort timing.
static void SleepMicro(int aMicroseconds);
#if defined(GP_OS_linux) || defined(GP_OS_android)
struct SigHandlerCoordinator;
#endif
// The sampler thread controls sampling and runs whenever the profiler is
// active. It periodically runs through all registered threads, finds those
// that should be sampled, then pauses and samples them.
class SamplerThread
{
public:
// Creates a sampler thread, but doesn't start it.
SamplerThread(PS::LockRef aLock, uint32_t aActivityGeneration,
double aIntervalMilliseconds);
~SamplerThread();
// This runs on the sampler thread. It suspends and resumes the samplee
// threads.
void SuspendAndSampleAndResumeThread(PS::LockRef aLock, TickSample* aSample);
Bug 1344169 - Factor out the common parts of SamplerThread::Run(). r=n.nethercote. All three platform-*.cpp files have similar structure, most especially for SamplerThread::Run(), with considerable duplication. This patch factors out the common parts into a single implementation in platform.cpp. * The top level structure of class SamplerThread has been moved to platform.cpp. * The class has some target-dependent fields, relating to signal handling and thread identity. * There's a single implementation of Run() in platform.cpp. * AllocPlatformData() and PlatformDataDestructor::operator() have also been commoned up and moved into platform.cpp. * Time units in SamplerThread have been tidied up. We now use microseconds throughout, except in the constructor. All time interval field and variable names incorporate the unit (microseconds/milliseconds) for clarity. The Windows uses of such values are scaled up/down by 1000 accordingly. * The pre-existing MacOS Run() implementation contained logic that attempted to keep "to schedule" in the presence of inaccuracy in the actual sleep intervals. This now applies to all targets. A couple of comments on this code have been added. * platform-{win32,macos,linux-android}.cpp have had their Run() methods removed, and all other methods placed in the same sequences, to the extent that is possible. * In the Win32 and MacOS implementations, Thread::SampleContext has been renamed to Thread::SuspendSampleAndResumeThread as that better describes what it does. In the Linux/Android implementation there was no such separate method, so one has been created. * The three Thread::SuspendSampleAndResumeThread methods have been commented in such a way as to emphasise their identical top level structure. * The point in platform.cpp where platform-{win32,macos,linux-android}.cpp are #included has been moved slightly earlier in the file, into the SamplerThread encampment, as that seems like a better place for it. --HG-- extra : rebase_source : 0f93e15967b810c09e645fa593dbf85f94b53a9b
2017-03-10 18:10:14 +03:00
// This runs on (is!) the sampler thread.
void Run();
// This runs on the main thread.
void Stop(PS::LockRef aLock);
private:
// The activity generation, for detecting when the sampler thread must stop.
const uint32_t mActivityGeneration;
// The interval between samples, measured in microseconds.
const int mIntervalMicroseconds;
// The OS-specific handle for the sampler thread.
#if defined(GP_OS_windows)
HANDLE mThread;
#elif defined(GP_OS_darwin) || defined(GP_OS_linux) || defined(GP_OS_android)
pthread_t mThread;
#endif
#if defined(GP_OS_linux) || defined(GP_OS_android)
// Used to restore the SIGPROF handler when ours is removed.
struct sigaction mOldSigprofHandler;
// This process' ID. Needed as an argument for tgkill in
// SuspendAndSampleAndResumeThread.
int mMyPid;
public:
// The sampler thread's ID. Used to assert that it is not sampling itself,
// which would lead to deadlock.
int mSamplerTid;
// This is the one-and-only variable used to communicate between the sampler
// thread and the samplee thread's signal handler. It's static because the
// samplee thread's signal handler is static.
static struct SigHandlerCoordinator* sSigHandlerCoordinator;
#endif
private:
SamplerThread(const SamplerThread&) = delete;
void operator=(const SamplerThread&) = delete;
};
// This function is the sampler thread. This implementation is used for all
// targets.
void
SamplerThread::Run()
{
// This will be positive if we are running behind schedule (sampling less
// frequently than desired) and negative if we are ahead of schedule.
TimeDuration lastSleepOvershoot = 0;
TimeStamp sampleStart = TimeStamp::Now();
while (true) {
// This scope is for |lock|. It ends before we sleep below.
{
PS::AutoLock lock(gPSMutex);
// At this point profiler_stop() might have been called, and
// profiler_start() might have been called on another thread.
// Alternatively, profiler_shutdown() might have been called and gPS
// may be null. In all these cases, PS::sActivityGeneration will no
// longer equal mActivityGeneration, so we must exit immediately, but
// without touching gPS. (This is why PS::sActivityGeneration must be
// static.)
if (PS::ActivityGeneration(lock) != mActivityGeneration) {
return;
}
gPS->Buffer(lock)->deleteExpiredStoredMarkers();
if (!gPS->IsPaused(lock)) {
const PS::ThreadVector& threads = gPS->Threads(lock);
for (uint32_t i = 0; i < threads.size(); i++) {
ThreadInfo* info = threads[i];
if (!info->HasProfile() || info->IsPendingDelete()) {
// We are not interested in profiling this thread.
continue;
}
// If the thread is asleep and has been sampled before in the same
// sleep episode, find and copy the previous sample, as that's
// cheaper than taking a new sample.
if (info->Stack()->CanDuplicateLastSampleDueToSleep()) {
bool dup_ok =
gPS->Buffer(lock)->DuplicateLastSample(gPS->StartTime(lock),
info->LastSample());
if (dup_ok) {
continue;
}
}
info->UpdateThreadResponsiveness();
TickSample sample(info);
Bug 1344169 - Factor out the common parts of SamplerThread::Run(). r=n.nethercote. All three platform-*.cpp files have similar structure, most especially for SamplerThread::Run(), with considerable duplication. This patch factors out the common parts into a single implementation in platform.cpp. * The top level structure of class SamplerThread has been moved to platform.cpp. * The class has some target-dependent fields, relating to signal handling and thread identity. * There's a single implementation of Run() in platform.cpp. * AllocPlatformData() and PlatformDataDestructor::operator() have also been commoned up and moved into platform.cpp. * Time units in SamplerThread have been tidied up. We now use microseconds throughout, except in the constructor. All time interval field and variable names incorporate the unit (microseconds/milliseconds) for clarity. The Windows uses of such values are scaled up/down by 1000 accordingly. * The pre-existing MacOS Run() implementation contained logic that attempted to keep "to schedule" in the presence of inaccuracy in the actual sleep intervals. This now applies to all targets. A couple of comments on this code have been added. * platform-{win32,macos,linux-android}.cpp have had their Run() methods removed, and all other methods placed in the same sequences, to the extent that is possible. * In the Win32 and MacOS implementations, Thread::SampleContext has been renamed to Thread::SuspendSampleAndResumeThread as that better describes what it does. In the Linux/Android implementation there was no such separate method, so one has been created. * The three Thread::SuspendSampleAndResumeThread methods have been commented in such a way as to emphasise their identical top level structure. * The point in platform.cpp where platform-{win32,macos,linux-android}.cpp are #included has been moved slightly earlier in the file, into the SamplerThread encampment, as that seems like a better place for it. --HG-- extra : rebase_source : 0f93e15967b810c09e645fa593dbf85f94b53a9b
2017-03-10 18:10:14 +03:00
// We only get the memory measurements once for all threads.
if (i == 0 && gPS->FeatureMemory(lock)) {
sample.mRSSMemory = nsMemoryReporterManager::ResidentFast();
#if defined(GP_OS_linux) || defined(GP_OS_android)
sample.mUSSMemory = nsMemoryReporterManager::ResidentUnique();
#endif
}
SuspendAndSampleAndResumeThread(lock, &sample);
Bug 1344169 - Factor out the common parts of SamplerThread::Run(). r=n.nethercote. All three platform-*.cpp files have similar structure, most especially for SamplerThread::Run(), with considerable duplication. This patch factors out the common parts into a single implementation in platform.cpp. * The top level structure of class SamplerThread has been moved to platform.cpp. * The class has some target-dependent fields, relating to signal handling and thread identity. * There's a single implementation of Run() in platform.cpp. * AllocPlatformData() and PlatformDataDestructor::operator() have also been commoned up and moved into platform.cpp. * Time units in SamplerThread have been tidied up. We now use microseconds throughout, except in the constructor. All time interval field and variable names incorporate the unit (microseconds/milliseconds) for clarity. The Windows uses of such values are scaled up/down by 1000 accordingly. * The pre-existing MacOS Run() implementation contained logic that attempted to keep "to schedule" in the presence of inaccuracy in the actual sleep intervals. This now applies to all targets. A couple of comments on this code have been added. * platform-{win32,macos,linux-android}.cpp have had their Run() methods removed, and all other methods placed in the same sequences, to the extent that is possible. * In the Win32 and MacOS implementations, Thread::SampleContext has been renamed to Thread::SuspendSampleAndResumeThread as that better describes what it does. In the Linux/Android implementation there was no such separate method, so one has been created. * The three Thread::SuspendSampleAndResumeThread methods have been commented in such a way as to emphasise their identical top level structure. * The point in platform.cpp where platform-{win32,macos,linux-android}.cpp are #included has been moved slightly earlier in the file, into the SamplerThread encampment, as that seems like a better place for it. --HG-- extra : rebase_source : 0f93e15967b810c09e645fa593dbf85f94b53a9b
2017-03-10 18:10:14 +03:00
}
#if defined(USE_LUL_STACKWALK)
// The LUL unwind object accumulates frame statistics. Periodically we
// should poke it to give it a chance to print those statistics. This
// involves doing I/O (fprintf, __android_log_print, etc.) and so
// can't safely be done from the critical section inside
// SuspendAndSampleAndResumeThread, which is why it is done here.
gPS->LUL(lock)->MaybeShowStats();
#endif
}
}
// gPSMutex is not held after this point.
// Calculate how long a sleep to request. After the sleep, measure how
// long we actually slept and take the difference into account when
// calculating the sleep interval for the next iteration. This is an
// attempt to keep "to schedule" in the presence of inaccuracy of the
// actual sleep intervals.
TimeStamp targetSleepEndTime =
sampleStart + TimeDuration::FromMicroseconds(mIntervalMicroseconds);
TimeStamp beforeSleep = TimeStamp::Now();
TimeDuration targetSleepDuration = targetSleepEndTime - beforeSleep;
double sleepTime = std::max(0.0, (targetSleepDuration -
lastSleepOvershoot).ToMicroseconds());
SleepMicro(static_cast<int>(sleepTime));
sampleStart = TimeStamp::Now();
lastSleepOvershoot =
sampleStart - (beforeSleep + TimeDuration::FromMicroseconds(sleepTime));
}
}
// We #include these files directly because it means those files can use
// declarations from this file trivially. These provide target-specific
// implementations of all SamplerThread methods except Run().
#if defined(GP_OS_windows)
# include "platform-win32.cpp"
#elif defined(GP_OS_darwin)
# include "platform-macos.cpp"
#elif defined(GP_OS_linux) || defined(GP_OS_android)
# include "platform-linux-android.cpp"
#else
# error "bad platform"
#endif
UniquePlatformData
AllocPlatformData(int aThreadId)
{
return UniquePlatformData(new PlatformData(aThreadId));
}
void
PlatformDataDestructor::operator()(PlatformData* aData)
{
delete aData;
}
// END SamplerThread
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// BEGIN externally visible functions
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_DEFINE_MALLOC_SIZE_OF(GeckoProfilerMallocSizeOf)
NS_IMETHODIMP
GeckoProfilerReporter::CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
size_t profSize = 0;
#if defined(USE_LUL_STACKWALK)
size_t lulSize = 0;
#endif
{
PS::AutoLock lock(gPSMutex);
if (gPS) {
profSize = GeckoProfilerMallocSizeOf(gPS);
const PS::ThreadVector& threads = gPS->Threads(lock);
for (uint32_t i = 0; i < threads.size(); i++) {
ThreadInfo* info = threads.at(i);
profSize += info->SizeOfIncludingThis(GeckoProfilerMallocSizeOf);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (gPS->IsActive(lock)) {
profSize +=
gPS->Buffer(lock)->SizeOfIncludingThis(GeckoProfilerMallocSizeOf);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// Measurement of the following things may be added later if DMD finds it
// is worthwhile:
// - gPS->mFeatures
// - gPS->mThreadNameFilters
// - gPS->mThreads itself (its elements' children are measured above)
// - gPS->mGatherer
// - gPS->mInterposeObserver
#if defined(USE_LUL_STACKWALK)
lul::LUL* lul = gPS->LUL(lock);
lulSize = lul ? lul->SizeOfIncludingThis(GeckoProfilerMallocSizeOf) : 0;
#endif
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
}
MOZ_COLLECT_REPORT(
"explicit/profiler/profiler-state", KIND_HEAP, UNITS_BYTES, profSize,
"Memory used by the Gecko Profiler's ProfilerState object (excluding "
"memory used by LUL).");
#if defined(USE_LUL_STACKWALK)
MOZ_COLLECT_REPORT(
"explicit/profiler/lul", KIND_HEAP, UNITS_BYTES, lulSize,
"Memory used by LUL, a stack unwinder used by the Gecko Profiler.");
#endif
return NS_OK;
}
NS_IMPL_ISUPPORTS(GeckoProfilerReporter, nsIMemoryReporter)
static bool
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
ThreadSelected(PS::LockRef aLock, const char* aThreadName)
{
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
const Vector<std::string>& threadNameFilters = gPS->ThreadNameFilters(aLock);
if (threadNameFilters.empty()) {
return true;
}
std::string name = aThreadName;
std::transform(name.begin(), name.end(), name.begin(), ::tolower);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
for (uint32_t i = 0; i < threadNameFilters.length(); ++i) {
std::string filter = threadNameFilters[i];
std::transform(filter.begin(), filter.end(), filter.begin(), ::tolower);
// Crude, non UTF-8 compatible, case insensitive substring search
if (name.find(filter) != std::string::npos) {
return true;
}
}
return false;
}
static void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MaybeSetProfile(PS::LockRef aLock, ThreadInfo* aInfo)
{
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// This function runs both on and off the main thread.
MOZ_RELEASE_ASSERT(gPS);
if ((aInfo->IsMainThread() || gPS->FeatureThreads(aLock)) &&
ThreadSelected(aLock, aInfo->Name())) {
aInfo->SetHasProfile();
}
}
static void
locked_register_thread(PS::LockRef aLock, const char* aName, void* stackTop)
{
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::ThreadVector& threads = gPS->Threads(aLock);
Thread::tid_t id = Thread::GetCurrentId();
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
for (uint32_t i = 0; i < threads.size(); i++) {
ThreadInfo* info = threads.at(i);
if (info->ThreadId() == id && !info->IsPendingDelete()) {
// Thread already registered. This means the first unregister will be
// too early.
MOZ_ASSERT(false);
return;
}
}
if (!tlsPseudoStack.init()) {
return;
}
NotNull<PseudoStack*> stack = WrapNotNull(new PseudoStack());
tlsPseudoStack.set(stack);
ThreadInfo* info =
new ThreadInfo(aName, id, NS_IsMainThread(), stack, stackTop);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MaybeSetProfile(aLock, info);
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
// This must come after the MaybeSetProfile() call.
if (gPS->IsActive(aLock) && info->HasProfile() && gPS->FeatureJS(aLock)) {
// This startJSSampling() call is on-thread, so we can poll manually to
// start JS sampling immediately.
stack->startJSSampling();
stack->pollJSSampling();
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
threads.push_back(info);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
static void
NotifyProfilerStarted(const int aEntries, double aInterval,
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
const char** aFeatures, uint32_t aFeatureCount,
const char** aThreadNameFilters, uint32_t aFilterCount)
{
if (!CanNotifyObservers()) {
return;
}
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
if (!os) {
return;
}
nsTArray<nsCString> featuresArray;
for (size_t i = 0; i < aFeatureCount; ++i) {
featuresArray.AppendElement(aFeatures[i]);
}
nsTArray<nsCString> threadNameFiltersArray;
for (size_t i = 0; i < aFilterCount; ++i) {
threadNameFiltersArray.AppendElement(aThreadNameFilters[i]);
}
nsCOMPtr<nsIProfilerStartParams> params =
new nsProfilerStartParams(aEntries, aInterval, featuresArray,
threadNameFiltersArray);
os->NotifyObservers(params, "profiler-started", nullptr);
}
static void
NotifyObservers(const char* aTopic)
{
if (!CanNotifyObservers()) {
return;
}
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
if (!os) {
return;
}
os->NotifyObservers(nullptr, aTopic, nullptr);
}
static void
locked_profiler_start(PS::LockRef aLock, const int aEntries, double aInterval,
const char** aFeatures, uint32_t aFeatureCount,
const char** aThreadNameFilters, uint32_t aFilterCount);
void
profiler_init(void* aStackTop)
{
LOG("profiler_init");
MOZ_RELEASE_ASSERT(NS_IsMainThread());
MOZ_RELEASE_ASSERT(!gPS);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
const char* features[] = { "js"
#if defined(PROFILE_JAVA)
, "java"
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
, "leaf"
#if defined(HAVE_NATIVE_UNWIND)
, "stackwalk"
#endif
, "threads"
};
const char* threadFilters[] = { "GeckoMain", "Compositor" };
{
PS::AutoLock lock(gPSMutex);
// We've passed the possible failure point. Instantiate gPS, which
// indicates that the profiler has initialized successfully.
gPS = new PS();
bool ignore;
gPS->SetStartTime(lock, mozilla::TimeStamp::ProcessCreation(ignore));
// Read settings from environment variables.
ReadProfilerEnvVars(lock);
locked_register_thread(lock, kMainThreadName, aStackTop);
// Platform-specific initialization.
PlatformInit(lock);
#ifdef MOZ_TASK_TRACER
mozilla::tasktracer::InitTaskTracer();
#endif
#if defined(PROFILE_JAVA)
if (mozilla::jni::IsFennec()) {
GeckoJavaSampler::Init();
}
#endif
// (Linux-only) We could create gPS->mLUL and read unwind info into it at
// this point. That would match the lifetime implied by destruction of it
// in profiler_shutdown() just below. However, that gives a big delay on
// startup, even if no profiling is actually to be done. So, instead, it is
// created on demand at the first call to PlatformStart().
// We can't open pref so we use an environment variable to know if we
// should trigger the profiler on startup.
// NOTE: Default
const char *val = getenv("MOZ_PROFILER_STARTUP");
if (!val || !*val) {
return;
}
LOG("MOZ_PROFILER_STARTUP is set");
locked_profiler_start(lock, PROFILE_DEFAULT_ENTRIES,
PROFILE_DEFAULT_INTERVAL,
features, MOZ_ARRAY_LENGTH(features),
threadFilters, MOZ_ARRAY_LENGTH(threadFilters));
}
// We do this with gPSMutex unlocked. The comment in profiler_stop() explains
// why.
NotifyProfilerStarted(PROFILE_DEFAULT_ENTRIES, PROFILE_DEFAULT_INTERVAL,
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
features, MOZ_ARRAY_LENGTH(features),
threadFilters, MOZ_ARRAY_LENGTH(threadFilters));
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
static void
locked_profiler_save_profile_to_file(PS::LockRef aLock, const char* aFilename);
static SamplerThread*
locked_profiler_stop(PS::LockRef aLock);
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_shutdown()
{
LOG("profiler_shutdown");
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// If the profiler is active we must get a handle to the SamplerThread before
// gPS is destroyed, in order to delete it.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
SamplerThread* samplerThread = nullptr;
{
PS::AutoLock lock(gPSMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// Save the profile on shutdown if requested.
if (gPS->IsActive(lock)) {
const char* filename = getenv("MOZ_PROFILER_SHUTDOWN");
if (filename) {
locked_profiler_save_profile_to_file(lock, filename);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
samplerThread = locked_profiler_stop(lock);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::ThreadVector& threads = gPS->Threads(lock);
while (threads.size() > 0) {
delete threads.back();
threads.pop_back();
}
#if defined(USE_LUL_STACKWALK)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// Delete the LUL object if it actually got created.
lul::LUL* lul = gPS->LUL(lock);
if (lul) {
delete lul;
gPS->SetLUL(lock, nullptr);
}
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
delete gPS;
gPS = nullptr;
// We just destroyed gPS and the ThreadInfos it contains, so it is safe to
// delete the PseudoStack. tlsPseudoStack is certain to still be the owner
// of its PseudoStack because the main thread is never put in a "pending
// delete" state.
delete tlsPseudoStack.get();
tlsPseudoStack.set(nullptr);
#ifdef MOZ_TASK_TRACER
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
mozilla::tasktracer::ShutdownTaskTracer();
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
}
// We do these operations with gPSMutex unlocked. The comments in
// profiler_stop() explain why.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (samplerThread) {
NotifyObservers("profiler-stopped");
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
delete samplerThread;
}
}
UniquePtr<char[]>
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
profiler_get_profile(double aSinceTime)
{
LOG("profiler_get_profile");
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (!gPS->IsActive(lock)) {
return nullptr;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
return ToJSON(lock, aSinceTime);
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
JSObject*
profiler_get_profile_jsobject(JSContext *aCx, double aSinceTime)
{
LOG("profiler_get_profile_jsobject");
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// |val| must outlive |lock| to avoid a GC hazard.
JS::RootedValue val(aCx);
UniquePtr<char[]> buf = nullptr;
{
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::AutoLock lock(gPSMutex);
if (!gPS->IsActive(lock)) {
return nullptr;
}
buf = ToJSON(lock, aSinceTime);
}
NS_ConvertUTF8toUTF16 js_string(nsDependentCString(buf.get()));
auto buf16 = static_cast<const char16_t*>(js_string.get());
MOZ_ALWAYS_TRUE(JS_ParseJSON(aCx, buf16, js_string.Length(), &val));
return &val.toObject();
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_get_profile_jsobject_async(double aSinceTime,
mozilla::dom::Promise* aPromise)
{
LOG("profiler_get_profile_jsobject_async");
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (!gPS->IsActive(lock)) {
LOG("END profiler_get_profile_jsobject_async: inactive");
return;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->Gatherer(lock)->Start(lock, aSinceTime, aPromise);
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_save_profile_to_file_async(double aSinceTime, const char* aFileName)
{
LOG("BEGIN profiler_save_profile_to_file_async");
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
nsCString filename(aFileName);
NS_DispatchToMainThread(NS_NewRunnableFunction([=] () {
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
LOG("profiler_save_profile_to_file_async callback");
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::AutoLock lock(gPSMutex);
// It's conceivable that profiler_stop() or profiler_shutdown() was called
// between the dispatch and running of this runnable, so check for those.
if (!gPS || !gPS->IsActive(lock)) {
LOG("END profiler_save_profile_to_file_async callback: inactive");
return;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->Gatherer(lock)->Start(lock, aSinceTime, filename);
}));
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_get_start_params(int* aEntries, double* aInterval,
mozilla::Vector<const char*>* aFeatures,
mozilla::Vector<const char*>* aFilters)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
if (NS_WARN_IF(!aEntries) || NS_WARN_IF(!aInterval) ||
NS_WARN_IF(!aFeatures) || NS_WARN_IF(!aFilters)) {
return;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::AutoLock lock(gPSMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
*aEntries = gPS->Entries(lock);
*aInterval = gPS->Interval(lock);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
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();
}
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_will_gather_OOP_profile()
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// This function is called once per subprocess in response to the observation
// of a "profile-subprocess-gather" notification. That notification
// originates from ProfileGatherer::Start2(). The observers receive it and
// immediately call this function, all while Start2() holds gPSMutex locked.
// This is non-trivial, so we assert that gPSMutex is locked as expected...
gPSMutex.AssertCurrentThreadOwns();
// ...therefore we don't need to lock gPSMutex. But we need a PS::AutoLock to
// access gPS, so we make a fake one. This is gross but it's hard to get the
// "profile-subprocess-gather" observers to call back here any other way
// without exposing ProfileGatherer, which causes other difficulties.
static PS::Mutex sFakeMutex;
PS::AutoLock fakeLock(sFakeMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS->IsActive(fakeLock));
gPS->Gatherer(fakeLock)->WillGatherOOPProfile();
}
void
profiler_gathered_OOP_profile()
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (!gPS->IsActive(lock)) {
return;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->Gatherer(lock)->GatheredOOPProfile(lock);
}
void
profiler_OOP_exit_profile(const nsCString& aProfile)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (!gPS->IsActive(lock)) {
return;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->Gatherer(lock)->OOPExitProfile(aProfile);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
static void
locked_profiler_save_profile_to_file(PS::LockRef aLock, const char* aFilename)
{
LOG("locked_profiler_save_profile_to_file(%s)", aFilename);
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS && gPS->IsActive(aLock));
std::ofstream stream;
stream.open(aFilename);
if (stream.is_open()) {
SpliceableJSONWriter w(mozilla::MakeUnique<OStreamJSONWriteFunc>(stream));
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
StreamJSON(aLock, w, /* sinceTime */ 0);
stream.close();
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
}
}
void
profiler_save_profile_to_file(const char* aFilename)
{
LOG("profiler_save_profile_to_file(%s)", aFilename);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(NS_IsMainThread());
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
if (!gPS->IsActive(lock)) {
return;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
locked_profiler_save_profile_to_file(lock, aFilename);
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
const char**
profiler_get_features()
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
static const char* features[] = {
#if defined(HAVE_NATIVE_UNWIND)
// Walk the C++ stack.
"stackwalk",
#endif
// Include the C++ leaf node if not stackwalking. DevTools
// profiler doesn't want the native addresses.
"leaf",
// Profile Java code (Android only).
"java",
// Tell the JS engine to emit pseudostack entries in the prologue/epilogue.
"js",
// GPU Profiling (may not be supported by the GL)
"gpu",
// Profile the registered secondary threads.
"threads",
// Do not include user-identifiable information
"privacy",
// Dump the layer tree with the textures.
"layersdump",
// Dump the display list with the textures.
"displaylistdump",
// Add main thread I/O to the profile
"mainthreadio",
// Add RSS collection
"memory",
// Restyle profiling.
"restyle",
#ifdef MOZ_TASK_TRACER
// Start profiling with feature TaskTracer.
"tasktracer",
#endif
nullptr
};
return features;
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_get_buffer_info_helper(uint32_t* aCurrentPosition,
uint32_t* aEntries,
uint32_t* aGeneration)
{
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
// This function is called by profiler_get_buffer_info(), which has already
// zeroed the outparams.
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::AutoLock lock(gPSMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (!gPS->IsActive(lock)) {
return;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
*aCurrentPosition = gPS->Buffer(lock)->mWritePos;
*aEntries = gPS->Entries(lock);
*aGeneration = gPS->Buffer(lock)->mGeneration;
}
static bool
hasFeature(const char** aFeatures, uint32_t aFeatureCount, const char* aFeature)
{
for (size_t i = 0; i < aFeatureCount; i++) {
if (strcmp(aFeatures[i], aFeature) == 0) {
return true;
}
}
return false;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
static void
locked_profiler_start(PS::LockRef aLock, int aEntries, double aInterval,
const char** aFeatures, uint32_t aFeatureCount,
const char** aThreadNameFilters, uint32_t aFilterCount)
{
if (LOG_TEST) {
LOG("locked_profiler_start");
LOG("- entries = %d", aEntries);
LOG("- interval = %.2f", aInterval);
for (uint32_t i = 0; i < aFeatureCount; i++) {
LOG("- feature = %s", aFeatures[i]);
}
for (uint32_t i = 0; i < aFilterCount; i++) {
LOG("- threads = %s", aThreadNameFilters[i]);
}
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(NS_IsMainThread());
MOZ_RELEASE_ASSERT(gPS && !gPS->IsActive(aLock));
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
bool ignore;
gPS->SetStartTime(aLock, mozilla::TimeStamp::ProcessCreation(ignore));
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// Start with the default value. Then override with the passed-in value, if
// reasonable. Then override with the env var value, if reasonable.
int entries = PROFILE_DEFAULT_ENTRIES;
if (aEntries > 0) {
entries = aEntries;
}
if (gPS->EnvVarEntries(aLock) > 0) {
entries = gPS->EnvVarEntries(aLock);
}
gPS->SetEntries(aLock, entries);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// Ditto.
double interval = PROFILE_DEFAULT_INTERVAL;
if (aInterval > 0) {
interval = aInterval;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (gPS->EnvVarInterval(aLock) > 0) {
interval = gPS->EnvVarInterval(aLock);
}
gPS->SetInterval(aLock, interval);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// Deep copy aFeatures. Must precede the MaybeSetProfile() call below.
Vector<std::string>& features = gPS->Features(aLock);
MOZ_ALWAYS_TRUE(features.resize(aFeatureCount));
for (uint32_t i = 0; i < aFeatureCount; ++i) {
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
features[i] = aFeatures[i];
}
// Deep copy aThreadNameFilters. Must precede the MaybeSetProfile() call
// below.
Vector<std::string>& threadNameFilters = gPS->ThreadNameFilters(aLock);
MOZ_ALWAYS_TRUE(threadNameFilters.resize(aFilterCount));
for (uint32_t i = 0; i < aFilterCount; ++i) {
threadNameFilters[i] = aThreadNameFilters[i];
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
#define HAS_FEATURE(feature) hasFeature(aFeatures, aFeatureCount, feature)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetFeatureDisplayListDump(aLock, HAS_FEATURE("displaylistdump"));
gPS->SetFeatureGPU(aLock, HAS_FEATURE("gpu"));
#if defined(PROFILE_JAVA)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetFeatureJava(aLock, mozilla::jni::IsFennec() && HAS_FEATURE("java"));
#endif
bool featureJS = HAS_FEATURE("js");
gPS->SetFeatureJS(aLock, featureJS);
gPS->SetFeatureLayersDump(aLock, HAS_FEATURE("layersdump"));
gPS->SetFeatureLeaf(aLock, HAS_FEATURE("leaf"));
bool featureMainThreadIO = HAS_FEATURE("mainthreadio");
gPS->SetFeatureMemory(aLock, HAS_FEATURE("memory"));
gPS->SetFeaturePrivacy(aLock, HAS_FEATURE("privacy"));
gPS->SetFeatureRestyle(aLock, HAS_FEATURE("restyle"));
gPS->SetFeatureStackWalk(aLock, HAS_FEATURE("stackwalk"));
#ifdef MOZ_TASK_TRACER
bool featureTaskTracer = HAS_FEATURE("tasktracer");
gPS->SetFeatureTaskTracer(aLock, featureTaskTracer);
#endif
// Profile non-main threads if we have a filter, because users sometimes ask
// to filter by a list of threads but forget to explicitly request.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// Must precede the MaybeSetProfile() call below.
gPS->SetFeatureThreads(aLock, HAS_FEATURE("threads") || aFilterCount > 0);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
#undef HAS_FEATURE
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetBuffer(aLock, new ProfileBuffer(entries));
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetGatherer(aLock, new mozilla::ProfileGatherer());
// Set up profiling for each registered thread, if appropriate.
const PS::ThreadVector& threads = gPS->Threads(aLock);
for (uint32_t i = 0; i < threads.size(); i++) {
ThreadInfo* info = threads.at(i);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MaybeSetProfile(aLock, info);
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
if (info->HasProfile() && !info->IsPendingDelete()) {
info->Stack()->reinitializeOnResume();
if (featureJS) {
info->Stack()->startJSSampling();
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
}
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
}
if (featureJS) {
// We just called startJSSampling() on all relevant threads. We can also
// manually poll the current thread so it starts sampling immediately.
if (PseudoStack* stack = tlsPseudoStack.get()) {
stack->pollJSSampling();
}
}
#ifdef MOZ_TASK_TRACER
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (featureTaskTracer) {
mozilla::tasktracer::StartLogging();
}
#endif
#if defined(PROFILE_JAVA)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (gPS->FeatureJava(aLock)) {
int javaInterval = interval;
// Java sampling doesn't accuratly keep up with 1ms sampling
if (javaInterval < 10) {
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
javaInterval = 10;
}
mozilla::java::GeckoJavaSampler::Start(javaInterval, 1000);
}
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// Must precede the PS::ActivityGeneration() call below.
PS::SetActive(aLock);
gPS->SetIsPaused(aLock, false);
// This creates the sampler thread. It doesn't start sampling immediately
// because the main loop within Run() is blocked until this function's caller
// unlocks gPSMutex.
gPS->SetSamplerThread(aLock, new SamplerThread(aLock,
PS::ActivityGeneration(aLock),
interval));
if (featureMainThreadIO) {
auto interposeObserver = new mozilla::ProfilerIOInterposeObserver();
gPS->SetInterposeObserver(aLock, interposeObserver);
mozilla::IOInterposer::Register(mozilla::IOInterposeObserver::OpAll,
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
interposeObserver);
}
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
profiler_start(int aEntries, double aInterval,
const char** aFeatures, uint32_t aFeatureCount,
const char** aThreadNameFilters, uint32_t aFilterCount)
{
LOG("profiler_start");
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(NS_IsMainThread());
SamplerThread* samplerThread = nullptr;
{
PS::AutoLock lock(gPSMutex);
// Initialize if necessary.
if (!gPS) {
profiler_init(nullptr);
}
// Reset the current state if the profiler is running.
if (gPS->IsActive(lock)) {
samplerThread = locked_profiler_stop(lock);
}
locked_profiler_start(lock, aEntries, aInterval, aFeatures, aFeatureCount,
aThreadNameFilters, aFilterCount);
}
// We do these operations with gPSMutex unlocked. The comments in
// profiler_stop() explain why.
if (samplerThread) {
NotifyObservers("profiler-stopped");
delete samplerThread;
}
NotifyProfilerStarted(aEntries, aInterval, aFeatures, aFeatureCount,
aThreadNameFilters, aFilterCount);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
}
static MOZ_MUST_USE SamplerThread*
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
locked_profiler_stop(PS::LockRef aLock)
{
LOG("locked_profiler_stop");
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(NS_IsMainThread());
MOZ_RELEASE_ASSERT(gPS && gPS->IsActive(aLock));
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// We clear things in roughly reverse order to their setting in
// locked_profiler_start().
mozilla::IOInterposer::Unregister(mozilla::IOInterposeObserver::OpAll,
gPS->InterposeObserver(aLock));
gPS->SetInterposeObserver(aLock, nullptr);
// The Stop() call doesn't actually stop Run(); that happens in this
// function's caller when the sampler thread is destroyed. Stop() just gives
// the SamplerThread a chance to do some cleanup with gPSMutex locked.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
SamplerThread* samplerThread = gPS->SamplerThread(aLock);
samplerThread->Stop(aLock);
gPS->SetSamplerThread(aLock, nullptr);
gPS->SetIsPaused(aLock, false);
gPS->SetInactive(aLock);
#ifdef MOZ_TASK_TRACER
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (gPS->FeatureTaskTracer(aLock)) {
mozilla::tasktracer::StopLogging();
}
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::ThreadVector& threads = gPS->Threads(aLock);
for (uint32_t i = 0; i < threads.size(); i++) {
ThreadInfo* info = threads.at(i);
if (info->IsPendingDelete()) {
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
// We've stopped profiling. Destroy ThreadInfo for dead threads.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
delete info;
threads.erase(threads.begin() + i);
i--;
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
} else if (info->HasProfile() && gPS->FeatureJS(aLock)) {
// Stop JS sampling live threads.
info->Stack()->stopJSSampling();
}
}
if (gPS->FeatureJS(aLock)) {
// We just called stopJSSampling() on all relevant threads. We can also
// manually poll the current thread so it stops profiling immediately.
if (PseudoStack* stack = tlsPseudoStack.get()) {
stack->pollJSSampling();
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
}
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// Cancel any in-flight async profile gathering requests.
gPS->Gatherer(aLock)->Cancel();
gPS->SetGatherer(aLock, nullptr);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
delete gPS->Buffer(aLock);
gPS->SetBuffer(aLock, nullptr);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetFeatureDisplayListDump(aLock, false);
gPS->SetFeatureGPU(aLock, false);
gPS->SetFeatureJava(aLock, false);
gPS->SetFeatureJS(aLock, false);
gPS->SetFeatureLayersDump(aLock, false);
gPS->SetFeatureLeaf(aLock, false);
gPS->SetFeatureMemory(aLock, false);
gPS->SetFeaturePrivacy(aLock, false);
gPS->SetFeatureRestyle(aLock, false);
gPS->SetFeatureStackWalk(aLock, false);
gPS->SetFeatureTaskTracer(aLock, false);
gPS->SetFeatureThreads(aLock, false);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->ThreadNameFilters(aLock).clear();
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->Features(aLock).clear();
gPS->SetInterval(aLock, 0.0);
gPS->SetEntries(aLock, 0);
return samplerThread;
}
void
profiler_stop()
{
LOG("profiler_stop");
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(NS_IsMainThread());
MOZ_RELEASE_ASSERT(gPS);
SamplerThread* samplerThread;
{
PS::AutoLock lock(gPSMutex);
if (!gPS->IsActive(lock)) {
return;
}
samplerThread = locked_profiler_stop(lock);
}
// We notify observers with gPSMutex unlocked. Otherwise we might get a
// deadlock, if code run by the observer calls a profiler function that locks
// gPSMutex. (This has been seen in practise in bug 1346356.)
NotifyObservers("profiler-stopped");
// We delete with gPSMutex unlocked. Otherwise we would get a deadlock: we
// would be waiting here with gPSMutex locked for SamplerThread::Run() to
// return so the join operation within the destructor can complete, but Run()
// needs to lock gPSMutex to return.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
//
// Because this call occurs with gPSMutex unlocked, it -- including the final
// iteration of Run()'s loop -- must be able detect deactivation and return
// in a way that's safe with respect to other gPSMutex-locking operations
// that may have occurred in the meantime.
delete samplerThread;
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
bool
profiler_is_paused()
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::AutoLock lock(gPSMutex);
if (!gPS->IsActive(lock)) {
return false;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
return gPS->IsPaused(lock);
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_pause()
{
LOG("profiler_pause");
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
{
PS::AutoLock lock(gPSMutex);
if (!gPS->IsActive(lock)) {
return;
}
gPS->SetIsPaused(lock, true);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// gPSMutex must be unlocked when we notify, to avoid potential deadlocks.
NotifyObservers("profiler-paused");
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_resume()
{
LOG("profiler_resume");
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::AutoLock lock(gPSMutex);
{
if (!gPS->IsActive(lock)) {
return;
}
gPS->SetIsPaused(lock, false);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// gPSMutex must be unlocked when we notify, to avoid potential deadlocks.
NotifyObservers("profiler-resumed");
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
bool
profiler_feature_active(const char* aName)
{
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
if (!gPS->IsActive(lock)) {
return false;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (strcmp(aName, "displaylistdump") == 0) {
return gPS->FeatureDisplayListDump(lock);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (strcmp(aName, "gpu") == 0) {
return gPS->FeatureGPU(lock);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (strcmp(aName, "layersdump") == 0) {
return gPS->FeatureLayersDump(lock);
}
if (strcmp(aName, "restyle") == 0) {
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
return gPS->FeatureRestyle(lock);
}
return false;
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
bool
profiler_is_active()
{
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
return gPS->IsActive(lock);
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
profiler_set_frame_number(int aFrameNumber)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetFrameNumber(lock, aFrameNumber);
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_register_thread(const char* aName, void* aGuessStackTop)
{
DEBUG_LOG("profiler_register_thread(%s)", aName);
MOZ_RELEASE_ASSERT(!NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
void* stackTop = GetStackTop(aGuessStackTop);
locked_register_thread(lock, aName, stackTop);
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_unregister_thread()
{
MOZ_RELEASE_ASSERT(!NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
Thread::tid_t id = Thread::GetCurrentId();
bool wasPseudoStackTransferred = false;
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::ThreadVector& threads = gPS->Threads(lock);
for (uint32_t i = 0; i < threads.size(); i++) {
ThreadInfo* info = threads.at(i);
if (info->ThreadId() == id && !info->IsPendingDelete()) {
DEBUG_LOG("profiler_unregister_thread: %s", info->Name());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (gPS->IsActive(lock)) {
// We still want to show the results of this thread if you save the
// profile shortly after a thread is terminated, which requires
// transferring ownership of the PseudoStack to |info|. For now we will
// defer the delete to profile stop.
info->SetPendingDelete();
wasPseudoStackTransferred = true;
} else {
delete info;
threads.erase(threads.begin() + i);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
break;
}
}
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
// We don't call PseudoStack::stopJSSampling() here; there's no point doing
// that for a JS thread that is in the process of disappearing.
if (!wasPseudoStackTransferred) {
delete tlsPseudoStack.get();
}
tlsPseudoStack.set(nullptr);
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_thread_sleep()
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
{
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PseudoStack *stack = tlsPseudoStack.get();
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
if (!stack) {
return;
}
stack->setSleeping();
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_thread_wake()
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
{
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PseudoStack *stack = tlsPseudoStack.get();
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
if (!stack) {
return;
}
stack->setAwake();
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
bool
profiler_thread_is_sleeping()
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PseudoStack *stack = tlsPseudoStack.get();
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
if (!stack) {
return false;
}
return stack->isSleeping();
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
profiler_js_interrupt_callback()
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
{
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
// This function runs both on and off the main thread, on JS threads being
// sampled.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
PseudoStack *stack = tlsPseudoStack.get();
if (!stack) {
return;
}
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
stack->pollJSSampling();
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
}
double
profiler_time()
{
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
mozilla::TimeDuration delta =
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
mozilla::TimeStamp::Now() - gPS->StartTime(lock);
return delta.ToMilliseconds();
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
}
bool
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
profiler_is_active_and_not_in_privacy_mode()
{
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
return gPS->IsActive(lock) && !gPS->FeaturePrivacy(lock);
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
UniqueProfilerBacktrace
profiler_get_backtrace()
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::AutoLock lock(gPSMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (!gPS->IsActive(lock) || gPS->FeaturePrivacy(lock)) {
return nullptr;
}
PseudoStack* stack = tlsPseudoStack.get();
if (!stack) {
MOZ_ASSERT(stack);
return nullptr;
}
Thread::tid_t tid = Thread::GetCurrentId();
ProfileBuffer* buffer = new ProfileBuffer(GET_BACKTRACE_DEFAULT_ENTRIES);
ThreadInfo* threadInfo =
new ThreadInfo("SyncProfile", tid, NS_IsMainThread(), WrapNotNull(stack),
/* stackTop */ nullptr);
threadInfo->SetHasProfile();
TickSample sample(threadInfo);
sample.mIsSamplingCurrentThread = true;
#if defined(HAVE_NATIVE_UNWIND)
#if defined(GP_OS_windows) || defined(GP_OS_linux) || defined(GP_OS_android)
tick_context_t context;
sample.PopulateContext(&context);
#elif defined(GP_OS_darwin)
sample.PopulateContext(nullptr);
#else
# error "unknown platform"
#endif
#endif
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
Tick(lock, buffer, &sample);
return UniqueProfilerBacktrace(new ProfilerBacktrace(buffer, threadInfo));
}
void
ProfilerBacktraceDestructor::operator()(ProfilerBacktrace* aBacktrace)
{
delete aBacktrace;
}
// Fill the output buffer with the following pattern:
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
// "Label 1" "\0" "Label 2" "\0" ... "Label N" "\0" "\0"
// TODO: use the unwinder instead of pseudo stack.
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
profiler_get_backtrace_noalloc(char *output, size_t outputSize)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
MOZ_ASSERT(outputSize >= 2);
char *bound = output + outputSize - 2;
output[0] = output[1] = '\0';
PseudoStack *pseudoStack = tlsPseudoStack.get();
if (!pseudoStack) {
return;
}
volatile js::ProfileEntry *pseudoFrames = pseudoStack->mStack;
uint32_t pseudoCount = pseudoStack->stackSize();
for (uint32_t i = 0; i < pseudoCount; i++) {
const char* label = pseudoFrames[i].label();
const char* dynamicString = pseudoFrames[i].getDynamicString();
size_t labelLength = strlen(label);
if (dynamicString) {
// Put the label, a space, and the dynamic string into output.
size_t dynamicStringLength = strlen(dynamicString);
if (output + labelLength + 1 + dynamicStringLength >= bound) {
break;
}
strcpy(output, label);
output += labelLength;
*output++ = ' ';
strcpy(output, dynamicString);
output += dynamicStringLength;
} else {
// Only put the label into output.
if (output + labelLength >= bound) {
break;
}
strcpy(output, label);
output += labelLength;
}
*output++ = '\0';
*output = '\0';
}
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
static void
locked_profiler_add_marker(PS::LockRef aLock, const char* aMarker,
ProfilerMarkerPayload* aPayload)
{
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
MOZ_RELEASE_ASSERT(gPS->IsActive(aLock) && !gPS->FeaturePrivacy(aLock));
// aPayload must be freed if we return early.
mozilla::UniquePtr<ProfilerMarkerPayload> payload(aPayload);
PseudoStack *stack = tlsPseudoStack.get();
if (!stack) {
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
return;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
mozilla::TimeStamp origin = (payload && !payload->GetStartTime().IsNull())
? payload->GetStartTime()
: mozilla::TimeStamp::Now();
mozilla::TimeDuration delta = origin - gPS->StartTime(aLock);
stack->addMarker(aMarker, payload.release(), delta.ToMilliseconds());
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
profiler_add_marker(const char* aMarker, ProfilerMarkerPayload* aPayload)
{
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
// aPayload must be freed if we return early.
mozilla::UniquePtr<ProfilerMarkerPayload> payload(aPayload);
if (!gPS->IsActive(lock) || gPS->FeaturePrivacy(lock)) {
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
return;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
locked_profiler_add_marker(lock, aMarker, payload.release());
}
Bug 1332577 (part 9) - Remove all mozilla_sampler_*() functions. r=mstange. There are lots of profiler_*() functions that simply call onto equivalent or nearly-equivalent mozilla_sampler_*() functions. This patch removes the unnecessary indirection by removing the mozilla_sampler_*() functions. The most important changes: - In platform.cpp, all the mozilla_sampler_*() definitions are renamed as profiler_*(). - In GeckoProfiler.h, the new PROFILER_FUNC{,_VOID} macros provide a neat way to declare the functions that must be present whether the profiler is enabled or not. - In GeckoProfiler.h, all the mozilla_sampler_*() declarations are removed, as are all the profiler_*() definitions that corresponded to a mozilla_sampler_*() function. Other things of note: - profiler_log(const char* str) is now defined in platform.cpp, instead of in GeckoProfiler.h, for consistency with all the other profiler_*() functions. Likewise with profiler_js_operation_callback() and profiler_in_privacy_mode(). - ProfilerBacktraceDestructor::operator() is treated slightly different to all the profiler_*() functions. - Both variants of profiler_tracing() got some early-return conditions moved into them from GeckoProfiler.h. - There were some cases where the profiler_*() and mozilla_sampler_*() name didn't quite match. Specifically: * mozilla_sampler_get_profile_data() and profiler_get_profiler_jsobject(): name mismatch. Kept the latter. * mozilla_sampler_get_profile_data_async() and profiler_get_profile_jsobject_async(): name mismatch. Kept the latter. * mozilla_sampler_register_thread() and profiler_register_thread(): return type mismatch. Changed to void. * mozilla_sampler_frame_number() and profiler_set_frame_number(): name mismatch. Kept the latter. * mozilla_sampler_save_profile_to_file() and profile_sampler_save_profile_to_file(): the former was 'extern "C"' so it could be called from a debugger easily. The latter now is 'extern "C"'. - profiler_get_buffer_info() didn't fit the patterns handled by PROFILER_FUNC{,VOID}, so the patch makes it call onto the new function profiler_get_buffer_info_helper(), which does fit the pattern. --HG-- extra : rebase_source : fa1817854ade81e8a3027907d1476ff2563f1cc2
2017-01-20 07:05:16 +03:00
void
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
profiler_tracing(const char* aCategory, const char* aInfo,
TracingKind aKind)
{
// This function runs both on and off the main thread.
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
MOZ_RELEASE_ASSERT(gPS);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
PS::AutoLock lock(gPSMutex);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
if (!gPS->IsActive(lock) || gPS->FeaturePrivacy(lock)) {
return;
}
auto marker = new ProfilerMarkerTracing(aCategory, aKind);
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
locked_profiler_add_marker(lock, aInfo, marker);
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
void
profiler_tracing(const char* aCategory, const char* aInfo,
UniqueProfilerBacktrace aCause, TracingKind aKind)
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
{
// This function runs both on and off the main thread.
MOZ_RELEASE_ASSERT(gPS);
PS::AutoLock lock(gPSMutex);
if (!gPS->IsActive(lock) || gPS->FeaturePrivacy(lock)) {
return;
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
auto marker =
new ProfilerMarkerTracing(aCategory, aKind, mozilla::Move(aCause));
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
locked_profiler_add_marker(lock, aInfo, marker);
}
void
profiler_log(const char* aStr)
{
// This function runs both on and off the main thread.
profiler_tracing("log", aStr);
}
void
profiler_set_js_context(JSContext* aCx)
{
// This function runs both on and off the main thread.
MOZ_ASSERT(aCx);
PseudoStack* stack = tlsPseudoStack.get();
if (!stack) {
return;
}
stack->setJSContext(aCx);
}
void
profiler_clear_js_context()
{
// This function runs both on and off the main thread.
MOZ_RELEASE_ASSERT(gPS);
PseudoStack* stack = tlsPseudoStack.get();
if (!stack) {
return;
}
if (!stack->mContext) {
return;
}
// On JS shut down, flush the current buffer as stringifying JIT samples
// requires a live JSContext.
PS::AutoLock lock(gPSMutex);
if (gPS->IsActive(lock)) {
gPS->SetIsPaused(lock, true);
// Find the ThreadInfo corresponding to this thread, if there is one, and
// flush it.
const PS::ThreadVector& threads = gPS->Threads(lock);
for (size_t i = 0; i < threads.size(); i++) {
ThreadInfo* info = threads.at(i);
if (info->HasProfile() && !info->IsPendingDelete() &&
info->Stack() == stack) {
info->FlushSamplesAndMarkers(gPS->Buffer(lock), gPS->StartTime(lock));
}
}
Bug 1342306 (part 3) - Properly synchronize the global state in platform*.cpp. r=mstange. This patch properly synchronizes all the global state in platform*.cpp, which gets us a long way towards implementing bug 1330184. - Most of the global state goes in a new class, ProfilerState, with a single instance, gPS. All accesses to gPS are protected by gPSMutex. All functions that access ProfilerState require a token proving that gPS is locked; this makes things much clearer. gRegisteredThreadsMutex is removed because it is subsumed by gPSMutex. - gVerbosity, however, does not go in ProfilerState. It stays separate, and gains its own mutex, gVerbosityMutex. Also, the tracking of the current profiler state is streamlined. Previously it was tracked via: - stack_key_initialized, gInitCount, gSampler, gIsProfiling, gIsActive, and gIsPaused. Now it is tracked via: - gPS, gPS->sActivity, and gPS->mIsPaused. This means that the Sampler class is no longer necessary, and the patch removes it. Other changes of note made by the patch are as follows. - It removes ThreadInfo::{mMutex,GetMutex}. This mutex was only used in two places, and both these are now protected by gPSMutex. - It tweaks the LOG calls. All the main functions (init(), shutdown(), start(), stop()) now do consistent BEGIN/END logging, and a couple of other low-value incidental LOG calls have been removed. - It adds a lot of release assertions requiring that gPS be initialized (e.g. profiler_init() has been called but profiler_shutdown() has not). - It uses alphabetical order for everything involving profiler feature names. - It removes Platform{Start,Stop}() and SamplerThread::{Start,Stop}Sampler(). These are no longer necessary now that SamplerThread::sInstance has been replaced with ProfilerState::mSamplerThread which allows more direct access to the current SamplerThread instance. - It removes PseudoStack::mPrivacyMode. This was derived from the "privacy" feature, and we now use gPS->mFeaturePrivacy directly, which is simpler. It also replaces profiler_in_privacy_mode() with profiler_is_active_and_not_in_privacy_mode(), which avoids an unnecessary lock/unlock of gPSMutex on a moderately hot path. Finally, the new code does more locking than the old one. A number of operation The following operations now lock a mutex when they previously didn't; the following are ones that are significant, according to some ad hoc profiling. - profiler_tracing() - profiler_is_active() - profiler_is_active_and_not_in_privacy_mode() - profiler_add_marker() - profiler_feature_active() - SamplerThread::Run() [when the profiler is paused] All up this roughly doubles the amount of mutex locking done by the profiler. It's probably possible to avoid this increase by allowing careful unlocked access to three of the fields in ProfilerState (mActivityGeneration, mFeaturePrivacy, mStartTime), but this should only be done as a follow-up if the extra locking is found to be a problem. --HG-- extra : rebase_source : c2e41231f131b3e9ccd23ddf43626b54ccc77b7b
2017-03-08 04:40:39 +03:00
gPS->SetIsPaused(lock, false);
}
Bug 1345262 (part 5) - Fix how JS sampling is started/stopped by the profiler. r=mstange,djvj. Currently, JS sampling has major problems. - JS sampling is enabled for all JS threads from the thread that runs locked_profiler_start() -- currently only the main thread -- but the JS engine can't handle enabling from off-thread, and asserts. This makes profiling workers impossible in a debug build. - No JS thread will be JS sampled unless enableJSSampling() is called, but that only happens in locked_profiler_start(). That means any worker threads created while the profiler is active won't be JS sampled. - Only the thread that runs locked_profiler_stop() -- currently only the main thread -- ever calls disableJSSampling(). This means that worker threads that start being JS sampled never stop being JS sampled. This patch fixes these three problems in the following ways. - locked_profiler_start() now sets a flag in PseudoStack that indicates JS sampling is desired, but doesn't directly enable it. Instead, the JS thread polls that flag and enables JS sampling itself when it sees the flag is set. The polling is done by the interrupt callback. There was already a flag of this sort (mJSSampling) but the new one is better. This required adding a call to profiler_js_operation_callback() to the InterruptCallback() in XPCJSContext.cpp. (In comparison, the InterruptCallback() in dom/workers/RuntimeService.cpp already had such a call.) - RegisterCurrentThread() now requests JS sampling of a JS thread when the profiler is active, the thread is being profiled, and JS sampling is enabled. - locked_profiler_stop() now calls stopJSSampling() on all live threads. The patch makes the following smaller changes as well. - Renames profiler_js_operation_callback() as profiler_js_interrupt_callback(), because "interrupt callback" is the standard name (viz. JS_AddInterruptCallback()). - Calls js::RegisterContextProfilingEventMarker() with nullptr when stopping JS sampling, so that ProfilerJSEventMarker won't fire unnecessarily. - Some minor formatting changes. --HG-- extra : rebase_source : 372f94c963a9e5b2493389892499b1ca205ebc2f
2017-03-10 01:04:23 +03:00
// We don't call stack->stopJSSampling() here; there's no point doing
// that for a JS thread that is in the process of disappearing.
stack->mContext = nullptr;
}
// END externally visible functions
////////////////////////////////////////////////////////////////////////