add a new class PyScopeManager

yagweb · yagweb · commit f35d75ba8e4e · 2017-04-24T13:11:50.000+08:00
diff --git a/src/embed_tests/TestPyScope.cs b/src/embed_tests/TestPyScope.cs
@@ -306,7 +306,7 @@ public void TestVariables()
             var a2 = ps.GetVariable<int>("ee");
             Assert.AreEqual(220, a2);
 
-            var item = (ps as dynamic).locals();
+            var item = ps.Variables();
             item["ee"] = new PyInt(230);
             item.Dispose();
             var a3 = ps.GetVariable<int>("ee");
diff --git a/src/runtime/pyscope.cs b/src/runtime/pyscope.cs
@@ -15,13 +15,14 @@ public PyScopeException(string message)
     }
 
     /// <summary>
-    /// Classes implement this interface must be used with GIL obtained.
+    /// Classes/methods have this attribute must be used with GIL obtained.
     /// </summary>
-    public interface IPyObject : IDisposable
+    public class PyGILAttribute : Attribute
     {
     }
 
-    public class PyScope : DynamicObject, IPyObject
+    [PyGIL]
+    public class PyScope : DynamicObject, IDisposable
     {
         public readonly string Name;
 
@@ -33,6 +34,10 @@ public class PyScope : DynamicObject, IPyObject
         internal readonly IntPtr variables;
 
         private bool isDisposed;
+
+        internal PyScopeManager Manager;
+
+        public event Action<PyScope> OnDispose;
         
         internal static PyScope New(string name = null)
         {
@@ -64,8 +69,6 @@ private PyScope(IntPtr ptr)
             this.Name = this.GetVariable<string>("__name__");
         }
 
-        public event Action<PyScope> OnDispose;
-
         public PyDict Variables()
         {
             Runtime.XIncref(variables);
@@ -81,7 +84,7 @@ public PyScope NewScope()
 
         public void ImportAllFromScope(string name)
         {
-            var scope = Py.GetScope(name);
+            var scope = Manager.Get(name);
             ImportAllFromScope(scope);
         }
 
@@ -96,7 +99,7 @@ public void ImportAllFromScope(PyScope scope)
 
         public void ImportScope(string name, string asname = null)
         {
-            var scope = Py.GetScope(name);
+            var scope = Manager.Get(name);
             if(asname == null)
             {
                 asname = name;
@@ -436,4 +439,64 @@ public void Dispose()
             Dispose();
         }
     }
+
+    public class PyScopeManager
+    {
+        private Dictionary<string, PyScope> NamedScopes = new Dictionary<string, PyScope>();
+
+        [PyGIL]
+        public PyScope Create()
+        {
+            var scope = PyScope.New();
+            scope.Manager = this;
+            return scope;
+        }
+
+        [PyGIL]
+        public PyScope Create(string name)
+        {
+            if (String.IsNullOrEmpty(name))
+            {
+                throw new PyScopeException("Name of ScopeStorage must not be empty");
+            }
+            if (name != null && NamedScopes.ContainsKey(name))
+            {
+                throw new PyScopeException(String.Format("ScopeStorage '{0}' has existed", name));
+            }
+            var scope = PyScope.New(name);
+            scope.Manager = this;
+            scope.OnDispose += Remove;
+            NamedScopes[name] = scope;
+            return scope;
+        }
+
+        public bool Contains(string name)
+        {
+            return NamedScopes.ContainsKey(name);
+        }
+
+        public PyScope Get(string name)
+        {
+            if (name != null && NamedScopes.ContainsKey(name))
+            {
+                return NamedScopes[name];
+            }
+            throw new PyScopeException(String.Format("ScopeStorage '{0}' not exist", name));
+        }
+
+        public void Remove(PyScope scope)
+        {
+            NamedScopes.Remove(scope.Name);
+        }
+
+        [PyGIL]
+        public void Clear()
+        {
+            var scopes = NamedScopes.Values.ToList();
+            foreach (var scope in scopes)
+            {
+                scope.Dispose();
+            }
+        }
+    }
 }
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -294,7 +294,7 @@ public static void Shutdown()
         {
             if (initialized)
             {
-                Py.ClearScopes();
+                Py.PyScopeManager.Clear();
                 Marshal.FreeHGlobal(_pythonHome);
                 _pythonHome = IntPtr.Zero;
                 Marshal.FreeHGlobal(_programName);
@@ -547,61 +547,20 @@ public static GILState GIL()
             return new GILState();
         }
         
-        private static Dictionary<string, PyScope> NamedScopes = new Dictionary<string, PyScope>();
+        internal static PyScopeManager PyScopeManager = new PyScopeManager();
 
         public static PyScope CreateScope()
         {
-            var scope = PyScope.New();
+            var scope = PyScopeManager.Create();
             return scope;
         }
 
         public static PyScope CreateScope(string name)
         {
-            if (String.IsNullOrEmpty(name))
-            {
-                throw new PyScopeException("Name of ScopeStorage must not be empty");
-            }
-            if (name != null && NamedScopes.ContainsKey(name))
-            {
-                throw new PyScopeException(String.Format("ScopeStorage '{0}' has existed", name));
-            }
-            var scope = PyScope.New(name);
-            if (name != null)
-            {
-                NamedScopes[name] = scope;
-                scope.OnDispose += RemoveScope;
-            }
+            var scope = PyScopeManager.Create(name);
             return scope;
         }
         
-        public static bool ContainsScope(string name)
-        {
-            return NamedScopes.ContainsKey(name);
-        }
-
-        public static PyScope GetScope(string name)
-        {
-            if (name != null && NamedScopes.ContainsKey(name))
-            {
-                return NamedScopes[name]; 
-            }
-            throw new PyScopeException(String.Format("ScopeStorage '{0}' not exist", name));
-        }
-
-        internal static void RemoveScope(PyScope scope)
-        {
-            NamedScopes.Remove(scope.Name);
-        }
-
-        internal static void ClearScopes()
-        {
-            var scopes = NamedScopes.Values.ToList();
-            foreach (var scope in scopes)
-            {
-                scope.Dispose();
-            }
-        }
-
         public class GILState : IDisposable
         {
             private IntPtr state;
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -707,10 +707,10 @@ public static extern int Py_Main(
         [DllImport(PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern IntPtr PyRun_String(string code, IntPtr st, IntPtr globals, IntPtr locals);
 
-        [DllImport(PythonDll)]
+        [DllImport(PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern IntPtr PyEval_EvalCode(IntPtr co, IntPtr globals, IntPtr locals);
 
-        [DllImport(PythonDll)]
+        [DllImport(PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern IntPtr Py_CompileString(string code, string file, IntPtr tok);
 
         [DllImport(PythonDll, CallingConvention = CallingConvention.Cdecl)]
