Track Runtime run number. Assert, that PyObjects are only disposed in the same run they were created in.

lostmsu · lostmsu · commit ebf971f28c8e · 2020-03-02T18:32:08.000-08:00
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -29,6 +29,7 @@ public class PyObject : DynamicObject, IEnumerable, IPyDisposable
         public StackTrace Traceback { get; private set; }
 #endif  
 
+        readonly long run = Runtime.GetRun();
         protected internal IntPtr obj = IntPtr.Zero;
         private bool disposed = false;
         private bool _finalized = false;
@@ -169,6 +170,8 @@ protected virtual void Dispose(bool disposing)
             {
                 if (Runtime.Py_IsInitialized() > 0 && !Runtime.IsFinalizing)
                 {
+                    if (this.run != Runtime.GetRun())
+                        throw new InvalidOperationException("Attempt to dispose PyObject from wrong run");
                     IntPtr gs = PythonEngine.AcquireLock();
                     Runtime.XDecref(obj);
                     obj = IntPtr.Zero;
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -171,6 +171,17 @@ public class Runtime
 
         private static PyReferenceCollection _pyRefs = new PyReferenceCollection();
 
+        static long run = 0;
+
+        internal static long GetRun()
+        {
+            long runNumber = Interlocked.Read(ref run);
+            System.Diagnostics.Debug.Assert(runNumber > 0,
+                "This must only be called after Runtime is initialized at least once");
+            return runNumber;
+        }
+
+
         /// <summary>
         /// Initialize the runtime...
         /// </summary>
@@ -310,6 +321,8 @@ internal static void Initialize(bool initSigs = false)
 
             Error = new IntPtr(-1);
 
+            Interlocked.Increment(ref run);
+
             // Initialize data about the platform we're running on. We need
             // this for the type manager and potentially other details. Must
             // happen after caching the python types, above.
