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

Hide members of Server/Client

Browse Source
This commit is contained in:
Jason Paryani
2013-12-12 00:02:32 -08:00
parent 81388f82f6
commit ceacf16be8
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
capnp/lib/capnp.pyx
View File

@@ -1672,26 +1672,26 @@ cdef _Restorer _convert_restorer(restorer):
cdef class TwoPartyClient: cdef class TwoPartyClient:
cdef RpcSystem * thisptr cdef RpcSystem * thisptr
cdef public _TwoPartyVatNetwork network cdef public _TwoPartyVatNetwork _network
cdef public object _stream cdef public object _orig_stream
cdef public _Restorer restorer cdef public _Restorer _restorer
cdef public _FdAsyncIoStream stream cdef public _FdAsyncIoStream _stream
def __init__(self, stream, restorer=None): def __init__(self, stream, restorer=None):
self._stream = stream self._orig_stream = stream
self.stream = _FdAsyncIoStream(stream.fileno()) self._stream = _FdAsyncIoStream(stream.fileno())
self.network = _TwoPartyVatNetwork()._init(deref(self.stream.thisptr), capnp.CLIENT) self._network = _TwoPartyVatNetwork()._init(deref(self._stream.thisptr), capnp.CLIENT)
if restorer is None: if restorer is None:
self.thisptr = new RpcSystem(makeRpcClient(deref(self.network.thisptr))) self.thisptr = new RpcSystem(makeRpcClient(deref(self._network.thisptr)))
self.restorer = None self._restorer = None
else: else:
self.restorer = _convert_restorer(restorer) self._restorer = _convert_restorer(restorer)
self.thisptr = new RpcSystem(makeRpcClientWithRestorer(deref(self.network.thisptr), deref(self.restorer.thisptr))) self.thisptr = new RpcSystem(makeRpcClientWithRestorer(deref(self._network.thisptr), deref(self._restorer.thisptr)))
Py_INCREF(self.restorer) Py_INCREF(self._restorer)
Py_INCREF(self._orig_stream)
Py_INCREF(self._stream) Py_INCREF(self._stream)
Py_INCREF(self.stream) Py_INCREF(self._network) # TODO:MEMORY: attach this to onDrained, also figure out what's leaking
Py_INCREF(self.network) # TODO:MEMORY: attach this to onDrained, also figure out what's leaking
def __dealloc__(self): def __dealloc__(self):
del self.thisptr del self.thisptr
@@ -1736,28 +1736,28 @@ cdef class TwoPartyClient:
cdef class TwoPartyServer: cdef class TwoPartyServer:
cdef RpcSystem * thisptr cdef RpcSystem * thisptr
cdef public _TwoPartyVatNetwork network cdef public _TwoPartyVatNetwork _network
cdef public object _stream cdef public object _orig_stream
cdef public _Restorer restorer cdef public _Restorer _restorer
cdef public _FdAsyncIoStream stream cdef public _FdAsyncIoStream _stream
def __init__(self, stream, restorer): def __init__(self, stream, restorer):
self._stream = stream self._orig_stream = stream
self.stream = _FdAsyncIoStream(stream.fileno()) self._stream = _FdAsyncIoStream(stream.fileno())
self.restorer = _convert_restorer(restorer) self._restorer = _convert_restorer(restorer)
self.network = _TwoPartyVatNetwork()._init(deref(self.stream.thisptr), capnp.SERVER) self._network = _TwoPartyVatNetwork()._init(deref(self._stream.thisptr), capnp.SERVER)
self.thisptr = new RpcSystem(makeRpcServer(deref(self.network.thisptr), deref(self.restorer.thisptr))) self.thisptr = new RpcSystem(makeRpcServer(deref(self._network.thisptr), deref(self._restorer.thisptr)))
Py_INCREF(self._orig_stream)
Py_INCREF(self._stream) Py_INCREF(self._stream)
Py_INCREF(self.stream) Py_INCREF(self._restorer)
Py_INCREF(self.restorer) Py_INCREF(self._network) # TODO:MEMORY: attach this to onDrained, also figure out what's leaking
Py_INCREF(self.network) # TODO:MEMORY: attach this to onDrained, also figure out what's leaking
def __dealloc__(self): def __dealloc__(self):
del self.thisptr del self.thisptr
def run_forever(self): def run_forever(self):
_VoidPromise()._init(deref(self.network.thisptr).onDisconnect()).wait() _VoidPromise()._init(deref(self._network.thisptr).onDisconnect()).wait()
# TODO: add restore functionality here? # TODO: add restore functionality here?