diff --git a/src/Java.Interop/Documentation/Java.Interop/JniRuntime.JniValueManager.xml b/src/Java.Interop/Documentation/Java.Interop/JniRuntime.JniValueManager.xml
new file mode 100644
index 000000000..76e953659
--- /dev/null
+++ b/src/Java.Interop/Documentation/Java.Interop/JniRuntime.JniValueManager.xml
@@ -0,0 +1,193 @@
+
+
+
+
+ Manages the mapping between Java instances and registered managed instances.
+
+
+
+ JniRuntime.JniValueManager manages a mapping between Java instances,
+ and instances. A IJavaPeerable is
+ registered if it has been added to JniRuntime.JniValueManager.
+ Certain methods only deal with registered instances. Managed-to-Java instance
+ method invocation does not require the use of registered instances.
+ Java-to-Managed instance method invocation requires the use of registred
+ instances; if possible, a managed peer will be implicitly created.
+ See for details.
+
+
+ -
+ Marshaling infrastructure:
+ .
+
+ -
+ Lifetime management of all registered peers:
+ ,
+ ,
+ .
+
+ -
+ Registration management for individual peers:
+ ,
+ ,
+ ,
+ ,
+ .
+
+ -
+ Java-to-managed marshaling support:
+ ,
+ ,
+ .
+
+ -
+ Managed-to-Java marshaling support:
+ .
+
+
+
+ Managed-to-Java marshaling support is handled via explicit usage,
+ or "generically" via and
+ .
+
+
+ All subclasses must be thread safe.
+
+
+ This type is thread safe.
+
+
+
+
+ Infrastructure. Called during Java-to-managed transitions.
+
+
+
+
+
+ Whether or not is supported.
+
+
+
+ When CanCollectPeers returns false, calls to
+ will throw
+ .
+
+
+
+
+
+ Garbage collects all peer instances.
+
+
+
+ When CanCollectPeers returns false, calls to
+ will throw
+ .
+
+
+
+ Garbage collection of peers is not supported.
+
+
+ has previously been invoked.
+
+
+
+
+ Garbage collects all peer instances.
+
+
+
+ The CollectPeersCore method will not be invoked
+ after Dispose() has been invoked.
+
+
+
+ Garbage collection of peers is not supported.
+
+
+
+
+ Dispose of all registered peer instances.
+
+
+
+ Calls on all peer instances.
+
+
+
+ Contains all exceptions thrown by registered instances when calling
+ .
+
+
+ has previously been invoked.
+
+
+
+
+ Dispose of all registered peer instances.
+
+
+
+
+ The DisposePeersCore method will not be invoked
+ after has been invoked.
+ Inheritors should invoke
+ on all peer instances. Should any peer throw from the Dispose
+ invocation, then DisposePeersCore should capture all thrown
+ exceptions and re-raise them within a .
+
+
+
+
+ Contains all exceptions thrown by .
+
+
+
+
+ Release all registered peer instances.
+
+
+
+ The JniValueManager unregisters all peers.
+ Methods such as will not find return any peers.
+
+
+ Peer values may still be used, even if not referenced by a JniValueManager.
+
+
+
+ has previously been invoked.
+
+
+
+
+ Release all registered peer instances.
+
+
+
+ The ReleasePeersCore method will not be invoked
+ after Dispose() has been invoked.
+
+
+
+
+
+
+ Register a managed peer.
+
+
+
+ The ReleasePeersCore method will not be invoked
+ after Dispose() has been invoked.
+
+
+
+
diff --git a/src/Java.Interop/GlobalSuppressions.cs b/src/Java.Interop/GlobalSuppressions.cs
index e5cc3b533..a479454c8 100644
--- a/src/Java.Interop/GlobalSuppressions.cs
+++ b/src/Java.Interop/GlobalSuppressions.cs
@@ -14,6 +14,8 @@
[assembly: SuppressMessage ("Design", "CA1024:Use properties where appropriate", Justification = "", Scope = "member", Target = "~M:Java.Interop.JniRuntime.GetRegisteredRuntimes()")]
+[assembly: SuppressMessage ("Design", "CA1031:Do not catch general exception types", Justification = "Excceptions are bundled into an AggregateException and rethrown", Scope = "type", Target = "~M:Java.Interop.JavaScope.Dispose")]
+
[assembly: SuppressMessage ("Design", "CA1032:Implement standard exception constructors", Justification = "System.Runtime.Serialization.SerializationInfo doesn't exist in our targeted PCL profile, so we can't provide the (SerializationInfo, StreamingContext) constructor.", Scope = "type", Target = "~T:Java.Interop.JavaProxyThrowable")]
[assembly: SuppressMessage ("Design", "CA1032:Implement standard exception constructors", Justification = "System.Runtime.Serialization.SerializationInfo doesn't exist in our targeted PCL profile, so we can't provide the (SerializationInfo, StreamingContext) constructor.", Scope = "type", Target = "~T:Java.Interop.JniLocationException")]
diff --git a/src/Java.Interop/Java.Interop/JavaProxyObject.cs b/src/Java.Interop/Java.Interop/JavaProxyObject.cs
index 5454185b0..d247dbb83 100644
--- a/src/Java.Interop/Java.Interop/JavaProxyObject.cs
+++ b/src/Java.Interop/Java.Interop/JavaProxyObject.cs
@@ -1,6 +1,7 @@
#nullable enable
using System;
+using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
@@ -28,10 +29,8 @@ public override JniPeerMembers JniPeerMembers {
}
}
- JavaProxyObject (object value)
+ internal JavaProxyObject (object value)
{
- if (value == null)
- throw new ArgumentNullException (nameof (value));
Value = value;
}
@@ -56,18 +55,11 @@ public override bool Equals (object? obj)
return Value.ToString ();
}
- [return: NotNullIfNotNull ("object")]
- public static JavaProxyObject? GetProxy (object value)
+ protected override void Dispose (bool disposing)
{
- if (value == null)
- return null;
-
- lock (CachedValues) {
- if (CachedValues.TryGetValue (value, out var proxy))
- return proxy;
- proxy = new JavaProxyObject (value);
- CachedValues.Add (value, proxy);
- return proxy;
+ base.Dispose (disposing);
+ if (disposing) {
+ CachedValues.Remove (Value);
}
}
diff --git a/src/Java.Interop/Java.Interop/JavaScope.cs b/src/Java.Interop/Java.Interop/JavaScope.cs
new file mode 100644
index 000000000..67bc881ff
--- /dev/null
+++ b/src/Java.Interop/Java.Interop/JavaScope.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Java.Interop {
+
+ public enum JavaScopeCleanup {
+ RegisterWithManager,
+ Dispose,
+ Release,
+ }
+
+ public ref struct JavaScope {
+
+ JavaScopeCleanup? cleanup;
+ PeerableCollection? scope;
+
+ public JavaScope (JavaScopeCleanup cleanup)
+ {
+ this.cleanup = cleanup;
+ scope = JniEnvironment.CurrentInfo.BeginScope (cleanup);
+ }
+
+ public void Dispose ()
+ {
+ if (cleanup == null || scope == null) {
+ return;
+ }
+ List? exceptions = null;
+ switch (cleanup) {
+ case JavaScopeCleanup.Dispose:
+ // Need to iterate over a copy of `scope`, as `p.Dispose()` will modify `scope`
+ var copy = new IJavaPeerable [scope.Count];
+ scope.CopyTo (copy, 0);
+ foreach (var p in copy) {
+ try {
+ p.Dispose ();
+ }
+ catch (Exception e) {
+ exceptions = exceptions ?? new List();
+ exceptions.Add (e);
+ Trace.WriteLine (e);
+ }
+ }
+ break;
+ }
+ JniEnvironment.CurrentInfo.EndScope (scope);
+ scope.Clear ();
+ scope = null;
+ if (exceptions != null) {
+ throw new AggregateException (exceptions);
+ }
+ }
+ }
+}
diff --git a/src/Java.Interop/Java.Interop/JniEnvironment.cs b/src/Java.Interop/Java.Interop/JniEnvironment.cs
index a577ecfdd..420a962fe 100644
--- a/src/Java.Interop/Java.Interop/JniEnvironment.cs
+++ b/src/Java.Interop/Java.Interop/JniEnvironment.cs
@@ -2,10 +2,12 @@
using System;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Text;
using System.Threading;
namespace Java.Interop {
@@ -189,6 +191,8 @@ sealed class JniEnvironmentInfo : IDisposable {
bool disposed;
JniRuntime? runtime;
+ List? scopes;
+
public int LocalReferenceCount {get; internal set;}
public bool WithinNewObjectScope {get; set;}
public JniRuntime Runtime {
@@ -229,6 +233,12 @@ public bool IsValid {
get {return Runtime != null && environmentPointer != IntPtr.Zero;}
}
+ public List?
+ Scopes => scopes;
+
+ public PeerableCollection? CurrentScope =>
+ scopes == null ? null : scopes [scopes.Count-1];
+
public JniEnvironmentInfo ()
{
Runtime = JniRuntime.CurrentRuntime;
@@ -279,6 +289,29 @@ public void Dispose ()
disposed = true;
}
+ public PeerableCollection BeginScope (JavaScopeCleanup cleanup)
+ {
+ scopes = scopes ?? new List ();
+ var scope = new PeerableCollection () {
+ Cleanup = cleanup,
+ };
+ scopes.Add (scope);
+ return scope;
+ }
+
+ public void EndScope (PeerableCollection scope)
+ {
+ Debug.Assert (scopes != null);
+ if (scopes == null) {
+ return;
+ }
+ Debug.Assert (scopes.Count > 0);
+ scopes.Remove (scope);
+ if (scopes.Count == 0) {
+ scopes = null;
+ }
+ }
+
#if FEATURE_JNIENVIRONMENT_SAFEHANDLES
internal List> LocalReferences = new List> () {
new List (),
@@ -295,5 +328,43 @@ static unsafe JniEnvironmentInvoker CreateInvoker (IntPtr handle)
}
#endif // !FEATURE_JNIENVIRONMENT_JI_PINVOKES
}
+
+ class PeerableCollection : KeyedCollection {
+
+ public JavaScopeCleanup Cleanup { get; set; }
+
+ protected override int GetKeyForItem (IJavaPeerable item) => item.JniIdentityHashCode;
+
+ public IJavaPeerable? GetPeerableForObjectReference (JniObjectReference reference)
+ {
+#if NETCOREAPP
+ if (TryGetValue (JniSystem.IdentityHashCode (reference), out var p) &&
+ JniEnvironment.Types.IsSameObject (reference, p.PeerReference)) {
+ return p;
+ }
+#else // !NETCOREAPP
+ Collection c = this;
+ for (int x = 0; x < c.Count; ++x) {
+ if (JniEnvironment.Types.IsSameObject (reference, c [x].PeerReference)) {
+ return c [x];
+ }
+ }
+#endif // !NETCOREAPP
+ return null;
+ }
+
+ public override string ToString ()
+ {
+ var c = (Collection) this;
+ var s = new StringBuilder ();
+ s.Append ("PeerableCollection[").Append (Count).Append ("]");
+ for (int i = 0; i < Count; ++i ) {
+ s.AppendLine ();
+ var e = c [i];
+ s.Append ($" [{i}] hash={e.JniIdentityHashCode} ref={e.PeerReference} type={e.GetType ().ToString ()} value=`{e.ToString ()}`");
+ }
+ return s.ToString ();
+ }
+ }
}
diff --git a/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs b/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
index 03ac65994..95b1c4327 100644
--- a/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
+++ b/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
@@ -2,12 +2,14 @@
using System;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Text;
using System.Threading;
using Java.Interop.Expressions;
@@ -32,7 +34,7 @@ partial class CreationOptions {
public JniValueManager? ValueManager {get; set;}
}
- JniValueManager? valueManager;
+ internal JniValueManager? valueManager;
public JniValueManager ValueManager {
get => valueManager ?? throw new NotSupportedException ();
}
@@ -47,10 +49,14 @@ partial void SetValueManager (CreationOptions options)
valueManager = SetRuntime (manager);
}
+ ///
public abstract partial class JniValueManager : ISetRuntime, IDisposable {
+ readonly ConditionalWeakTable cachedValues = new ConditionalWeakTable ();
+
JniRuntime? runtime;
bool disposed;
+
public JniRuntime Runtime {
get => runtime ?? throw new NotSupportedException ();
}
@@ -74,22 +80,214 @@ protected virtual void Dispose (bool disposing)
disposed = true;
}
+ ///
public abstract void WaitForGCBridgeProcessing ();
- public abstract void CollectPeers ();
+ ///
+ public abstract bool CanCollectPeers { get; }
+
+ ///
+ public void CollectPeers ()
+ {
+ if (disposed) {
+ throw new ObjectDisposedException (this.GetType ().ToString ());
+ }
+ if (!CanCollectPeers) {
+ throw new NotSupportedException ("CollectPeers() is not supported.");
+ }
+ CollectPeersCore ();
+ }
+
+ ///
+ protected abstract void CollectPeersCore ();
+
+ ///
+ public void DisposePeers ()
+ {
+ if (disposed) {
+ throw new ObjectDisposedException (this.GetType ().ToString ());
+ }
+ DisposePeersCore ();
+ }
+
+ ///
+ protected abstract void DisposePeersCore ();
+
+ ///
+ public void ReleasePeers ()
+ {
+ if (disposed) {
+ throw new ObjectDisposedException (this.GetType ().ToString ());
+ }
+ ReleasePeersCore ();
+ }
+
+ ///
+ protected abstract void ReleasePeersCore ();
+
+ ///
+ public void AddPeer (IJavaPeerable value)
+ {
+ if (disposed) {
+ throw new ObjectDisposedException (this.GetType ().ToString ());
+ }
+ if (value == null) {
+ throw new ArgumentNullException (nameof (value));
+ }
+
+ var r = value.PeerReference;
+ if (!r.IsValid) {
+ throw new ObjectDisposedException (value.GetType ().FullName);
+ }
+
+ var o = PeekPeer (value.PeerReference);
+ if (o != null)
+ return;
+
+ if (r.Type != JniObjectReferenceType.Global) {
+ value.SetPeerReference (r.NewGlobalRef ());
+ JniObjectReference.Dispose (ref r, JniObjectReferenceOptions.CopyAndDispose);
+ }
+
+ var scope = JniEnvironment.CurrentInfo.CurrentScope;
+
+ if (scope != null) {
+ scope.Add (value);
+ } else {
+ AddPeerCore (value);
+ }
+ }
+
+ protected abstract void AddPeerCore (IJavaPeerable value);
- public abstract void AddPeer (IJavaPeerable value);
+ public void RemovePeer (IJavaPeerable value)
+ {
+ if (disposed) {
+ throw new ObjectDisposedException (this.GetType ().ToString ());
+ }
+ if (value == null) {
+ throw new ArgumentNullException (nameof (value));
+ }
+
+ var scope = JniEnvironment.CurrentInfo.CurrentScope;
+ if (scope != null && scope.Cleanup != JavaScopeCleanup.RegisterWithManager) {
+ scope.Remove (value);
+ } else {
+ RemovePeerCore (value);
+ }
+ }
- public abstract void RemovePeer (IJavaPeerable value);
+ protected abstract void RemovePeerCore (IJavaPeerable value);
+
+ public void FinalizePeer (IJavaPeerable value)
+ {
+ if (disposed) {
+ throw new ObjectDisposedException (this.GetType ().ToString ());
+ }
+ if (value == null) {
+ throw new ArgumentNullException (nameof (value));
+ }
+
+ if (!ShouldFinalizePeer (value)) {
+ GC.ReRegisterForFinalize (value);
+ return;
+ }
+ var h = value.PeerReference;
+ var o = Runtime.ObjectReferenceManager;
+ if (o.LogGlobalReferenceMessages) {
+ o.WriteGlobalReferenceLine ("Finalizing PeerReference={0} IdentityHashCode=0x{1} Instance=0x{2} Instance.Type={3}",
+ h.ToString (),
+ value.JniIdentityHashCode.ToString ("x"),
+ RuntimeHelpers.GetHashCode (value).ToString ("x"),
+ value.GetType ().ToString ());
+ }
+ RemovePeer (value);
+ value.SetPeerReference (new JniObjectReference ());
+ value.Finalized ();
+
+ // MUST NOT use SafeHandle.ReferenceType: local refs are tied to a JniEnvironment
+ // and the JniEnvironment's corresponding thread; it's a thread-local value.
+ // Accessing SafeHandle.ReferenceType won't kill anything (so far...), but
+ // instead it always returns JniReferenceType.Invalid.
+ if (h.IsValid || h.Type != JniObjectReferenceType.Local) {
+ JniObjectReference.Dispose (ref h);
+ }
+ }
- public abstract void FinalizePeer (IJavaPeerable value);
+ protected abstract bool ShouldFinalizePeer (IJavaPeerable value);
+ // AndroidRuntime: ShouldFinalizePeer(IJavaPeerable value) => !value.PeerReference.IsValid;
- public abstract List GetSurfacedPeers ();
+ [Flags]
+ public enum PeerLocations {
+ ValueManager = 1 << 0,
+ CurrentThread = 1 << 1,
+ AllThreads = 1 << 2,
+ Everywhere = ValueManager | CurrentThread | AllThreads,
+ }
+ public List GetSurfacedPeers (PeerLocations locations = PeerLocations.Everywhere)
+ {
+ if (disposed) {
+ throw new ObjectDisposedException (this.GetType ().ToString ());
+ }
- public abstract void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, ConstructorInfo cinfo, object? []? argumentValues);
+ var peers = new List ();
+
+ if (locations.HasFlag (PeerLocations.ValueManager))
+ AddSurfacedPeers (peers);
+ if (locations.HasFlag (PeerLocations.AllThreads)) {
+ foreach (var info in JniEnvironment.Info.Values) {
+ AddScopes (info.Scopes);
+ }
+ }
+ if (locations.HasFlag (PeerLocations.CurrentThread) && !locations.HasFlag (PeerLocations.AllThreads)) {
+ AddScopes (JniEnvironment.CurrentInfo.Scopes);
+ }
+
+ return peers;
+
+ void AddScopes (List? scopes) {
+ if (scopes == null) {
+ return;
+ }
+ foreach (var scope in scopes) {
+ if (scope == null) {
+ continue;
+ }
+ foreach (var peer in scope) {
+ peers.Add (new JniSurfacedPeerInfo (peer.JniIdentityHashCode, CreateRef (peer)));
+ }
+ }
+ }
+
+ WeakReference CreateRef (IJavaPeerable value) {
+ return new WeakReference (value, trackResurrection: false);
+ }
+ }
+
+ protected abstract void AddSurfacedPeers (ICollection collection);
+
+ public void ActivatePeer (JniObjectReference reference, ConstructorInfo constructor, object? []? argumentValues)
+ {
+ if (disposed) {
+ throw new ObjectDisposedException (this.GetType ().ToString ());
+ }
+ if (!reference.IsValid) {
+ throw new ArgumentException ("reference is not valid", nameof (reference));
+ }
+ if (constructor == null) {
+ throw new ArgumentNullException (nameof (constructor));
+ }
+ ActivatePeerCore (reference, constructor, argumentValues);
+ }
+
+ protected abstract void ActivatePeerCore (JniObjectReference reference, ConstructorInfo constructor, object?[]? argumentValues);
public void ConstructPeer (IJavaPeerable peer, ref JniObjectReference reference, JniObjectReferenceOptions options)
{
+ if (disposed) {
+ throw new ObjectDisposedException (this.GetType ().ToString ());
+ }
+
if (peer == null)
throw new ArgumentNullException (nameof (peer));
@@ -137,7 +335,7 @@ public int GetJniIdentityHashCode (JniObjectReference reference)
return JniSystem.IdentityHashCode (reference);
}
- public virtual void DisposePeer (IJavaPeerable value)
+ public void DisposePeer (IJavaPeerable value)
{
if (disposed)
throw new ObjectDisposedException (GetType ().Name);
@@ -160,9 +358,6 @@ public virtual void DisposePeer (IJavaPeerable value)
void DisposePeer (JniObjectReference h, IJavaPeerable value)
{
- if (disposed)
- throw new ObjectDisposedException (GetType ().Name);
-
var o = Runtime.ObjectReferenceManager;
if (o.LogGlobalReferenceMessages) {
o.WriteGlobalReferenceLine ("Disposing PeerReference={0} IdentityHashCode=0x{1} Instance=0x{2} Instance.Type={3} Java.Type={4}",
@@ -186,7 +381,7 @@ void DisposePeer (JniObjectReference h, IJavaPeerable value)
GC.SuppressFinalize (value);
}
- public virtual void DisposePeerUnlessReferenced (IJavaPeerable value)
+ public void DisposePeerUnlessReferenced (IJavaPeerable value)
{
if (disposed)
throw new ObjectDisposedException (GetType ().Name);
@@ -205,7 +400,26 @@ public virtual void DisposePeerUnlessReferenced (IJavaPeerable value)
DisposePeer (h, value);
}
- public abstract IJavaPeerable? PeekPeer (JniObjectReference reference);
+ public IJavaPeerable? PeekPeer (JniObjectReference reference)
+ {
+ if (disposed) {
+ throw new ObjectDisposedException (this.GetType ().ToString ());
+ }
+
+ if (!reference.IsValid)
+ return null;
+
+ var scope = JniEnvironment.CurrentInfo.CurrentScope;
+ if (scope != null && scope.Cleanup != JavaScopeCleanup.RegisterWithManager) {
+ var peer = scope.GetPeerableForObjectReference (reference);
+ if (peer != null) {
+ return peer;
+ }
+ }
+ return PeekPeerCore (reference);
+ }
+
+ protected abstract IJavaPeerable? PeekPeerCore (JniObjectReference reference);
public object? PeekValue (JniObjectReference reference)
{
@@ -267,7 +481,7 @@ static Type GetPeerType (Type type)
return type;
}
- public virtual IJavaPeerable? CreatePeer (ref JniObjectReference reference, JniObjectReferenceOptions transfer, Type? targetType)
+ public IJavaPeerable? CreatePeer (ref JniObjectReference reference, JniObjectReferenceOptions transfer, Type? targetType)
{
if (disposed)
throw new ObjectDisposedException (GetType ().Name);
@@ -278,10 +492,56 @@ static Type GetPeerType (Type type)
if (!typeof (IJavaPeerable).IsAssignableFrom (targetType))
throw new ArgumentException ($"targetType `{targetType.AssemblyQualifiedName}` must implement IJavaPeerable!", nameof (targetType));
+ if (transfer == JniObjectReferenceOptions.None || !reference.IsValid) {
+ return null;
+ }
+
+ var peer = CreatePeerCore (ref reference, transfer, targetType, out var ctorSigs);
+ if (peer != null) {
+ return peer;
+ }
+ // Could be that:
+ // 1. we're within a JniPeerRegistrationScope stack, and
+ // 2. current scope entry didn't register this type, and
+ // 3. `reference` refers to an *already created* instance which is in a *parent* or "global" scope
+ // PeekPeer() won't find it because of (1) + (2); look in *all* scopes.
+ peer = TryGetPeerFromScopes (reference);
+ if (peer != null) {
+ if (targetType.IsAssignableFrom (peer.GetType ())) {
+ return peer;
+ }
+ throw new NotSupportedException ($"Found peer `{peer.GetType()}` for reference=`{reference}`, which is not convertible to type `{targetType}`.");
+ }
+ var error = new StringBuilder ();
+ error.Append ("Could not find an appropriate constructor wrapper for Java type ")
+ .Append (JniEnvironment.Types.GetJniTypeNameFromInstance (reference))
+ .Append ("`. Looked for constructor signatures: ");
+ foreach (var ctorSig in (ctorSigs ?? new Type[][]{})) {
+ error.Append (targetType.FullName).Append ("(");
+ bool first = true;
+ foreach (var t in ctorSig) {
+ if (!first) {
+ error.Append (", ");
+ }
+ first = false;
+ error.Append (t);
+ }
+ error.Append (")");
+ }
+ throw new NotSupportedException (error.ToString ());
+ }
+
+ protected virtual IJavaPeerable? CreatePeerCore (ref JniObjectReference reference, JniObjectReferenceOptions transfer, Type targetType, out IEnumerable[]? attemptedConstructorSignatures)
+ {
+ attemptedConstructorSignatures = null;
+
var ctor = GetPeerConstructor (reference, targetType);
- if (ctor == null)
- throw new NotSupportedException (string.Format ("Could not find an appropriate constructable wrapper type for Java type '{0}', targetType='{1}'.",
- JniEnvironment.Types.GetJniTypeNameFromInstance (reference), targetType));
+ if (ctor == null) {
+ attemptedConstructorSignatures = new[]{
+ new[]{ByRefJniObjectReference, typeof (JniObjectReferenceOptions)},
+ };
+ return null;
+ }
var acts = new object[] {
reference,
@@ -296,6 +556,27 @@ static Type GetPeerType (Type type)
}
}
+ IJavaPeerable? TryGetPeerFromScopes (JniObjectReference reference)
+ {
+ var scopes = JniEnvironment.CurrentInfo.Scopes;
+ if (scopes == null) {
+ return null;
+ }
+
+ int count = (scopes.Count - 1);
+ for (int i = count; i >= 0; --i) {
+ var scope = scopes [i];
+ if (scope.Cleanup == JavaScopeCleanup.RegisterWithManager) {
+ continue;
+ }
+ var peer = scope.GetPeerableForObjectReference (reference);
+ if (peer != null) {
+ return peer;
+ }
+ }
+ return PeekPeerCore (reference);
+ }
+
static readonly Type ByRefJniObjectReference = typeof (JniObjectReference).MakeByRefType ();
ConstructorInfo? GetPeerConstructor (JniObjectReference instance, Type fallbackType)
@@ -589,6 +870,21 @@ protected virtual JniValueMarshaler GetValueMarshalerCore (Type type)
{
return ProxyValueMarshaler.Instance;
}
+
+ [return: NotNullIfNotNull ("object")]
+ internal JavaProxyObject? GetProxy (object value)
+ {
+ if (value == null)
+ return null;
+
+ lock (cachedValues) {
+ if (cachedValues.TryGetValue (value, out var proxy))
+ return proxy;
+ proxy = new JavaProxyObject (value);
+ cachedValues.Add (value, proxy);
+ return proxy;
+ }
+ }
}
}
@@ -770,7 +1066,7 @@ public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState
return new JniValueMarshalerState (s, vm);
}
- var p = JavaProxyObject.GetProxy (value);
+ var p = jvm.ValueManager.GetProxy (value);
return new JniValueMarshalerState (p!.PeerReference.NewLocalRef ());
}
diff --git a/src/Java.Interop/Java.Interop/ManagedPeer.cs b/src/Java.Interop/Java.Interop/ManagedPeer.cs
index 5c0e033c3..6326b4838 100644
--- a/src/Java.Interop/Java.Interop/ManagedPeer.cs
+++ b/src/Java.Interop/Java.Interop/ManagedPeer.cs
@@ -109,7 +109,7 @@ static void Construct (
return;
}
- JniEnvironment.Runtime.ValueManager.ActivatePeer (self, new JniObjectReference (n_self), cinfo, pvalues);
+ JniEnvironment.Runtime.ValueManager.ActivatePeer (new JniObjectReference (n_self), cinfo, pvalues);
}
catch (Exception e) when (JniEnvironment.Runtime.ExceptionShouldTransitionToJni (e)) {
envp.SetPendingException (e);
diff --git a/src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs b/src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs
index 1dcb12220..546612380 100644
--- a/src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs
+++ b/src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs
@@ -19,14 +19,18 @@ public override void WaitForGCBridgeProcessing ()
{
}
- public override void CollectPeers ()
+ public override bool CanCollectPeers => false;
+
+ protected override void CollectPeersCore ()
{
- if (RegisteredInstances == null)
- throw new ObjectDisposedException (nameof (MonoRuntimeValueManager));
+ throw new NotSupportedException ();
+ }
+ protected override void DisposePeersCore ()
+ {
var peers = new List ();
- lock (RegisteredInstances) {
+ lock (RegisteredInstances!) {
foreach (var ps in RegisteredInstances.Values) {
foreach (var p in ps) {
peers.Add (p);
@@ -48,22 +52,18 @@ public override void CollectPeers ()
throw new AggregateException ("Exceptions while collecting peers.", exceptions);
}
- public override void AddPeer (IJavaPeerable value)
+ protected override void ReleasePeersCore ()
+ {
+ lock (RegisteredInstances!) {
+ RegisteredInstances.Clear ();
+ }
+ }
+
+ protected override void AddPeerCore (IJavaPeerable value)
{
if (RegisteredInstances == null)
throw new ObjectDisposedException (nameof (MonoRuntimeValueManager));
- var r = value.PeerReference;
- if (!r.IsValid)
- throw new ObjectDisposedException (value.GetType ().FullName);
- var o = PeekPeer (value.PeerReference);
- if (o != null)
- return;
-
- if (r.Type != JniObjectReferenceType.Global) {
- value.SetPeerReference (r.NewGlobalRef ());
- JniObjectReference.Dispose (ref r, JniObjectReferenceOptions.CopyAndDispose);
- }
int key = value.JniIdentityHashCode;
lock (RegisteredInstances) {
List peers;
@@ -113,7 +113,7 @@ void WarnNotReplacing (int key, IJavaPeerable ignoreValue, IJavaPeerable keepVal
JniEnvironment.Types.GetJniTypeNameFromInstance (keepValue.PeerReference));
}
- public override IJavaPeerable? PeekPeer (JniObjectReference reference)
+ protected override IJavaPeerable? PeekPeerCore (JniObjectReference reference)
{
if (RegisteredInstances == null)
throw new ObjectDisposedException (nameof (MonoRuntimeValueManager));
@@ -139,14 +139,11 @@ void WarnNotReplacing (int key, IJavaPeerable ignoreValue, IJavaPeerable keepVal
return null;
}
- public override void RemovePeer (IJavaPeerable value)
+ protected override void RemovePeerCore (IJavaPeerable value)
{
if (RegisteredInstances == null)
throw new ObjectDisposedException (nameof (MonoRuntimeValueManager));
- if (value == null)
- throw new ArgumentNullException (nameof (value));
-
int key = value.JniIdentityHashCode;
lock (RegisteredInstances) {
List peers;
@@ -164,73 +161,35 @@ public override void RemovePeer (IJavaPeerable value)
}
}
- public override void FinalizePeer (IJavaPeerable value)
- {
- var h = value.PeerReference;
- var o = Runtime.ObjectReferenceManager;
- // MUST NOT use SafeHandle.ReferenceType: local refs are tied to a JniEnvironment
- // and the JniEnvironment's corresponding thread; it's a thread-local value.
- // Accessing SafeHandle.ReferenceType won't kill anything (so far...), but
- // instead it always returns JniReferenceType.Invalid.
- if (!h.IsValid || h.Type == JniObjectReferenceType.Local) {
- if (o.LogGlobalReferenceMessages) {
- o.WriteGlobalReferenceLine ("Finalizing PeerReference={0} IdentityHashCode=0x{1} Instance=0x{2} Instance.Type={3}",
- h.ToString (),
- value.JniIdentityHashCode.ToString ("x"),
- RuntimeHelpers.GetHashCode (value).ToString ("x"),
- value.GetType ().ToString ());
- }
- RemovePeer (value);
- value.SetPeerReference (new JniObjectReference ());
- value.Finalized ();
- return;
- }
-
- RemovePeer (value);
- if (o.LogGlobalReferenceMessages) {
- o.WriteGlobalReferenceLine ("Finalizing PeerReference={0} IdentityHashCode=0x{1} Instance=0x{2} Instance.Type={3}",
- h.ToString (),
- value.JniIdentityHashCode.ToString ("x"),
- RuntimeHelpers.GetHashCode (value).ToString ("x"),
- value.GetType ().ToString ());
- }
- value.SetPeerReference (new JniObjectReference ());
- JniObjectReference.Dispose (ref h);
- value.Finalized ();
- }
+ protected override bool ShouldFinalizePeer (IJavaPeerable value) => true;
- public override void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, ConstructorInfo cinfo, object?[]? argumentValues)
+ protected override void ActivatePeerCore (JniObjectReference reference, ConstructorInfo constructor, object?[]? argumentValues)
{
var runtime = JniEnvironment.Runtime;
try {
- var f = runtime.MarshalMemberBuilder.CreateConstructActivationPeerFunc (cinfo);
- f (cinfo, reference, argumentValues);
+ var f = runtime.MarshalMemberBuilder.CreateConstructActivationPeerFunc (constructor);
+ f (constructor, reference, argumentValues);
} catch (Exception e) {
var m = string.Format ("Could not activate {{ PeerReference={0} IdentityHashCode=0x{1} Java.Type={2} }} for managed type '{3}'.",
reference,
runtime.ValueManager.GetJniIdentityHashCode (reference).ToString ("x"),
JniEnvironment.Types.GetJniTypeNameFromInstance (reference),
- cinfo.DeclaringType.FullName);
+ constructor.DeclaringType.FullName);
Debug.WriteLine (m);
throw new NotSupportedException (m, e);
}
}
- public override List GetSurfacedPeers ()
+ protected override void AddSurfacedPeers (ICollection peers)
{
- if (RegisteredInstances == null)
- throw new ObjectDisposedException (nameof (MonoRuntimeValueManager));
-
- lock (RegisteredInstances) {
- var peers = new List (RegisteredInstances.Count);
+ lock (RegisteredInstances!) {
foreach (var e in RegisteredInstances) {
foreach (var p in e.Value) {
peers.Add (new JniSurfacedPeerInfo (e.Key, new WeakReference (p)));
}
}
- return peers;
}
}
}
diff --git a/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs b/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
index 1f7cea114..453e9b081 100644
--- a/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
+++ b/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
@@ -63,11 +63,51 @@ public override void WaitForGCBridgeProcessing ()
NativeMethods.java_interop_gc_bridge_wait_for_bridge_processing (bridge);
}
- public override void CollectPeers ()
+ public override bool CanCollectPeers => true;
+
+ protected override void CollectPeersCore ()
{
GC.Collect ();
}
+ protected override void DisposePeersCore ()
+ {
+ List> values;
+
+ lock (RegisteredInstances!) {
+ values = new List> (RegisteredInstances.Count);
+ foreach (var o in RegisteredInstances.Values) {
+ values.AddRange (o);
+ }
+ RegisteredInstances.Clear ();
+ }
+
+ List? exceptions = null;
+ foreach (var r in values) {
+ IJavaPeerable t;
+ if (!r.TryGetTarget (out t))
+ continue;
+ try {
+ t.Dispose ();
+ }
+ catch (Exception e) {
+ exceptions = exceptions ?? new List();
+ exceptions.Add (e);
+ Trace.WriteLine (e);
+ }
+ }
+ if (exceptions != null) {
+ throw new AggregateException (exceptions);
+ }
+ }
+
+ protected override void ReleasePeersCore ()
+ {
+ lock (RegisteredInstances!) {
+ RegisteredInstances.Clear ();
+ }
+ }
+
protected override void Dispose (bool disposing)
{
base.Dispose (disposing);
@@ -78,18 +118,6 @@ protected override void Dispose (bool disposing)
if (RegisteredInstances == null)
return;
- lock (RegisteredInstances) {
- foreach (var o in RegisteredInstances.Values) {
- foreach (var r in o) {
- IJavaPeerable t;
- if (!r.TryGetTarget (out t))
- continue;
- t.Dispose ();
- }
- }
- RegisteredInstances.Clear ();
- RegisteredInstances = null;
- }
if (bridge != IntPtr.Zero) {
NativeMethods.java_interop_gc_bridge_remove_current_app_domain (bridge);
@@ -100,40 +128,24 @@ protected override void Dispose (bool disposing)
Dictionary>>? RegisteredInstances = new Dictionary>>();
- public override List GetSurfacedPeers ()
+ protected override void AddSurfacedPeers (ICollection peers)
{
if (RegisteredInstances == null)
throw new ObjectDisposedException (nameof (MonoRuntimeValueManager));
lock (RegisteredInstances) {
- var peers = new List (RegisteredInstances.Count);
foreach (var e in RegisteredInstances) {
foreach (var p in e.Value) {
peers.Add (new JniSurfacedPeerInfo (e.Key, p));
}
}
- return peers;
}
}
- public override void AddPeer (IJavaPeerable value)
+ protected override void AddPeerCore (IJavaPeerable value)
{
- if (RegisteredInstances == null)
- throw new ObjectDisposedException (nameof (MonoRuntimeValueManager));
-
- var r = value.PeerReference;
- if (!r.IsValid)
- throw new ObjectDisposedException (value.GetType ().FullName);
- var o = PeekPeer (value.PeerReference);
- if (o != null)
- return;
-
- if (r.Type != JniObjectReferenceType.Global) {
- value.SetPeerReference (r.NewGlobalRef ());
- JniObjectReference.Dispose (ref r, JniObjectReferenceOptions.CopyAndDispose);
- }
int key = value.JniIdentityHashCode;
- lock (RegisteredInstances) {
+ lock (RegisteredInstances!) {
List> peers;
if (!RegisteredInstances.TryGetValue (key, out peers)) {
peers = new List> () {
@@ -187,16 +199,10 @@ static bool Replaceable (IJavaPeerable peer)
return (peer.JniManagedPeerState & JniManagedPeerStates.Replaceable) == JniManagedPeerStates.Replaceable;
}
- public override void RemovePeer (IJavaPeerable value)
+ protected override void RemovePeerCore (IJavaPeerable value)
{
- if (RegisteredInstances == null)
- throw new ObjectDisposedException (nameof (MonoRuntimeValueManager));
-
- if (value == null)
- throw new ArgumentNullException (nameof (value));
-
int key = value.JniIdentityHashCode;
- lock (RegisteredInstances) {
+ lock (RegisteredInstances!) {
List> peers;
if (!RegisteredInstances.TryGetValue (key, out peers))
return;
@@ -218,17 +224,11 @@ public override void RemovePeer (IJavaPeerable value)
}
}
- public override IJavaPeerable? PeekPeer (JniObjectReference reference)
+ protected override IJavaPeerable? PeekPeerCore (JniObjectReference reference)
{
- if (RegisteredInstances == null)
- throw new ObjectDisposedException (nameof (MonoRuntimeValueManager));
-
- if (!reference.IsValid)
- return null;
-
int key = GetJniIdentityHashCode (reference);
- lock (RegisteredInstances) {
+ lock (RegisteredInstances!) {
List> peers;
if (!RegisteredInstances.TryGetValue (key, out peers))
return null;
@@ -257,95 +257,26 @@ static Exception CreateJniLocationException ()
}
}
- public override void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, ConstructorInfo cinfo, object?[]? argumentValues)
+ protected override void ActivatePeerCore (JniObjectReference reference, ConstructorInfo constructor, object?[]? argumentValues)
{
var runtime = JniEnvironment.Runtime;
try {
- var f = runtime.MarshalMemberBuilder.CreateConstructActivationPeerFunc (cinfo);
- f (cinfo, reference, argumentValues);
+ var f = runtime.MarshalMemberBuilder.CreateConstructActivationPeerFunc (constructor);
+ f (constructor, reference, argumentValues);
} catch (Exception e) {
var m = string.Format ("Could not activate {{ PeerReference={0} IdentityHashCode=0x{1} Java.Type={2} }} for managed type '{3}'.",
reference,
runtime.ValueManager.GetJniIdentityHashCode (reference).ToString ("x"),
JniEnvironment.Types.GetJniTypeNameFromInstance (reference),
- cinfo.DeclaringType.FullName);
+ constructor.DeclaringType.FullName);
Debug.WriteLine (m);
throw new NotSupportedException (m, e);
}
}
- public override void FinalizePeer (IJavaPeerable value)
- {
- var h = value.PeerReference;
- var o = Runtime.ObjectReferenceManager;
- // MUST NOT use SafeHandle.ReferenceType: local refs are tied to a JniEnvironment
- // and the JniEnvironment's corresponding thread; it's a thread-local value.
- // Accessing SafeHandle.ReferenceType won't kill anything (so far...), but
- // instead it always returns JniReferenceType.Invalid.
- if (!h.IsValid || h.Type == JniObjectReferenceType.Local) {
- if (o.LogGlobalReferenceMessages) {
- o.WriteGlobalReferenceLine ("Finalizing PeerReference={0} IdentityHashCode=0x{1} Instance=0x{2} Instance.Type={3}",
- h.ToString (),
- value.JniIdentityHashCode.ToString ("x"),
- RuntimeHelpers.GetHashCode (value).ToString ("x"),
- value.GetType ().ToString ());
- }
- RemovePeer (value);
- value.SetPeerReference (new JniObjectReference ());
- value.Finalized ();
- return;
- }
-
- try {
- bool collected = TryGC (value, ref h);
- if (collected) {
- RemovePeer (value);
- value.SetPeerReference (new JniObjectReference ());
- if (o.LogGlobalReferenceMessages) {
- o.WriteGlobalReferenceLine ("Finalizing PeerReference={0} IdentityHashCode=0x{1} Instance=0x{2} Instance.Type={3}",
- h.ToString (),
- value.JniIdentityHashCode.ToString ("x"),
- RuntimeHelpers.GetHashCode (value).ToString ("x"),
- value.GetType ().ToString ());
- }
- value.Finalized ();
- } else {
- value.SetPeerReference (h);
- GC.ReRegisterForFinalize (value);
- }
- } catch (Exception e) {
- Runtime.FailFast ("Unable to perform a GC! " + e);
- }
- }
-
- ///
- /// Try to garbage collect .
- ///
- ///
- /// true, if was collected and
- /// is invalid; otherwise false.
- ///
- ///
- /// The instance to collect.
- ///
- ///
- /// The of .
- /// This value may be updated, and
- /// will be updated with this value.
- ///
- internal protected virtual bool TryGC (IJavaPeerable value, ref JniObjectReference handle)
- {
- if (!handle.IsValid)
- return true;
- var wgref = handle.NewWeakGlobalRef ();
- JniObjectReference.Dispose (ref handle);
- JniGC.Collect ();
- handle = wgref.NewGlobalRef ();
- JniObjectReference.Dispose (ref wgref);
- return !handle.IsValid;
- }
+ protected override bool ShouldFinalizePeer (IJavaPeerable value) => !value.PeerReference.IsValid;
}
static class JavaLangRuntime {
diff --git a/tests/Java.Interop-Tests/Java.Interop-Tests.csproj b/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
index a39a8e8f1..46516d767 100644
--- a/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
+++ b/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
@@ -4,6 +4,9 @@
net472;netcoreapp3.1
false
true
+ 8.0
+ true
+ ..\..\product.snk
@@ -50,6 +53,7 @@
+
diff --git a/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
index 245c299f0..3180e07a5 100644
--- a/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
+++ b/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
@@ -15,6 +15,9 @@ public class JavaManagedGCBridgeTests : JavaVMFixture {
[Test]
public void CrossReferences ()
{
+ if (!JniEnvironment.Runtime.ValueManager.CanCollectPeers) {
+ Assert.Ignore ();
+ }
using (var array = new JavaObjectArray (2)) {
WeakReference root = null, child = null;
var t = new Thread (() => SetupLinks (array, out root, out child));
diff --git a/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs b/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
index b3e83c654..5190ffbc9 100644
--- a/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
+++ b/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
@@ -153,7 +153,10 @@ public void EndCheckGlobalRefCount ()
int gref = JniEnvironment.Runtime.GlobalReferenceCount;
Assert.IsTrue (gref <= (grefStartCount),
string.Format ("JNI global references: grefStartCount={0}; gref={1}", grefStartCount, gref));
- JniEnvironment.Runtime.ValueManager.CollectPeers ();
+ var vm = JniEnvironment.Runtime.ValueManager;
+ if (vm.CanCollectPeers) {
+ vm.CollectPeers ();
+ }
}
[Test]
diff --git a/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs b/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
index 94b635b49..8270e534a 100644
--- a/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
+++ b/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
@@ -240,7 +240,7 @@ protected override void Dispose (bool disposing)
[JniTypeSignature ("java/lang/Object")]
class MyDisposableObject : JavaObject {
- bool _isDisposed;
+ internal bool _isDisposed;
public MyDisposableObject ()
{
diff --git a/tests/Java.Interop-Tests/Java.Interop/JavaSingleton.cs b/tests/Java.Interop-Tests/Java.Interop/JavaSingleton.cs
new file mode 100644
index 000000000..7f86c115b
--- /dev/null
+++ b/tests/Java.Interop-Tests/Java.Interop/JavaSingleton.cs
@@ -0,0 +1,39 @@
+using System;
+
+using Java.Interop;
+
+namespace Java.InteropTests
+{
+ [JniTypeSignature (JavaSingleton.JniTypeName)]
+ public sealed class JavaSingleton : JavaObject
+ {
+ internal const string JniTypeName = "com/xamarin/interop/Singleton";
+
+ readonly static JniPeerMembers _members = new JniPeerMembers (JniTypeName, typeof (JavaSingleton));
+
+ public override JniPeerMembers JniPeerMembers {
+ get {return _members;}
+ }
+
+ public bool disposed;
+
+ internal JavaSingleton (ref JniObjectReference reference, JniObjectReferenceOptions options)
+ : base (ref reference, options)
+ {
+ }
+
+ protected override void Dispose (bool disposing)
+ {
+ disposed = disposed || disposing;
+ base.Dispose (disposing);
+ }
+
+ public static unsafe JavaSingleton Singleton {
+ get {
+ var o = _members.StaticMethods.InvokeObjectMethod ("getSingleton.()Lcom/xamarin/interop/Singleton;", null);
+ return JniEnvironment.Runtime.ValueManager.GetValue (ref o, JniObjectReferenceOptions.CopyAndDispose);
+ }
+ }
+ }
+}
+
diff --git a/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerContract.cs b/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerContract.cs
new file mode 100644
index 000000000..625df0130
--- /dev/null
+++ b/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerContract.cs
@@ -0,0 +1,392 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+using Java.Interop;
+
+using NUnit.Framework;
+
+namespace Java.InteropTests {
+
+ // Modifies JniRuntime.valueManager instance field; can't be done in parallel
+ [NonParallelizable]
+ public abstract class JniRuntimeJniValueManagerContract : JavaVMFixture {
+
+ protected abstract Type ValueManagerType {
+ get;
+ }
+
+ protected virtual JniRuntime.JniValueManager CreateValueManager ()
+ {
+ var manager = Activator.CreateInstance (ValueManagerType) as JniRuntime.JniValueManager;
+ return manager ?? throw new InvalidOperationException ($"Could not create instance of `{ValueManagerType}`!");
+ }
+
+#pragma warning disable CS8618
+ JniRuntime.JniValueManager systemManager;
+ JniRuntime.JniValueManager valueManager;
+#pragma warning restore CS8618
+
+ [SetUp]
+ public void CreateVM ()
+ {
+ systemManager = JniRuntime.CurrentRuntime.valueManager!;
+ valueManager = CreateValueManager ();
+ valueManager.OnSetRuntime (JniRuntime.CurrentRuntime);
+ JniRuntime.CurrentRuntime.valueManager = valueManager;
+ }
+
+ [TearDown]
+ public void DestroyVM ()
+ {
+ JniRuntime.CurrentRuntime.valueManager = systemManager;
+ systemManager = null!;
+ valueManager?.Dispose ();
+ valueManager = null!;
+ }
+
+ [Test]
+ public void AddPeer ()
+ {
+ Assert.Throws(() => valueManager.AddPeer (null!));
+ }
+
+ [Test]
+ public void AddPeer_NoDuplicates ()
+ {
+ int startPeerCount = valueManager.GetSurfacedPeers ().Count;
+ using (var v = new MyDisposableObject ()) {
+ // MyDisposableObject ctor implicitly calls AddPeer();
+ Assert.AreEqual (startPeerCount + 1, valueManager.GetSurfacedPeers ().Count);
+ valueManager.AddPeer (v);
+ Assert.AreEqual (startPeerCount + 1, valueManager.GetSurfacedPeers ().Count);
+ }
+ }
+
+ [Test]
+ public void ConstructPeer_ImplicitViaBindingConstructor_PeerIsInSurfacedPeers ()
+ {
+ int startPeerCount = valueManager.GetSurfacedPeers ().Count;
+
+ var g = new GetThis ();
+ var surfaced = valueManager.GetSurfacedPeers ();
+ Assert.AreEqual (startPeerCount + 1, surfaced.Count);
+
+ var found = false;
+ foreach (var pr in surfaced) {
+ if (!pr.SurfacedPeer.TryGetTarget (out var p))
+ continue;
+ if (object.ReferenceEquals (g, p)) {
+ found = true;
+ }
+ }
+ Assert.IsTrue (found);
+
+ var localRef = g.PeerReference.NewLocalRef ();
+ g.Dispose ();
+ Assert.AreEqual (startPeerCount, valueManager.GetSurfacedPeers ().Count);
+ Assert.IsNull (valueManager.PeekPeer (localRef));
+ JniObjectReference.Dispose (ref localRef);
+ }
+
+ [Test]
+ public void ConstructPeer_ImplicitViaBindingMethod_PeerIsInSurfacedPeers ()
+ {
+ int startPeerCount = valueManager.GetSurfacedPeers ().Count;
+
+ var g = new GetThis ();
+ var surfaced = valueManager.GetSurfacedPeers ();
+ Assert.AreEqual (startPeerCount + 1, surfaced.Count);
+
+ var found = false;
+ foreach (var pr in surfaced) {
+ if (!pr.SurfacedPeer.TryGetTarget (out var p))
+ continue;
+ if (object.ReferenceEquals (g, p)) {
+ found = true;
+ }
+ }
+ Assert.IsTrue (found);
+
+ var localRef = g.PeerReference.NewLocalRef ();
+ g.Dispose ();
+ Assert.AreEqual (startPeerCount, valueManager.GetSurfacedPeers ().Count);
+ Assert.IsNull (valueManager.PeekPeer (localRef));
+ JniObjectReference.Dispose (ref localRef);
+ }
+
+
+ [Test]
+ public void CollectPeers ()
+ {
+ // TODO
+ }
+
+ [Test]
+ public void CreateValue ()
+ {
+ using (var o = new JavaObject ()) {
+ var r = o.PeerReference;
+ var x = (IJavaPeerable) valueManager.CreateValue (ref r, JniObjectReferenceOptions.Copy)!;
+ Assert.AreNotSame (o, x);
+ x.Dispose ();
+
+ x = valueManager.CreateValue (ref r, JniObjectReferenceOptions.Copy);
+ Assert.AreNotSame (o, x);
+ x!.Dispose ();
+ }
+ }
+
+ [Test]
+ public void GetValue_ReturnsAlias ()
+ {
+ var local = new JavaObject ();
+ local.UnregisterFromRuntime ();
+ Assert.IsNull (valueManager.PeekValue (local.PeerReference));
+ // GetObject must always return a value (unless handle is null, etc.).
+ // However, since we called local.UnregisterFromRuntime(),
+ // JniRuntime.PeekObject() is null (asserted above), but GetObject() must
+ // **still** return _something_.
+ // In this case, it returns an _alias_.
+ // TODO: "most derived type" alias generation. (Not relevant here, but...)
+ var p = local.PeerReference;
+ var alias = JniRuntime.CurrentRuntime.ValueManager.GetValue (ref p, JniObjectReferenceOptions.Copy);
+ Assert.AreNotSame (local, alias);
+ alias!.Dispose ();
+ local.Dispose ();
+ }
+
+ [Test]
+ public void GetValue_ReturnsNullWithNullHandle ()
+ {
+ var r = new JniObjectReference ();
+ var o = valueManager.GetValue (ref r, JniObjectReferenceOptions.Copy);
+ Assert.IsNull (o);
+ }
+
+ [Test]
+ public void GetValue_ReturnsNullWithInvalidSafeHandle ()
+ {
+ var invalid = new JniObjectReference ();
+ Assert.IsNull (valueManager.GetValue (ref invalid, JniObjectReferenceOptions.CopyAndDispose));
+ }
+
+ [Test]
+ public unsafe void GetValue_FindBestMatchType ()
+ {
+#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
+ using (var t = new JniType (TestType.JniTypeName)) {
+ var c = t.GetConstructor ("()V");
+ var o = t.NewObject (c, null);
+ using (var w = valueManager.GetValue (ref o, JniObjectReferenceOptions.CopyAndDispose)) {
+ Assert.AreEqual (typeof (TestType), w!.GetType ());
+ Assert.IsTrue (((TestType) w).ExecutedActivationConstructor);
+ }
+ }
+#endif // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
+ }
+
+ [Test]
+ public void PeekPeer ()
+ {
+ Assert.IsNull (valueManager.PeekPeer (new JniObjectReference ()));
+
+ using (var v = new MyDisposableObject ()) {
+ Assert.IsNotNull (valueManager.PeekPeer (v.PeerReference));
+ Assert.AreSame (v, valueManager.PeekPeer (v.PeerReference));
+ }
+ }
+
+ [Test]
+ public void PeekValue ()
+ {
+ JniObjectReference lref;
+ using (var o = new JavaObject ()) {
+ lref = o.PeerReference.NewLocalRef ();
+ Assert.AreSame (o, valueManager.PeekValue (lref));
+ }
+ // At this point, the Java-side object is kept alive by `lref`,
+ // but the wrapper instance has been disposed, and thus should
+ // be unregistered, and thus unfindable.
+ Assert.IsNull (valueManager.PeekValue (lref));
+ JniObjectReference.Dispose (ref lref);
+ }
+
+ [Test]
+ public void PeekValue_BoxedObjects ()
+ {
+ var marshaler = valueManager.GetValueMarshaler