NotificationsYou must be signed in to change notification settings
Fork752
Star5.1k

Commit1e5338f

committed

allow GIL state debugging; require GILState to be properly disposed

1 parent4afa4bd commit1e5338fCopy full SHA for 1e5338f

File tree

1 file changed

+23

-3

lines changed

src/runtime
- pythonengine.cs

1 file changed

+23

-3

lines changed

`‎src/runtime/pythonengine.cs`

Lines changed: 23 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`usingSystem.Linq;`
`5`	`5`	`usingSystem.Reflection;`
`6`	`6`	`usingSystem.Runtime.InteropServices;`
	`7`	`+usingSystem.Threading;`
`7`	`8`
`8`	`9`	`namespacePython.Runtime`
`9`	`10`	`{`
`@@ -51,6 +52,9 @@ public static bool IsInitialized`
`51`	`52`	`get{returninitialized;}`
`52`	`53`	`}`
`53`	`54`
	`55`	`+/// <summary>Set to <c>true</c> to enable GIL debugging assistance.</summary>`
	`56`	`+publicstaticboolDebugGIL{get;set;}=false;`
	`57`	`+`
`54`	`58`	`internalstaticDelegateManagerDelegateManager`
`55`	`59`	`{`
`56`	`60`	`get`
`@@ -633,7 +637,7 @@ public static GILState GIL()`
`633`	`637`	`PythonEngine.Initialize();`
`634`	`638`	`}`
`635`	`639`
`636`		`-returnnewGILState();`
	`640`	`+returnPythonEngine.DebugGIL?newDebugGILState():newGILState();`
`637`	`641`	`}`
`638`	`642`
`639`	`643`	`publicstaticPyScopeCreateScope()`
`@@ -658,7 +662,7 @@ internal GILState()`
`658`	`662`	`state=PythonEngine.AcquireLock();`
`659`	`663`	`}`
`660`	`664`
`661`		`-publicvoidDispose()`
	`665`	`+publicvirtualvoidDispose()`
`662`	`666`	`{`
`663`	`667`	`if(this.isDisposed)return;`
`664`	`668`
`@@ -669,7 +673,23 @@ public void Dispose()`
`669`	`673`
`670`	`674`	`~GILState()`
`671`	`675`	`{`
`672`		`-Dispose();`
	`676`	`+thrownewInvalidOperationException("GIL must always be released, and it must be released from the same thread that acquired it.");`
	`677`	`+}`
	`678`	`+}`
	`679`	`+`
	`680`	`+publicclassDebugGILState:GILState`
	`681`	`+{`
	`682`	`+readonlyThreadowner;`
	`683`	`+internalDebugGILState():base()`
	`684`	`+{`
	`685`	`+this.owner=Thread.CurrentThread;`
	`686`	`+}`
	`687`	`+publicoverridevoidDispose()`
	`688`	`+{`
	`689`	`+if(this.owner!=Thread.CurrentThread)`
	`690`	`+thrownewInvalidOperationException("GIL must always be released from the same thread, that acquired it");`
	`691`	`+`
	`692`	`+base.Dispose();`
`673`	`693`	`}`
`674`	`694`	`}`
`675`	`695`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1e5338f

File tree

1 file changed

1 file changed

`‎src/runtime/pythonengine.cs`

0 commit comments