Commitcd8abd1

committed

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

1 parentac336a8 commitcd8abd1Copy full SHA for cd8abd1

File tree

+15

-0

lines changed

+15

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public partial class PyObject : DynamicObject, IDisposable`
`26`	`26`	`publicStackTraceTraceback{get;privateset;}`
`27`	`27`	`#endif`
`28`	`28`
	`29`	`+readonlylongrun=Runtime.GetRun();`
`29`	`30`	`protectedinternalIntPtrobj=IntPtr.Zero;`
`30`	`31`
`31`	`32`	`publicstaticPyObjectNone=>newPyObject(newBorrowedReference(Runtime.PyNone));`
`@@ -188,6 +189,9 @@ protected virtual void Dispose(bool disposing)`
`188`	`189`	`if(Runtime.Py_IsInitialized()==0)`
`189`	`190`	`thrownewInvalidOperationException("Python runtime must be initialized");`
`190`	`191`
	`192`	`+if(this.run!=Runtime.GetRun())`
	`193`	`+thrownewInvalidOperationException("Attempt to dispose PyObject from wrong run");`
	`194`	`+`
`191`	`195`	`if(!Runtime.IsFinalizing)`
`192`	`196`	`{`
`193`	`197`	`longrefcount=Runtime.Refcount(this.obj);`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,16 @@ internal static Version PyVersion`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/// <summary>`
	`89`	`+staticlongrun=0;`
	`90`	`+`
	`91`	`+internalstaticlongGetRun()`
	`92`	`+{`
	`93`	`+longrunNumber=Interlocked.Read(refrun);`
	`94`	`+System.Diagnostics.Debug.Assert(runNumber>0,`
	`95`	`+"This must only be called after Runtime is initialized at least once");`
	`96`	`+returnrunNumber;`
	`97`	`+}`
	`98`	`+`
`89`	`99`	`/// Initialize the runtime...`
`90`	`100`	`/// </summary>`
`91`	`101`	`/// <remarks>Always call this method from the Main thread. After the`
`@@ -110,6 +120,7 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd`
`110`	`120`	`if(!interpreterAlreadyInitialized)`
`111`	`121`	`{`
`112`	`122`	`Py_InitializeEx(initSigs?1:0);`
	`123`	`+Interlocked.Increment(refrun);`
`113`	`124`	`if(PyEval_ThreadsInitialized()==0)`
`114`	`125`	`{`
`115`	`126`	`PyEval_InitThreads();`

Comments

(0)