IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all public references to EventLoop to match changes to async API

Browse Source
This commit is contained in:
Jason Paryani
2013-12-02 17:38:32 -08:00
parent d1de275187
commit 888b906781
11 changed files with 168 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
capnp/__init__.py
View File

@@ -33,7 +33,7 @@ Example Usage::
"""
from .version import version as __version__
from .capnp import *
from .capnp import _DynamicStructReader, _DynamicStructBuilder, _DynamicResizableListBuilder, _DynamicListReader, _DynamicListBuilder, _DynamicOrphan, _DynamicResizableListBuilder, _MallocMessageBuilder, _PackedFdMessageReader, _StreamFdMessageReader, _write_message_to_fd, _write_packed_message_to_fd, _StructModule, _InterfaceModule, _DynamicCapabilityClient, _CapabilityClient
from .capnp import _DynamicStructReader, _DynamicStructBuilder, _DynamicResizableListBuilder, _DynamicListReader, _DynamicListBuilder, _DynamicOrphan, _DynamicResizableListBuilder, _MallocMessageBuilder, _PackedFdMessageReader, _StreamFdMessageReader, _write_message_to_fd, _write_packed_message_to_fd, _StructModule, _InterfaceModule, _DynamicCapabilityClient, _CapabilityClient, _EventLoop
del capnp
add_import_hook() # enable import hook by default

16
capnp/capabilityHelper.h
View File

@@ -76,18 +76,6 @@ void wrapRemoteCall(PyObject * func, capnp::Response<capnp::DynamicStruct> & arg
check_py_error();
}
::kj::Promise<PyObject *> evalLater(kj::EventLoop & loop, PyObject * func) {
return loop.evalLater([func]() { return wrapPyFunc(func, NULL); } );
}
::kj::Promise<PyObject *> there(kj::EventLoop & loop, kj::Promise<PyObject *> & promise, PyObject * func, PyObject * error_func) {
if(error_func == Py_None)
return loop.there(kj::mv(promise), [func](PyObject * arg) { return wrapPyFunc(func, arg); } );
else
return loop.there(kj::mv(promise), [func](PyObject * arg) { return wrapPyFunc(func, arg); }
, [error_func](kj::Exception arg) { return wrapPyFunc(error_func, wrap_kj_exception(arg)); } );
}
::kj::Promise<PyObject *> then(kj::Promise<PyObject *> & promise, PyObject * func, PyObject * error_func) {
if(error_func == Py_None)
return promise.then([func](PyObject * arg) { return wrapPyFunc(func, arg); } );
@@ -134,8 +122,8 @@ public:
}
};
capnp::DynamicCapability::Client new_client(capnp::InterfaceSchema & schema, PyObject * server, kj::EventLoop & loop) {
return capnp::DynamicCapability::Client(kj::heap<PythonInterfaceDynamicImpl>(schema, server), loop);
capnp::DynamicCapability::Client new_client(capnp::InterfaceSchema & schema, PyObject * server) {
return capnp::DynamicCapability::Client(kj::heap<PythonInterfaceDynamicImpl>(schema, server));
}
capnp::DynamicValue::Reader new_server(capnp::InterfaceSchema & schema, PyObject * server) {
return capnp::DynamicValue::Reader(kj::heap<PythonInterfaceDynamicImpl>(schema, server));

144
capnp/capnp.pyx
View File

@@ -1163,6 +1163,61 @@ cdef class _DynamicObjectBuilder:
return _DynamicStructBuilder()._init(self.thisptr.getAs(s.thisptr), self._parent)
cdef class _EventLoop:
cdef UnixEventLoop * thisptr
def __init__(self):
self._init()
cdef _init(self) except +reraise_kj_exception:
self.thisptr = new UnixEventLoop()
def __dealloc__(self):
del self.thisptr
def delete(self):
del self.thisptr
# cpdef evalLater(self, func):
# Py_INCREF(func)
# return _Promise()._init(capnp.evalLater(self.thisptr, <PyObject *>func))
# cpdef wait(self, _PromiseTypes promise) except +reraise_kj_exception:
# if promise.is_consumed:
# raise ValueError('Promise was already used in a consuming operation. You can no longer use this Promise object')
# ret = None
# if _PromiseTypes is _RemotePromise:
# ret = _Response()._init_child(self.thisptr.wait_remote(moveRemotePromise(deref(promise.thisptr))), promise._parent)
# elif _PromiseTypes is _VoidPromise:
# self.thisptr.wait_void(moveVoidPromise(deref(promise.thisptr)))
# elif _PromiseTypes is PromiseFulfillerPair:
# self.thisptr.wait_void(moveVoidPromise(deref(promise.thisptr).promise))
# elif _PromiseTypes is _Promise:
# ret = self.thisptr.wait(movePromise(deref(promise.thisptr)))
# else:
# raise ValueError("Not a valid promise type")
# promise.is_consumed = True
# return ret
# cpdef there(self, Promise promise, object func, object error_func=None):
# if promise.is_consumed:
# raise RuntimeError('Promise was already used in a consuming operation. You can no longer use this Promise object')
# Py_INCREF(func)
# Py_INCREF(error_func)
# return Promise()._init(capnp.there(self.thisptr, deref(promise.thisptr), <PyObject *>func, <PyObject *>error_func))
DEFAULT_EVENT_LOOP = _EventLoop()
def remove_event_loop():
global DEFAULT_EVENT_LOOP
DEFAULT_EVENT_LOOP.delete()
DEFAULT_EVENT_LOOP = None
cdef class _CallContext:
cdef CallContext * thisptr
@@ -1318,40 +1373,6 @@ cdef class _RemotePromise:
def to_dict(self, verbose=False):
return _to_dict(self, verbose)
cdef class EventLoop:
cdef UnixEventLoop thisptr
cpdef evalLater(self, func):
Py_INCREF(func)
return _Promise()._init(capnp.evalLater(self.thisptr, <PyObject *>func))
cpdef wait(self, _PromiseTypes promise) except +reraise_kj_exception:
if promise.is_consumed:
raise ValueError('Promise was already used in a consuming operation. You can no longer use this Promise object')
ret = None
if _PromiseTypes is _RemotePromise:
ret = _Response()._init_child(self.thisptr.wait_remote(moveRemotePromise(deref(promise.thisptr))), promise._parent)
elif _PromiseTypes is _VoidPromise:
self.thisptr.wait_void(moveVoidPromise(deref(promise.thisptr)))
elif _PromiseTypes is PromiseFulfillerPair:
self.thisptr.wait_void(moveVoidPromise(deref(promise.thisptr).promise))
elif _PromiseTypes is _Promise:
ret = self.thisptr.wait(movePromise(deref(promise.thisptr)))
else:
raise ValueError("Not a valid promise type")
promise.is_consumed = True
return ret
# cpdef there(self, Promise promise, object func, object error_func=None):
# if promise.is_consumed:
# raise RuntimeError('Promise was already used in a consuming operation. You can no longer use this Promise object')
# Py_INCREF(func)
# Py_INCREF(error_func)
# return Promise()._init(capnp.there(self.thisptr, deref(promise.thisptr), <PyObject *>func, <PyObject *>error_func))
cdef class _Request(_DynamicStructBuilder):
cdef Request * thisptr_child
@@ -1392,23 +1413,21 @@ cdef class _DynamicCapabilityServer:
cdef class _DynamicCapabilityClient:
cdef C_DynamicCapability.Client thisptr
cdef public object _event_loop, _server, _parent
cdef public object _server, _parent
cdef _init(self, C_DynamicCapability.Client other, object parent):
self.thisptr = other
self._parent = parent
return self
cdef _init_vals(self, schema, server, event_loop):
cdef _init_vals(self, schema, server):
cdef _InterfaceSchema s
if hasattr(schema, 'schema'):
s = schema.schema
else:
s = schema
cdef EventLoop loop = event_loop
self._event_loop = event_loop
self.thisptr = new_client(s.thisptr, <PyObject *>server, loop.thisptr)
self.thisptr = new_client(s.thisptr, <PyObject *>server)
self._server = server
return self
@@ -1523,24 +1542,25 @@ cdef class Restorer:
cdef class _TwoPartyVatNetwork:
cdef Own[C_TwoPartyVatNetwork] thisptr
cdef _init(self, EventLoop loop, AsyncIoStream & stream, Side side):
self.thisptr = makeTwoPartyVatNetwork(loop.thisptr, stream, side)
cdef _init(self, AsyncIoStream & stream, Side side):
self.thisptr = makeTwoPartyVatNetwork(stream, side)
return self
cdef class RpcClient:
cdef RpcSystem * thisptr
cdef public _TwoPartyVatNetwork network
cdef public object loop, restorer, stream
cdef public object restorer, _stream
cdef public _FdAsyncIoStream stream
def __init__(self, EventLoop loop, FdAsyncIoStream stream, Restorer restorer=None):
self.loop = loop
self.stream = stream
self.network = _TwoPartyVatNetwork()._init(loop, deref(stream.thisptr), capnp.CLIENT)
def __init__(self, stream, Restorer restorer=None):
self._stream = stream
self.stream = _FdAsyncIoStream(stream.fileno())
self.network = _TwoPartyVatNetwork()._init(deref(self.stream.thisptr), capnp.CLIENT)
if restorer is None:
self.thisptr = new RpcSystem(makeRpcClient(deref(self.network.thisptr), loop.thisptr))
self.thisptr = new RpcSystem(makeRpcClient(deref(self.network.thisptr)))
else:
self.restorer = restorer
self.thisptr = new RpcSystem(makeRpcClientWithRestorer(deref(self.network.thisptr), loop.thisptr, deref(restorer.thisptr)))
self.thisptr = new RpcSystem(makeRpcClientWithRestorer(deref(self.network.thisptr), deref(restorer.thisptr)))
def __dealloc__(self):
del self.thisptr
@@ -1569,24 +1589,25 @@ cdef class RpcClient:
cdef class RpcServer:
cdef RpcSystem * thisptr
cdef public _TwoPartyVatNetwork network
cdef public object loop, restorer, stream
cdef public object restorer, _stream
cdef public _FdAsyncIoStream stream
def __init__(self, EventLoop loop, FdAsyncIoStream stream, Restorer restorer):
self.loop = loop
self.stream = stream
def __init__(self, stream, Restorer restorer):
self._stream = stream
self.stream = _FdAsyncIoStream(stream.fileno())
self.restorer = restorer
self.network = _TwoPartyVatNetwork()._init(loop, deref(stream.thisptr), capnp.SERVER)
self.thisptr = new RpcSystem(makeRpcServer(deref(self.network.thisptr), deref(restorer.thisptr), loop.thisptr))
self.network = _TwoPartyVatNetwork()._init(deref(self.stream.thisptr), capnp.SERVER)
self.thisptr = new RpcSystem(makeRpcServer(deref(self.network.thisptr), deref(restorer.thisptr)))
def __dealloc__(self):
del self.thisptr
def run_forever(self):
self.loop.wait(_VoidPromise()._init(deref(self.network.thisptr).onDisconnect()))
return _VoidPromise()._init(deref(self.network.thisptr).onDisconnect())
# TODO: add restore functionality here?
cdef class FdAsyncIoStream:
cdef class _FdAsyncIoStream:
cdef Own[AsyncIoStream] thisptr
def __init__(self, int fd):
@@ -1596,11 +1617,8 @@ cdef class PromiseFulfillerPair:
cdef Own[C_PromiseFulfillerPair] thisptr
cdef public bint is_consumed
def __init__(self, EventLoop loop=None):
if loop is None:
self.thisptr = copyPromiseFulfillerPair(newPromiseAndFulfiller())
else:
self.thisptr = copyPromiseFulfillerPair(newPromiseAndFulfiller(loop.thisptr))
def __init__(self):
self.thisptr = copyPromiseFulfillerPair(newPromiseAndFulfiller())
self.is_consumed = False
cpdef fulfill(self):
@@ -1870,8 +1888,8 @@ class _InterfaceModule(object):
def __init__(self, schema):
self.schema = schema
def _new_client(self, server, loop):
return _DynamicCapabilityClient()._init_vals(self.schema, server, loop)
def _new_client(self, server):
return _DynamicCapabilityClient()._init_vals(self.schema, server)
def new_server(self, server):
return _DynamicCapabilityServer(self.schema, server)

27
capnp/capnp_cpp.pxd
View File

@@ -35,7 +35,7 @@ cdef extern from "kj/exception.h" namespace " ::kj":
cdef extern from "kj/memory.h" namespace " ::kj":
cdef cppclass Own[T]:
T& operator*()
Own[TwoPartyVatNetwork] makeTwoPartyVatNetwork" ::kj::heap< ::capnp::TwoPartyVatNetwork>"(EventLoop &, AsyncIoStream& stream, Side)
Own[TwoPartyVatNetwork] makeTwoPartyVatNetwork" ::kj::heap< ::capnp::TwoPartyVatNetwork>"(AsyncIoStream& stream, Side)
Own[PromiseFulfillerPair] copyPromiseFulfillerPair" ::kj::heap< ::kj::PromiseFulfillerPair<void> >"(PromiseFulfillerPair&)
cdef extern from "kj/string-tree.h" namespace " ::kj":
@@ -206,8 +206,8 @@ cdef extern from "capnp/rpc-twoparty.h" namespace " ::capnp":
TwoPartyVatNetwork(EventLoop &, AsyncIoStream& stream, Side)
VoidPromise onDisconnect()
VoidPromise onDrain()
RpcSystem makeRpcServer(TwoPartyVatNetwork&, PyRestorer&, EventLoop&)
RpcSystem makeRpcClient(TwoPartyVatNetwork&, EventLoop&)
RpcSystem makeRpcServer(TwoPartyVatNetwork&, PyRestorer&)
RpcSystem makeRpcClient(TwoPartyVatNetwork&)
cdef extern from "capnp/dynamic.h" namespace " ::capnp":
cdef cppclass Request" ::capnp::Request< ::capnp::DynamicStruct, ::capnp::DynamicStruct>":
@@ -237,13 +237,13 @@ cdef extern from "fixMaybe.h":
char * getEnumString(Request val)
cdef extern from "capabilityHelper.h":
PyPromise evalLater(EventLoop &, PyObject * func)
PyPromise there(EventLoop & loop, PyPromise & promise, PyObject * func, PyObject * error_func)
# PyPromise evalLater(EventLoop &, PyObject * func)
# PyPromise there(EventLoop & loop, PyPromise & promise, PyObject * func, PyObject * error_func)
PyPromise then(PyPromise & promise, PyObject * func, PyObject * error_func)
VoidPromise then(RemotePromise & promise, PyObject * func, PyObject * error_func)
cppclass PythonInterfaceDynamicImpl:
PythonInterfaceDynamicImpl(PyObject *)
DynamicCapability.Client new_client(InterfaceSchema&, PyObject *, EventLoop&)
DynamicCapability.Client new_client(InterfaceSchema&, PyObject *)
DynamicValueForward.Reader new_server(InterfaceSchema&, PyObject *)
Capability.Client server_to_client(InterfaceSchema&, PyObject *)
PyPromise convert_to_pypromise(RemotePromise&)
@@ -253,7 +253,7 @@ cdef extern from "rpcHelper.h":
PyRestorer(PyObject *, StructSchema&)
Capability.Client restoreHelper(RpcSystem&, MessageBuilder&)
Capability.Client restoreHelper(RpcSystem&, MessageReader&)
RpcSystem makeRpcClientWithRestorer(TwoPartyVatNetwork&, EventLoop&, PyRestorer&)
RpcSystem makeRpcClientWithRestorer(TwoPartyVatNetwork&, PyRestorer&)
cdef extern from "capnp/dynamic.h" namespace " ::capnp":
cdef cppclass DynamicEnum:
@@ -368,12 +368,12 @@ cdef extern from "kj/async.h" namespace " ::kj":
cdef cppclass EventLoop:
EventLoop()
# Promise[void] yield_end'yield'()
object wait(PyPromise) except +reraise_kj_exception
Response wait_remote'wait'(RemotePromise)
void wait_void'wait'(VoidPromise)
object there(PyPromise) except +reraise_kj_exception
PyPromise evalLater(PyObject * func)
PyPromise there(PyPromise, PyObject * func)
# object wait(PyPromise) except +reraise_kj_exception
# Response wait_remote'wait'(RemotePromise)
# void wait_void'wait'(VoidPromise)
# object there(PyPromise) except +reraise_kj_exception
# PyPromise evalLater(PyObject * func)
# PyPromise there(PyPromise, PyObject * func)
cdef cppclass SimpleEventLoop(EventLoop):
pass
cdef cppclass PromiseFulfiller:
@@ -382,7 +382,6 @@ cdef extern from "kj/async.h" namespace " ::kj":
VoidPromise promise
Own[PromiseFulfiller] fulfiller
PromiseFulfillerPair newPromiseAndFulfiller" ::kj::newPromiseAndFulfiller<void>"()
PromiseFulfillerPair newPromiseAndFulfiller" ::kj::newPromiseAndFulfiller<void>"(EventLoop&)
cdef extern from "kj/async-unix.h" namespace " ::kj":
cdef cppclass UnixEventLoop(EventLoop):

4
capnp/rpcHelper.h
View File

@@ -52,8 +52,8 @@ template <typename SturdyRefHostId, typename ProvisionId,
typename RecipientId, typename ThirdPartyCapId, typename JoinAnswer>
capnp::RpcSystem<SturdyRefHostId> makeRpcClientWithRestorer(
capnp::VatNetwork<SturdyRefHostId, ProvisionId, RecipientId, ThirdPartyCapId, JoinAnswer>& network,
const kj::EventLoop& eventLoop, PyRestorer& restorer) {
PyRestorer& restorer) {
using namespace capnp;
return RpcSystem<SturdyRefHostId>(network,
kj::Maybe<SturdyRefRestorer<ObjectPointer>&>(restorer), eventLoop);
kj::Maybe<SturdyRefRestorer<ObjectPointer>&>(restorer));
}