aafec2281e
I'm using Pycapnp in a project, where we compile `.capnp` files directly to Cython instead of using the dynamic interface (for speed). For this, we need access to the `reraise_kj_exception` C function defined by Pycapnp. This is not possible, because Cython does not automatically make this function available to downstream users. My previous solution, in #301, was rather flawed. The file `capabilityHelper.cpp`, where `reraise_kj_exception` is defined, was bundled into the distribution, so that this file could be included in downstream libraries. This turns out to be a terrible idea, because it redefines a bunch of other things like `ReadPromiseAdapter`. For reasons not entirely clear to me, this leads to segmentation faults. This PR revers #301. Instead, in this PR I've made `reraise_kj_exception` a Cython-level function, that can be used by downstream libraries. The C-level variant has been renamed to `c_reraise_kj_exception`.
125 lines
3.2 KiB
C++
125 lines
3.2 KiB
C++
#pragma once
|
|
|
|
#include "capnp/dynamic.h"
|
|
#include <kj/async-io.h>
|
|
#include <capnp/serialize-async.h>
|
|
#include <stdexcept>
|
|
#include "Python.h"
|
|
|
|
class GILAcquire {
|
|
public:
|
|
GILAcquire() : gstate(PyGILState_Ensure()) {}
|
|
~GILAcquire() {
|
|
PyGILState_Release(gstate);
|
|
}
|
|
|
|
PyGILState_STATE gstate;
|
|
};
|
|
|
|
class GILRelease {
|
|
public:
|
|
GILRelease() {
|
|
Py_UNBLOCK_THREADS
|
|
}
|
|
~GILRelease() {
|
|
Py_BLOCK_THREADS
|
|
}
|
|
|
|
PyThreadState *_save; // The macros above read/write from this variable
|
|
};
|
|
|
|
class PyRefCounter {
|
|
public:
|
|
PyObject * obj;
|
|
|
|
PyRefCounter(PyObject * o) : obj(o) {
|
|
GILAcquire gil;
|
|
Py_INCREF(obj);
|
|
}
|
|
|
|
PyRefCounter(const PyRefCounter & ref) : obj(ref.obj) {
|
|
GILAcquire gil;
|
|
Py_INCREF(obj);
|
|
}
|
|
|
|
~PyRefCounter() {
|
|
GILAcquire gil;
|
|
Py_DECREF(obj);
|
|
}
|
|
};
|
|
|
|
inline kj::Own<PyRefCounter> stealPyRef(PyObject* o) {
|
|
auto ret = kj::heap<PyRefCounter>(o);
|
|
Py_DECREF(o);
|
|
return ret;
|
|
}
|
|
|
|
::kj::Promise<kj::Own<PyRefCounter>> convert_to_pypromise(capnp::RemotePromise<capnp::DynamicStruct> promise);
|
|
|
|
inline ::kj::Promise<kj::Own<PyRefCounter>> convert_to_pypromise(kj::Promise<void> promise) {
|
|
return promise.then([]() {
|
|
GILAcquire gil;
|
|
return kj::heap<PyRefCounter>(Py_None);
|
|
});
|
|
}
|
|
|
|
void c_reraise_kj_exception();
|
|
|
|
void check_py_error();
|
|
|
|
::kj::Promise<kj::Own<PyRefCounter>> then(kj::Promise<kj::Own<PyRefCounter>> promise,
|
|
kj::Own<PyRefCounter> func, kj::Own<PyRefCounter> error_func);
|
|
|
|
class PythonInterfaceDynamicImpl final: public capnp::DynamicCapability::Server {
|
|
public:
|
|
kj::Own<PyRefCounter> py_server;
|
|
kj::Own<PyRefCounter> kj_loop;
|
|
|
|
PythonInterfaceDynamicImpl(capnp::InterfaceSchema & schema,
|
|
kj::Own<PyRefCounter> _py_server,
|
|
kj::Own<PyRefCounter> kj_loop)
|
|
: capnp::DynamicCapability::Server(schema), py_server(kj::mv(_py_server)), kj_loop(kj::mv(kj_loop)) { }
|
|
|
|
~PythonInterfaceDynamicImpl() {
|
|
}
|
|
|
|
kj::Promise<void> call(capnp::InterfaceSchema::Method method,
|
|
capnp::CallContext< capnp::DynamicStruct, capnp::DynamicStruct> context);
|
|
};
|
|
|
|
class PyAsyncIoStream: public kj::AsyncIoStream {
|
|
public:
|
|
kj::Own<PyRefCounter> protocol;
|
|
|
|
PyAsyncIoStream(kj::Own<PyRefCounter> protocol) : protocol(kj::mv(protocol)) {}
|
|
~PyAsyncIoStream();
|
|
|
|
kj::Promise<size_t> tryRead(void* buffer, size_t minBytes, size_t maxBytes);
|
|
|
|
kj::Promise<void> write(const void* buffer, size_t size);
|
|
|
|
kj::Promise<void> write(kj::ArrayPtr<const kj::ArrayPtr<const kj::byte>> pieces);
|
|
|
|
kj::Promise<void> whenWriteDisconnected();
|
|
|
|
void shutdownWrite();
|
|
};
|
|
|
|
template <typename T>
|
|
inline void rejectDisconnected(kj::PromiseFulfiller<T>& fulfiller, kj::StringPtr message) {
|
|
fulfiller.reject(KJ_EXCEPTION(DISCONNECTED, message));
|
|
}
|
|
inline void rejectVoidDisconnected(kj::PromiseFulfiller<void>& fulfiller, kj::StringPtr message) {
|
|
fulfiller.reject(KJ_EXCEPTION(DISCONNECTED, message));
|
|
}
|
|
|
|
inline kj::Exception makeException(kj::StringPtr message) {
|
|
return KJ_EXCEPTION(FAILED, message);
|
|
}
|
|
|
|
kj::Promise<void> taskToPromise(kj::Own<PyRefCounter> coroutine, PyObject* callback);
|
|
|
|
::kj::Promise<kj::Own<PyRefCounter>> tryReadMessage(kj::AsyncIoStream& stream, capnp::ReaderOptions opts);
|
|
|
|
void init_capnp_api();
|