simplify PyScope by delegating ownership to PyObject instance

lostmsu · lostmsu · commit d8abce6f0543 · 2021-01-22T22:17:35.000-08:00
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -157,6 +157,7 @@ public T As<T>()
             return (T)AsManagedObject(typeof(T));
         }
 
+        internal bool IsDisposed => obj == IntPtr.Zero;
 
         /// <summary>
         /// Dispose Method
diff --git a/src/runtime/pyscope.cs b/src/runtime/pyscope.cs
@@ -29,16 +29,13 @@ public class PyScope : DynamicObject, IDisposable
         /// <summary>
         /// the python Module object the scope associated with.
         /// </summary>
-        internal IntPtr obj;
+        readonly PyObject obj;
 
         /// <summary>
-        /// the variable dict of the scope.
+        /// the variable dict of the scope. Borrowed.
         /// </summary>
         internal readonly IntPtr variables;
 
-        private bool _isDisposed;
-        private bool _finalized = false;
-
         /// <summary>
         /// The Manager this scope associated with.
         /// It provides scopes this scope can import.
@@ -63,9 +60,9 @@ internal PyScope(IntPtr ptr, PyScopeManager manager)
                 throw new PyScopeException("object is not a module");
             }
             Manager = manager ?? PyScopeManager.Global;
-            obj = ptr;
+            obj = new PyObject(ptr);
             //Refcount of the variables not increase
-            variables = Runtime.PyModule_GetDict(obj);
+            variables = Runtime.PyModule_GetDict(obj.Handle);
             PythonException.ThrowIfIsNull(variables);
 
             int res = Runtime.PyDict_SetItem(
@@ -79,7 +76,6 @@ internal PyScope(IntPtr ptr, PyScopeManager manager)
         /// <summary>
         /// return the variable dict of the scope.
         /// </summary>
-        /// <returns></returns>
         public PyDict Variables()
         {
             Runtime.XIncref(variables);
@@ -134,7 +130,7 @@ public dynamic Import(string name, string asname = null)
         /// </remarks>
         public void Import(PyScope scope, string asname)
         {
-            this.Set(asname, scope.obj);
+            this.SetPyValue(asname, scope.obj.Handle);
         }
 
         /// <summary>
@@ -333,11 +329,11 @@ private void Exec(string code, IntPtr _globals, IntPtr _locals)
         public void Set(string name, object value)
         {
             IntPtr _value = Converter.ToPython(value, value?.GetType());
-            Set(name, _value);
+            SetPyValue(name, _value);
             Runtime.XDecref(_value);
         }
 
-        private void Set(string name, IntPtr value)
+        private void SetPyValue(string name, IntPtr value)
         {
             Check();
             using (var pyKey = new PyString(name))
@@ -505,31 +501,16 @@ public override bool TrySetMember(SetMemberBinder binder, object value)
 
         private void Check()
         {
-            if (_isDisposed)
+            if (this.obj.IsDisposed)
             {
                 throw new PyScopeException($"The scope of name '{Name}' object has been disposed");
             }
         }
 
         public void Dispose()
         {
-            if (_isDisposed)
-            {
-                return;
-            }
-            _isDisposed = true;
-            Runtime.XDecref(obj);
             this.OnDispose?.Invoke(this);
-        }
-
-        ~PyScope()
-        {
-            if (_finalized || _isDisposed)
-            {
-                return;
-            }
-            _finalized = true;
-            Finalizer.Instance.AddFinalizedObject(ref obj);
+            this.obj.Dispose();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ public T As<T>()`
`157`	`157`	`return (T)AsManagedObject(typeof(T));`
`158`	`158`	`}`
`159`	`159`
	`160`	`+ internal bool IsDisposed => obj == IntPtr.Zero;`
`160`	`161`
`161`	`162`	`/// <summary>`
`162`	`163`	`/// Dispose Method`