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

Fix up cancel and timer a bit

Browse Source
This commit is contained in:
Jason Paryani
2014-04-13 18:15:36 -07:00
parent f58f5d4846
commit c2b9d14268
3 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
capnp/helpers/helpers.pxd
View File

@@ -38,4 +38,4 @@ cdef extern from "../helpers/serialize.h":
cdef extern from "../helpers/asyncHelper.h":
void waitNeverDone(WaitScope&)
Timer * getTimer(AsyncIoContext *)
Timer * getTimer(AsyncIoContext *) except +reraise_kj_exception

29
capnp/lib/capnp.pyx
View File

@@ -1357,7 +1357,7 @@ cdef class Timer:
self.thisptr = timer
return self
cpdef after_delay(self, time):
cpdef after_delay(self, time) except +reraise_kj_exception:
return _VoidPromise()._init(self.thisptr.afterDelay(capnp.Duration(time)))
def getTimer():
@@ -1434,7 +1434,7 @@ cdef class Promise:
else:
self.is_consumed = False
self._obj = obj
Py_INCREF(obj)
Py_INCREF(obj) # TODO: MEM: fix leak
self.thisptr = new PyPromise(<PyObject *>obj)
self._event_loop = C_DEFAULT_EVENT_LOOP_GETTER()
@@ -1476,6 +1476,15 @@ cdef class Promise:
return ret
cpdef cancel(self) except +reraise_kj_exception:
if self.is_consumed:
raise ValueError('Promise was already used in a consuming operation. You can no longer use this Promise object')
self.is_consumed = True
del self.thisptr
self.thisptr = NULL
cdef class _VoidPromise:
cdef VoidPromise * thisptr
cdef public bint is_consumed
@@ -1522,6 +1531,14 @@ cdef class _VoidPromise:
return ret
cpdef cancel(self) except +reraise_kj_exception:
if self.is_consumed:
raise ValueError('Promise was already used in a consuming operation. You can no longer use this Promise object')
self.is_consumed = True
del self.thisptr
self.thisptr = NULL
cdef class _RemotePromise:
cdef RemotePromise * thisptr
cdef public bint is_consumed
@@ -1589,6 +1606,14 @@ cdef class _RemotePromise:
def to_dict(self, verbose=False):
return _to_dict(self, verbose)
cpdef cancel(self) except +reraise_kj_exception:
if self.is_consumed:
raise ValueError('Promise was already used in a consuming operation. You can no longer use this Promise object')
self.is_consumed = True
del self.thisptr
self.thisptr = NULL
# def attach(self, *args):
# if self.is_consumed:
# raise ValueError('Promise was already used in a consuming operation. You can no longer use this Promise object')