e92f7b56c6
* change how restorer works * fix join_promises * add incref's all around to make sure we aren't freeing objects early * make it so we return PyPromises everywhere and make chains collapsible
68 lines
2.9 KiB
C++
68 lines
2.9 KiB
C++
#pragma once
|
|
|
|
#include "capnp/dynamic.h"
|
|
#include "capnp/rpc-twoparty.h"
|
|
#include "Python.h"
|
|
#include "capabilityHelper.h"
|
|
|
|
extern "C" {
|
|
capnp::Capability::Client * call_py_restorer(PyObject *, capnp::AnyPointer::Reader &);
|
|
}
|
|
|
|
class PyRestorer final: public capnp::SturdyRefRestorer<capnp::AnyPointer> {
|
|
public:
|
|
PyRestorer(PyObject * _py_restorer): py_restorer(_py_restorer) {
|
|
// We don't need to incref/decref, since this C++ class will be owned by the Python wrapper class, and we'll make sure the python class doesn't refcount to 0 elsewhere.
|
|
// Py_INCREF(py_restorer);
|
|
}
|
|
|
|
// ~PyRestorer() {
|
|
// Py_DECREF(py_restorer);
|
|
// }
|
|
|
|
capnp::Capability::Client restore(capnp::AnyPointer::Reader objectId) override {
|
|
capnp::Capability::Client * ret = call_py_restorer(py_restorer, objectId);
|
|
check_py_error();
|
|
capnp::Capability::Client stack_ret(*ret);
|
|
delete ret;
|
|
|
|
return stack_ret;
|
|
}
|
|
|
|
private:
|
|
PyObject * py_restorer;
|
|
};
|
|
|
|
capnp::Capability::Client restoreHelper(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client, capnp::MessageBuilder & objectId) { capnp::MallocMessageBuilder hostIdMessage(8);
|
|
auto hostId = hostIdMessage.initRoot<capnp::rpc::twoparty::SturdyRefHostId>();
|
|
hostId.setSide(capnp::rpc::twoparty::Side::SERVER);
|
|
return client.restore(hostId, objectId.getRoot<capnp::AnyPointer>());
|
|
}
|
|
|
|
|
|
capnp::Capability::Client restoreHelper(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client, capnp::MessageReader & objectId) { capnp::MallocMessageBuilder hostIdMessage(8);
|
|
auto hostId = hostIdMessage.initRoot<capnp::rpc::twoparty::SturdyRefHostId>();
|
|
hostId.setSide(capnp::rpc::twoparty::Side::SERVER);
|
|
return client.restore(hostId, objectId.getRoot<capnp::AnyPointer>());
|
|
}
|
|
capnp::Capability::Client restoreHelper(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client, capnp::AnyPointer::Reader & objectId) { capnp::MallocMessageBuilder hostIdMessage(8);
|
|
auto hostId = hostIdMessage.initRoot<capnp::rpc::twoparty::SturdyRefHostId>();
|
|
hostId.setSide(capnp::rpc::twoparty::Side::SERVER);
|
|
return client.restore(hostId, objectId);
|
|
}
|
|
capnp::Capability::Client restoreHelper(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client, capnp::AnyPointer::Builder & objectId) { capnp::MallocMessageBuilder hostIdMessage(8);
|
|
auto hostId = hostIdMessage.initRoot<capnp::rpc::twoparty::SturdyRefHostId>();
|
|
hostId.setSide(capnp::rpc::twoparty::Side::SERVER);
|
|
return client.restore(hostId, objectId);
|
|
}
|
|
|
|
template <typename SturdyRefHostId, typename ProvisionId,
|
|
typename RecipientId, typename ThirdPartyCapId, typename JoinAnswer>
|
|
capnp::RpcSystem<SturdyRefHostId> makeRpcClientWithRestorer(
|
|
capnp::VatNetwork<SturdyRefHostId, ProvisionId, RecipientId, ThirdPartyCapId, JoinAnswer>& network,
|
|
PyRestorer& restorer) {
|
|
using namespace capnp;
|
|
return RpcSystem<SturdyRefHostId>(network,
|
|
kj::Maybe<SturdyRefRestorer<AnyPointer>&>(restorer));
|
|
}
|