Bug 1207753 - Add MOZ_UNANNOTATED to all Mutexes/Monitors r=nika,kershaw

Differential Revision: https://phabricator.services.mozilla.com/D140849
This commit is contained in:
Randell Jesup
2022-03-16 12:01:14 +00:00
parent e2a78d290a
commit fe15f2115d
441 changed files with 573 additions and 549 deletions

View File

@@ -59,7 +59,7 @@ class CompositableInProcessManager final {
static std::map<std::pair<base::ProcessId, uint64_t>,
RefPtr<WebRenderImageHost>>
sCompositables;
static StaticMutex sMutex;
static StaticMutex sMutex MOZ_UNANNOTATED;
static uint32_t sNamespace;
static Atomic<uint32_t> sNextResourceId;

View File

@@ -696,8 +696,8 @@ class CompositorBridgeParent final : public CompositorBridgeParentBase,
CompositorOptions mOptions;
mozilla::Monitor mPauseCompositionMonitor;
mozilla::Monitor mResumeCompositionMonitor;
mozilla::Monitor mPauseCompositionMonitor MOZ_UNANNOTATED;
mozilla::Monitor mResumeCompositionMonitor MOZ_UNANNOTATED;
uint64_t mCompositorBridgeID;
LayersId mRootLayerTreeID;

View File

@@ -65,7 +65,7 @@ class CompositorManagerParent final : public PCompositorManagerParent {
private:
static StaticRefPtr<CompositorManagerParent> sInstance;
static StaticMutex sMutex;
static StaticMutex sMutex MOZ_UNANNOTATED;
#ifdef COMPOSITOR_MANAGER_PARENT_EXPLICIT_SHUTDOWN
static StaticAutoPtr<nsTArray<CompositorManagerParent*>> sActiveActors;

View File

@@ -150,7 +150,7 @@ class CompositorVsyncScheduler {
private:
virtual ~Observer();
Mutex mMutex;
Mutex mMutex MOZ_UNANNOTATED;
// Hold raw pointer to avoid mutual reference.
CompositorVsyncScheduler* mOwner;
};
@@ -170,12 +170,12 @@ class CompositorVsyncScheduler {
widget::CompositorWidget* mWidget;
RefPtr<CompositorVsyncScheduler::Observer> mVsyncObserver;
mozilla::Monitor mCurrentCompositeTaskMonitor;
mozilla::Monitor mCurrentCompositeTaskMonitor MOZ_UNANNOTATED;
RefPtr<CancelableRunnable> mCurrentCompositeTask;
// Accessed on multiple threads, guarded by mCurrentCompositeTaskMonitor.
wr::RenderReasons mCurrentCompositeTaskReasons;
mozilla::Monitor mCurrentVRTaskMonitor;
mozilla::Monitor mCurrentVRTaskMonitor MOZ_UNANNOTATED;
RefPtr<CancelableRunnable> mCurrentVRTask;
};

View File

@@ -178,7 +178,7 @@ void ImageBridgeChild::CancelWaitForNotifyNotUsed(uint64_t aTextureId) {
}
// Singleton
static StaticMutex sImageBridgeSingletonLock;
static StaticMutex sImageBridgeSingletonLock MOZ_UNANNOTATED;
static StaticRefPtr<ImageBridgeChild> sImageBridgeChildSingleton;
static StaticRefPtr<nsIThread> sImageBridgeChildThread;

View File

@@ -354,7 +354,7 @@ class ImageBridgeChild final : public PImageBridgeChild,
/**
* Mapping from async compositable IDs to image containers.
*/
Mutex mContainerMapLock;
Mutex mContainerMapLock MOZ_UNANNOTATED;
std::unordered_map<uint64_t, RefPtr<ImageContainerListener>>
mImageContainerListeners;
RefPtr<ImageContainerListener> FindListener(

View File

@@ -63,7 +63,7 @@ class LayerTreeOwnerTracker final {
private:
LayerTreeOwnerTracker();
mozilla::Mutex mLayerIdsLock;
mozilla::Mutex mLayerIdsLock MOZ_UNANNOTATED;
std::map<LayersId, base::ProcessId> mLayerIds;
};

View File

@@ -91,7 +91,7 @@ class SharedSurfacesParent final {
static void ExpireMap(
nsTArray<RefPtr<gfx::SourceSurfaceSharedDataWrapper>>& aExpired);
static StaticMonitor sMonitor;
static StaticMonitor sMonitor MOZ_UNANNOTATED;
static StaticAutoPtr<SharedSurfacesParent> sInstance;

View File

@@ -33,7 +33,7 @@ class MOZ_STACK_CLASS SynchronousTask {
}
private:
ReentrantMonitor mMonitor;
ReentrantMonitor mMonitor MOZ_UNANNOTATED;
ReentrantMonitorAutoEnter mAutoEnter;
bool mDone;
};