diff options
author | Eric Snow <ericsnowcurrently@gmail.com> | 2023-10-09 13:39:51 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-09 13:39:51 (GMT) |
commit | 7bd560ce8de41e62230975c44fd7fbd189e8e858 (patch) | |
tree | 0d58bd28ecb0827591cf0c91a0a3cefc1de1926c /Python/pystate.c | |
parent | f4cb0d27cc08f490c42a22e646eb73cc7072d54a (diff) | |
download | cpython-7bd560ce8de41e62230975c44fd7fbd189e8e858.zip cpython-7bd560ce8de41e62230975c44fd7fbd189e8e858.tar.gz cpython-7bd560ce8de41e62230975c44fd7fbd189e8e858.tar.bz2 |
gh-76785: Add SendChannel.send_buffer() (#110246)
(This is still a test module.)
Diffstat (limited to 'Python/pystate.c')
-rw-r--r-- | Python/pystate.c | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/Python/pystate.c b/Python/pystate.c index 849a4ee..2086bd6 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -2584,18 +2584,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; } @@ -2627,21 +2645,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 |