Apply field naming conventions: _prefix for instance, s_prefix for static

Author: simonrozsival

src/Mono.Android/Microsoft.Android.Runtime/ManagedValueManager.cs

@@ -24,10 +24,10 @@ class ManagedValueManager : JniRuntime.JniValueManager
 	const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
 
 	readonly Lock _registeredInstancesLock = new ();
-	readonly Dictionary<int, List<ReferenceTrackingHandle>> RegisteredInstances = new ();
-	readonly ConcurrentQueue<IntPtr> CollectedContexts = new ();
+	readonly Dictionary<int, List<ReferenceTrackingHandle>> _registeredInstances = new ();
+	readonly ConcurrentQueue<IntPtr> _collectedContexts = new ();
 
-	bool disposed;
+	bool _disposed;
 
 	static Lazy<ManagedValueManager> s_instance = new (() => new ManagedValueManager ());
 	public static ManagedValueManager GetOrCreateInstance () => s_instance.Value;
@@ -41,13 +41,13 @@ unsafe ManagedValueManager ()
 
 	protected override void Dispose (bool disposing)
 	{
-		disposed = true;
+		_disposed = true;
 		base.Dispose (disposing);
 	}
 
 	void ThrowIfDisposed ()
 	{
-		if (disposed)
+		if (_disposed)
 			throw new ObjectDisposedException (nameof (ManagedValueManager));
 	}
 
