Skip to content

Pybuffer #1195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lostmsu merged 8 commits into from
Aug 7, 2020
Merged

Pybuffer #1195

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac997a9
Add Python buffer api support
thesn10 Oct 27, 2019
def2cc2
Update finalizer
thesn10 May 23, 2020
8237e87
Update finalizer 2
thesn10 May 29, 2020
edd849f
bring back pyversionnumber but leave it internal
koubaa Aug 1, 2020
7b30cfa
remove 3.5 checks
koubaa Aug 1, 2020
1e82ee8
use sys version info with C API
koubaa Aug 1, 2020
d201197
Use System.Version
koubaa Aug 2, 2020
0ed417c
compare full version
koubaa Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update finalizer 2
  • Loading branch information
@thesn10 @koubaa
thesn10 authored and koubaa committed Aug 1, 2020
commit 8237e87b2c396d3cd31b2934fb7cb5947872a22f
49 changes: 13 additions & 36 deletions src/runtime/pybuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Python.Runtime
{
public sealed class PyBuffer : IDisposable
public sealed class PyBuffer : IPyDisposable
{
private PyObject _exporter;
private Py_buffer _view;
Expand Down Expand Up @@ -217,43 +217,11 @@ private void Dispose(bool disposing)
{
if (!disposedValue)
{
Debug.Assert(_view.obj != IntPtr.Zero, "Buffer object is invalid (no exporter object ref)");
//if (_view.obj == IntPtr.Zero)
//{
// return;
//}

if (Runtime.Py_IsInitialized() == 0)
throw new InvalidOperationException("Python runtime must be initialized");

if (!Runtime.IsFinalizing)
{
long refcount = Runtime.Refcount(_view.obj);
Debug.Assert(refcount > 0, "Object refcount is 0 or less");

if (refcount == 1)
{
Runtime.PyErr_Fetch(out var errType, out var errVal, out var traceback);

try
{
// this also decrements ref count for _view->obj
Runtime.PyBuffer_Release(ref _view);
Runtime.CheckExceptionOccurred();
}
finally
{
// Python requires finalizers to preserve exception:
// https://docs.python.org/3/extending/newtypes.html#finalization-and-de-allocation
Runtime.PyErr_Restore(errType, errVal, traceback);
}
}
else
{
// this also decrements ref count for _view->obj
Runtime.PyBuffer_Release(ref _view);
}
}
// this also decrements ref count for _view->obj
Runtime.PyBuffer_Release(ref _view);

_exporter = null;
Shape = null;
Expand All @@ -266,7 +234,11 @@ private void Dispose(bool disposing)

~PyBuffer()
{
Dispose(false);
if (disposedValue)
{
return;
}
Finalizer.Instance.AddFinalizedObject(this);
}

/// <summary>
Expand All @@ -278,5 +250,10 @@ public void Dispose()
Dispose(true);
GC.SuppressFinalize(this);
}

public IntPtr[] GetTrackedHandles()
{
return new IntPtr[] { _view.obj };
}
}
}