Ensure that all native callbacks are setup always (#2331)

* Ensure that all native callbacks are setup always * Make ShouldCompactOnLaunch a static callback + clear app cache on reset * Update to new core * Rework how gchandles are freed in native callbacks * New Core * Rename the unity package * Make Migration non-disposable * Update to latest Core * Use Core v11. * Use Core with the snapshot fix * Try to enable core dumps * Use new Core * Revert to a less buggy Core version * Add a link for a TODO entry.
realm · Apr 28, 2021 · cfb9888 · cfb9888
1 parent 69e5b0d
commit cfb9888
Show file tree

Hide file tree

Showing 24 changed files with 435 additions and 463 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -208,8 +208,8 @@ stage('Unity Package') {
 
     bat "dotnet run --project Tools/SetupUnityPackage/SetupUnityPackage/ -- --path ${packagePath} --utils-path ${utilsPackagePath} --weaver-path ${weaverPackagePath} --pack"
     dir('Realm/Realm.Unity') {
-      archiveArtifacts "realm.unity-${packageVersion}.tgz"
-      bat "del realm.unity-${packageVersion}.tgz"
+      archiveArtifacts "io.realm.unity-${packageVersion}.tgz"
+      bat "del io.realm.unity-${packageVersion}.tgz"
     }
 
     bat "dotnet run --project Tools/SetupUnityPackage/SetupUnityPackage/ -- --path ${packagePath} --utils-path ${utilsPackagePath} --weaver-path ${weaverPackagePath} --include-dependencies --pack"
@@ -387,7 +387,7 @@ def NetCoreTest(String nodeName, String targetFramework) {
               "objectid-partition-key": "${env.WORKSPACE}/Tests/TestApps/objectid-partition-key",
               "uuid-partition-key": "${env.WORKSPACE}/Tests/TestApps/uuid-partition-key"
             ]) { networkName ->
-            test_runner_image.inside("--network=${networkName}") {
+            test_runner_image.inside("--network=${networkName} --ulimit core=-1") {
               script += " --baasurl http://mongodb-realm:9090"
               // see https://stackoverflow.com/a/53782505
               sh """

diff --git a/Realm/Realm.Unity/Runtime/Realm.dll.config.meta b/Realm/Realm.Unity/Runtime/Realm.dll.config.meta
diff --git a/Realm/Realm.Unity/package.json b/Realm/Realm.Unity/package.json
@@ -1,10 +1,10 @@
 {
-    "name": "realm.unity",
+    "name": "io.realm.unity",
     "version": "10.2.0-beta.2",
     "displayName": "Realm",
     "description": "Realm is a mobile database: a replacement for SQLite",
-    "unity": "2019.1",
-    "unityRelease": "0b5",
+    "unity": "2021.1",
+    "unityRelease": "3f1",
     "dependencies": {
     },
     "keywords": [

diff --git a/Realm/Realm/Configurations/RealmConfiguration.cs b/Realm/Realm/Configurations/RealmConfiguration.cs
@@ -23,7 +23,6 @@
 using System.Threading.Tasks;
 using Realms.Exceptions;
 using Realms.Helpers;
-using Realms.Native;
 using Realms.Schema;
 
 namespace Realms
@@ -133,14 +132,14 @@ internal override Realm CreateRealm(RealmSchema schema)
             if (MigrationCallback != null)
             {
                 migration = new Migration(this, schema);
-                migration.PopulateConfiguration(ref configuration);
+                configuration.managed_migration_handle = GCHandle.ToIntPtr(migration.MigrationHandle);
             }
 
+            GCHandle? shouldCompactHandle = null;
             if (ShouldCompactOnLaunch != null)
             {
-                var handle = GCHandle.Alloc(ShouldCompactOnLaunch);
-                configuration.should_compact_callback = ShouldCompactOnLaunchCallback;
-                configuration.managed_should_compact_delegate = GCHandle.ToIntPtr(handle);
+                shouldCompactHandle = GCHandle.Alloc(ShouldCompactOnLaunch);
+                configuration.managed_should_compact_delegate = GCHandle.ToIntPtr(shouldCompactHandle.Value);
             }
 
             var srPtr = IntPtr.Zero;
@@ -152,11 +151,16 @@ internal override Realm CreateRealm(RealmSchema schema)
             {
                 throw new AggregateException("Exception occurred in a Realm migration callback. See inner exception for more details.", migration?.MigrationException);
             }
+            finally
+            {
+                migration?.ReleaseHandle();
+                shouldCompactHandle?.Free();
+            }
 
             var srHandle = new SharedRealmHandle(srPtr);
             if (IsDynamic && !schema.Any())
             {
-                srHandle.GetSchema(nativeSchema => schema = RealmSchema.CreateFromObjectStoreSchema(nativeSchema));
+                schema = srHandle.GetSchema();
             }
 
             return new Realm(srHandle, this, schema);
@@ -178,20 +182,5 @@ internal override Task<Realm> CreateRealmAsync(RealmSchema schema, CancellationT
 
             return Task.FromResult(CreateRealm(schema));
         }
-
-        [MonoPInvokeCallback(typeof(ShouldCompactCallback))]
-        private static bool ShouldCompactOnLaunchCallback(IntPtr delegatePtr, ulong totalSize, ulong dataSize)
-        {
-            var handle = GCHandle.FromIntPtr(delegatePtr);
-            var compactDelegate = (ShouldCompactDelegate)handle.Target;
-            try
-            {
-                return compactDelegate(totalSize, dataSize);
-            }
-            finally
-            {
-                handle.Free();
-            }
-        }
     }
 }
diff --git a/Realm/Realm/Configurations/SyncConfiguration.cs b/Realm/Realm/Configurations/SyncConfiguration.cs
@@ -146,13 +146,12 @@ internal override Realm CreateRealm(RealmSchema schema)
             var srHandle = SharedRealmHandle.OpenWithSync(configuration, syncConfiguration, schema, EncryptionKey);
             if (IsDynamic && !schema.Any())
             {
-                srHandle.GetSchema(nativeSchema => schema = RealmSchema.CreateFromObjectStoreSchema(nativeSchema));
+                schema = srHandle.GetSchema();
             }
 
             return new Realm(srHandle, this, schema);
         }
 
-        [SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "The Realm instance will own its handle")]
         internal override async Task<Realm> CreateRealmAsync(RealmSchema schema, CancellationToken cancellationToken)
         {
             var configuration = CreateNativeConfiguration();
@@ -195,7 +194,7 @@ internal override async Task<Realm> CreateRealmAsync(RealmSchema schema, Cancell
                 var sharedRealmHandle = new SharedRealmHandle(realmPtr);
                 if (IsDynamic && !schema.Any())
                 {
-                    sharedRealmHandle.GetSchema(nativeSchema => schema = RealmSchema.CreateFromObjectStoreSchema(nativeSchema));
+                    schema = sharedRealmHandle.GetSchema();
                 }
 
                 return new Realm(sharedRealmHandle, this, schema);