Skip to content

gh-76785: Add SendChannel.send_buffer() #110246

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
ericsnowcurrently merged 20 commits into from
Oct 9, 2023
Merged

gh-76785: Add SendChannel.send_buffer() #110246

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ab2aa3b
Export _PyInterpreterState_LookUpID().
ericsnowcurrently Sep 9, 2023
4d103dd
Optionally free the pending call's data.
ericsnowcurrently Sep 11, 2023
faf7778
Add _Py_CallInInterpreter() and _Py_CallInInterpreterAndRawFree().
ericsnowcurrently Sep 11, 2023
5c5662d
Add PyUnstable_Buffer_ReleaseInInterpreter() and PyUnstable_Buffer_Re…
ericsnowcurrently Sep 11, 2023
573abef
Add CrossInterpreterBufferView.
ericsnowcurrently Sep 11, 2023
be7e927
Add _get_current_xibufferview_type().
ericsnowcurrently Sep 11, 2023
955989d
Add xibufferview_from_xid().
ericsnowcurrently Sep 11, 2023
05d13f5
Register memoryview for cross-interpreter use.
ericsnowcurrently Sep 11, 2023
3e4e977
Add _channels.send_buffer().
ericsnowcurrently Sep 11, 2023
1699495
Use _get_current_module_state().
ericsnowcurrently Sep 18, 2023
0c216ff
Add SendChannel.send_buffer().
ericsnowcurrently Sep 19, 2023
0ad6f41
Keep some C-API functions private for now.
ericsnowcurrently Oct 2, 2023
56e3774
Add a test.
ericsnowcurrently Oct 2, 2023
272488a
Fix SendChannel.send_buffer_nowait().
ericsnowcurrently Oct 2, 2023
ceb3dae
Fix a typo.
ericsnowcurrently Oct 2, 2023
873eec2
Add tests.
ericsnowcurrently Oct 2, 2023
da9779f
Fix SendChannel.send_buffer().
ericsnowcurrently Oct 2, 2023
dea173a
Clear the XID classes during module fini.
ericsnowcurrently Oct 3, 2023
0271b4a
Merge branch 'main' into channel-send-buffer
ericsnowcurrently Oct 4, 2023
fc15f77
Fix ref leaks.
ericsnowcurrently Oct 9, 2023
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
Add _Py_CallInInterpreter() and _Py_CallInInterpreterAndRawFree().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Oct 2, 2023
commit faf77787b172c9e24e781ed8784a83c35b1803b0
10 changes: 10 additions & 0 deletions Include/internal/pycore_ceval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ PyAPI_FUNC(int) _PyEval_AddPendingCall(
void *arg,
int flags);

typedef int (*_Py_simple_func)(void *);
extern int _Py_CallInInterpreter(
PyInterpreterState *interp,
_Py_simple_func func,
void *arg);
extern int _Py_CallInInterpreterAndRawFree(
PyInterpreterState *interp,
_Py_simple_func func,
void *arg);

extern void _PyEval_SignalAsyncExc(PyInterpreterState *interp);
#ifdef HAVE_FORK
extern PyStatus _PyEval_ReInitThreads(PyThreadState *tstate);
Expand Down
43 changes: 26 additions & 17 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2492,18 +2492,36 @@ _PyCrossInterpreterData_NewObject(_PyCrossInterpreterData *data)
return data->new_object(data);
}

static int
_release_xidata_pending(void *data)
int
_Py_CallInInterpreter(PyInterpreterState *interp,
_Py_simple_func func, void *arg)
{
_xidata_clear((_PyCrossInterpreterData *)data);
if (interp == current_fast_get(interp->runtime)->interp) {
return func(arg);
}
// XXX Emit a warning if this fails?
_PyEval_AddPendingCall(interp, (_Py_pending_call_func)func, arg, 0);
return 0;
}

int
_Py_CallInInterpreterAndRawFree(PyInterpreterState *interp,
_Py_simple_func func, void *arg)
{
if (interp == current_fast_get(interp->runtime)->interp) {
int res = func(arg);
PyMem_RawFree(arg);
return res;
}
// XXX Emit a warning if this fails?
_PyEval_AddPendingCall(interp, func, arg, _Py_PENDING_RAWFREE);
return 0;
}

static int
_xidata_release_and_rawfree_pending(void *data)
_call_clear_xidata(void *data)
{
_xidata_clear((_PyCrossInterpreterData *)data);
PyMem_RawFree(data);
return 0;
}

Expand Down Expand Up @@ -2535,21 +2553,12 @@ _xidata_release(_PyCrossInterpreterData *data, int rawfree)
}

// "Release" the data and/or the object.
if (interp == current_fast_get(interp->runtime)->interp) {
_xidata_clear(data);
if (rawfree) {
PyMem_RawFree(data);
}
if (rawfree) {
return _Py_CallInInterpreterAndRawFree(interp, _call_clear_xidata, data);
}
else {
_Py_pending_call_func func = _release_xidata_pending;
if (rawfree) {
func = _xidata_release_and_rawfree_pending;
}
// XXX Emit a warning if this fails?
_PyEval_AddPendingCall(interp, func, data, 0);
return _Py_CallInInterpreter(interp, _call_clear_xidata, data);
}
return 0;
}

int
Expand Down