Commitebf971f

committed

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

1 parentd932176 commitebf971fCopy full SHA for ebf971f

File tree

+16

-0

lines changed

+16

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public class PyObject : DynamicObject, IEnumerable, IPyDisposable`
`29`	`29`	`publicStackTraceTraceback{get;privateset;}`
`30`	`30`	`#endif`
`31`	`31`
	`32`	`+readonlylongrun=Runtime.GetRun();`
`32`	`33`	`protectedinternalIntPtrobj=IntPtr.Zero;`
`33`	`34`	`privatebooldisposed=false;`
`34`	`35`	`privatebool_finalized=false;`
`@@ -169,6 +170,8 @@ protected virtual void Dispose(bool disposing)`
`169`	`170`	`{`
`170`	`171`	`if(Runtime.Py_IsInitialized()>0&&!Runtime.IsFinalizing)`
`171`	`172`	`{`
	`173`	`+if(this.run!=Runtime.GetRun())`
	`174`	`+thrownewInvalidOperationException("Attempt to dispose PyObject from wrong run");`
`172`	`175`	`IntPtrgs=PythonEngine.AcquireLock();`
`173`	`176`	`Runtime.XDecref(obj);`
`174`	`177`	`obj=IntPtr.Zero;`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,17 @@ public class Runtime`
`171`	`171`
`172`	`172`	`privatestaticPyReferenceCollection_pyRefs=newPyReferenceCollection();`
`173`	`173`
	`174`	`+staticlongrun=0;`
	`175`	`+`
	`176`	`+internalstaticlongGetRun()`
	`177`	`+{`
	`178`	`+longrunNumber=Interlocked.Read(refrun);`
	`179`	`+System.Diagnostics.Debug.Assert(runNumber>0,`
	`180`	`+"This must only be called after Runtime is initialized at least once");`
	`181`	`+returnrunNumber;`
	`182`	`+}`
	`183`	`+`
	`184`	`+`
`174`	`185`	`/// <summary>`
`175`	`186`	`/// Initialize the runtime...`
`176`	`187`	`/// </summary>`
`@@ -310,6 +321,8 @@ internal static void Initialize(bool initSigs = false)`
`310`	`321`
`311`	`322`	`Error=newIntPtr(-1);`
`312`	`323`
	`324`	`+Interlocked.Increment(refrun);`
	`325`	`+`
`313`	`326`	`// Initialize data about the platform we're running on. We need`
`314`	`327`	`// this for the type manager and potentially other details. Must`
`315`	`328`	`// happen after caching the python types, above.`

Comments

(0)