@@ -59,8 +59,8 @@ public unsafe override void CollectPeers ()
 	{
 		ThrowIfDisposed ();
 
-		while (CollectedContexts.TryDequeue (out IntPtr contextPtr)) {
-			Debug.Assert (contextPtr != IntPtr.Zero, "CollectedContexts should not contain null pointers.");
+		while (_collectedContexts.TryDequeue (out IntPtr contextPtr)) {
+			Debug.Assert (contextPtr != IntPtr.Zero, "_collectedContexts should not contain null pointers.");
 			HandleContext* context = (HandleContext*)contextPtr;
 
 			lock (_registeredInstancesLock) {
@@ -73,7 +73,7 @@ public unsafe override void CollectPeers ()
 		void Remove (HandleContext* context)
 		{
 			int key = context->PeerIdentityHashCode;
-			if (!RegisteredInstances.TryGetValue (key, out List<ReferenceTrackingHandle>? peers))
+			if (!_registeredInstances.TryGetValue (key, out List<ReferenceTrackingHandle>? peers))
 				return;
 
 			for (int i = peers.Count - 1; i >= 0; i--) {
@@ -84,7 +84,7 @@ void Remove (HandleContext* context)
 			}
 
 			if (peers.Count == 0) {
-				RegisteredInstances.Remove (key);
+				_registeredInstances.Remove (key);
 			}
 		}
 	}
@@ -104,9 +104,9 @@ public override void AddPeer (IJavaPeerable value)
 		int key = value.JniIdentityHashCode;
 		lock (_registeredInstancesLock) {
 			List<ReferenceTrackingHandle>? peers;
-			if (!RegisteredInstances.TryGetValue (key, out peers)) {
+			if (!_registeredInstances.TryGetValue (key, out peers)) {
 				peers = [new ReferenceTrackingHandle (value)];
-				RegisteredInstances.Add (key, peers);
+				_registeredInstances.Add (key, peers);
 				return;
 			}
 
@@ -156,7 +156,7 @@ void WarnNotReplacing (int key, IJavaPeerable ignoreValue, IJavaPeerable keepVal
 		int key = GetJniIdentityHashCode (reference);
 
 		lock (_registeredInstancesLock) {
-			if (!RegisteredInstances.TryGetValue (key, out List<ReferenceTrackingHandle>? peers))
+			if (!_registeredInstances.TryGetValue (key, out List<ReferenceTrackingHandle>? peers))
 				return null;
 
 			for (int i = peers.Count - 1; i >= 0; i--) {
@@ -168,7 +168,7 @@ void WarnNotReplacing (int key, IJavaPeerable ignoreValue, IJavaPeerable keepVal
 			}
 
 			if (peers.Count == 0)
-				RegisteredInstances.Remove (key);
+				_registeredInstances.Remove (key);
 		}
 		return null;
 	}
@@ -177,15 +177,15 @@ public override void RemovePeer (IJavaPeerable value)
 	{
 		ThrowIfDisposed ();
 
-		// Remove any collected contexts before modifying RegisteredInstances
+		// Remove any collected contexts before modifying _registeredInstances
 		CollectPeers ();
 
 		if (value == null)
 			throw new ArgumentNullException (nameof (value));
 
 		lock (_registeredInstancesLock) {
 			int key = value.JniIdentityHashCode;
-			if (!RegisteredInstances.TryGetValue (key, out List<ReferenceTrackingHandle>? peers))
+			if (!_registeredInstances.TryGetValue (key, out List<ReferenceTrackingHandle>? peers))
 				return;
 
 			for (int i = peers.Count - 1; i >= 0; i--) {
@@ -198,7 +198,7 @@ public override void RemovePeer (IJavaPeerable value)
 				GC.KeepAlive (target);
 			}
 			if (peers.Count == 0)
-				RegisteredInstances.Remove (key);
+				_registeredInstances.Remove (key);
 		}
 	}
 
@@ -280,8 +280,8 @@ public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
 		CollectPeers ();
 
 		lock (_registeredInstancesLock) {
-			var peers = new List<JniSurfacedPeerInfo> (RegisteredInstances.Count);
-			foreach (var (identityHashCode, referenceTrackingHandles) in RegisteredInstances) {
+			var peers = new List<JniSurfacedPeerInfo> (_registeredInstances.Count);
+			foreach (var (identityHashCode, referenceTrackingHandles) in _registeredInstances) {
 				foreach (var peer in referenceTrackingHandles) {
 					if (peer.Target is IJavaPeerable target) {
 						peers.Add (new JniSurfacedPeerInfo (identityHashCode, new WeakReference<IJavaPeerable> (target)));
@@ -333,19 +333,19 @@ unsafe struct HandleContext
 	{
 		static readonly nuint Size = (nuint)Marshal.SizeOf<HandleContext> ();
 
-		int identityHashCode;
-		IntPtr controlBlock;
-		IntPtr gcHandle; // GCHandle stored as IntPtr to keep blittable layout
+		int _identityHashCode;
+		IntPtr _controlBlock;
+		IntPtr _gcHandle; // GCHandle stored as IntPtr to keep blittable layout
 
-		public int PeerIdentityHashCode => identityHashCode;
+		public int PeerIdentityHashCode => _identityHashCode;
 		public bool IsCollected
 		{
 			get
 			{
-				if (controlBlock == IntPtr.Zero)
+				if (_controlBlock == IntPtr.Zero)
 					throw new InvalidOperationException ("HandleContext control block is not initialized.");
 
-				return ((JniObjectReferenceControlBlock*) controlBlock)->handle == IntPtr.Zero;
+				return ((JniObjectReferenceControlBlock*) _controlBlock)->handle == IntPtr.Zero;
 			}
 		}
 
@@ -358,18 +358,18 @@ private struct JniObjectReferenceControlBlock
 			public int refs_added;
 		}
 
-		public GCHandle AssociatedGCHandle => GCHandle.FromIntPtr (gcHandle);
+		public GCHandle AssociatedGCHandle => GCHandle.FromIntPtr (_gcHandle);
 
 #if DEBUG
-		static readonly HashSet<IntPtr> knownContexts = new ();
+		static readonly HashSet<IntPtr> s_knownContexts = new ();
 
 		public static unsafe void EnsureAllContextsAreOurs (MarkCrossReferencesArgs* mcr)
 		{
-			lock (knownContexts) {
+			lock (s_knownContexts) {
 				for (nuint i = 0; i < mcr->ComponentCount; i++) {
 					StronglyConnectedComponent component = mcr->Components [i];
 					for (nuint j = 0; j < component.Count; j++) {
-						if (!knownContexts.Contains ((IntPtr)component.Contexts [j])) {
+						if (!s_knownContexts.Contains ((IntPtr)component.Contexts [j])) {
 							throw new InvalidOperationException ("Unknown reference tracking handle.");
 						}
 					}
@@ -385,15 +385,15 @@ public static unsafe void EnsureAllContextsAreOurs (MarkCrossReferencesArgs* mcr
 				throw new OutOfMemoryException ("Failed to allocate memory for HandleContext.");
 			}
 
-			context->identityHashCode = peer.JniIdentityHashCode;
-			context->controlBlock = peer.JniObjectReferenceControlBlock;
+			context->_identityHashCode = peer.JniIdentityHashCode;
+			context->_controlBlock = peer.JniObjectReferenceControlBlock;
 
 			GCHandle handle = JavaMarshal.CreateReferenceTrackingHandle (peer, context);
-			context->gcHandle = GCHandle.ToIntPtr (handle);
+			context->_gcHandle = GCHandle.ToIntPtr (handle);
 
 #if DEBUG
-			lock (knownContexts) {
-				knownContexts.Add ((IntPtr)context);
+			lock (s_knownContexts) {
+				s_knownContexts.Add ((IntPtr)context);
 			}
 #endif
 
@@ -407,8 +407,8 @@ public static void Free (ref HandleContext* context)
 			}
 
 #if DEBUG
-			lock (knownContexts) {
-				knownContexts.Remove ((IntPtr)context);
+			lock (s_knownContexts) {
+				s_knownContexts.Remove ((IntPtr)context);
 			}
 #endif
 
@@ -439,8 +439,8 @@ static unsafe void BridgeProcessingFinished (MarkCrossReferencesArgs* mcr)
 		ReadOnlySpan<GCHandle> handlesToFree = ProcessCollectedContexts (mcr);
 		JavaMarshal.FinishCrossReferenceProcessing (mcr, handlesToFree);
 
-		// Schedule cleanup of RegisteredInstances on a thread pool thread.
-		// The bridge thread must not take lock(RegisteredInstances) — see deadlock notes.
+		// Schedule cleanup of _registeredInstances on a thread pool thread.
+		// The bridge thread must not take lock(_registeredInstances) — see deadlock notes.
 		Task.Run (GetOrCreateInstance ().CollectPeers);
 	}
 
@@ -469,10 +469,10 @@ void ProcessContext (HandleContext* context)
 
 			GCHandle handle = context->AssociatedGCHandle;
 
-			// Note: modifying the RegisteredInstances dictionary while processing the collected contexts
+			// Note: modifying the _registeredInstances dictionary while processing the collected contexts
 			// is tricky and can lead to deadlocks, so we remember which contexts were collected and we will free
 			// them later outside of the bridge processing loop.
-			instance.CollectedContexts.Enqueue ((IntPtr)context);
+			instance._collectedContexts.Enqueue ((IntPtr)context);
 
 			// important: we must not free the handle before passing it to JavaMarshal.FinishCrossReferenceProcessing
 			handlesToFree.Add (handle);