fixup! create unnamed pyscope, make PyScope.GILState save

yagweb · yagweb · commit ceaaef033339 · 2017-04-07T21:05:25.000+08:00
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -573,7 +573,6 @@ public void Dispose()
                     return;
                 }
                 isDisposed = true;
-                AcquireLock();
                 ReleaseLock();
                 GC.SuppressFinalize(this);
             }
@@ -957,7 +956,10 @@ public virtual void Dispose()
             AcquireLock();
             Runtime.XDecref(globals);
             Runtime.XDecref(locals);
-            Py.RemoveSession(this);
+            if(this.Parent == null)
+            {
+                Py.RemoveSession(this);
+            }            
             isDisposed = true;
         }
 
@@ -1010,7 +1012,7 @@ public static PyScope Session(string name = null)
 
         internal static void RemoveSession(PyScope scope)
         {
-            if(scope.Parent == null)//top session
+            if(scope.Parent == null)//top scope
             {
                 Sessions.Remove(scope);
                 if(scope.Name != null)

Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,6 @@ public void Dispose()`
`573`	`573`	`return;`
`574`	`574`	`}`
`575`	`575`	`isDisposed = true;`
`576`		`- AcquireLock();`
`577`	`576`	`ReleaseLock();`
`578`	`577`	`GC.SuppressFinalize(this);`
`579`	`578`	`}`
`@@ -957,7 +956,10 @@ public virtual void Dispose()`
`957`	`956`	`AcquireLock();`
`958`	`957`	`Runtime.XDecref(globals);`
`959`	`958`	`Runtime.XDecref(locals);`
`960`		`- Py.RemoveSession(this);`
	`959`	`+ if(this.Parent == null)`
	`960`	`+ {`
	`961`	`+ Py.RemoveSession(this);`
	`962`	`+ }`
`961`	`963`	`isDisposed = true;`
`962`	`964`	`}`
`963`	`965`
`@@ -1010,7 +1012,7 @@ public static PyScope Session(string name = null)`
`1010`	`1012`
`1011`	`1013`	`internal static void RemoveSession(PyScope scope)`
`1012`	`1014`	`{`
`1013`		`- if(scope.Parent == null)//top session`
	`1015`	`+ if(scope.Parent == null)//top scope`
`1014`	`1016`	`{`
`1015`	`1017`	`Sessions.Remove(scope);`
`1016`	`1018`	`if(scope.Name != null)`