walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

python: add read_ctrl to read_cb args to indicate EOF explicitly

This commit is contained in:
Tatsuhiro Tsujikawa 2012-08-22 21:48:41 +09:00
parent c59c591ee0
commit 306429e23b
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
python/spdylay.pyx
View File

@ -417,15 +417,26 @@ cdef void on_request_recv_callback(cspdylay.spdylay_session *session,
except BaseException as e: except BaseException as e:
pysession.base_error = e pysession.base_error = e
cdef class ReadCtrl:
cdef int flags
def __cinit__(self):
self.flags = 0
property flags:
def __set__(self, value):
self.flags = value
cdef ssize_t read_callback(cspdylay.spdylay_session *session, cdef ssize_t read_callback(cspdylay.spdylay_session *session,
int32_t stream_id, uint8_t *buf, size_t length, int32_t stream_id, uint8_t *buf, size_t length,
int *eof, cspdylay.spdylay_data_source *source, int *eof, cspdylay.spdylay_data_source *source,
void *user_data): void *user_data):
cdef Session pysession = <Session>user_data cdef Session pysession = <Session>user_data
cdef ReadCtrl read_ctrl = ReadCtrl()
data_prd = <object>source.ptr data_prd = <object>source.ptr
try: try:
res = data_prd.read_cb(pysession, stream_id, length, res = data_prd.read_cb(pysession, stream_id, length, read_ctrl,
data_prd.source) data_prd.source)
except TemporalCallbackFailureError as e: except TemporalCallbackFailureError as e:
return cspdylay.SPDYLAY_ERR_TEMPORAL_CALLBACK_FAILURE return cspdylay.SPDYLAY_ERR_TEMPORAL_CALLBACK_FAILURE
@ -439,6 +450,8 @@ cdef ssize_t read_callback(cspdylay.spdylay_session *session,
pysession.base_error = e pysession.base_error = e
return cspdylay.SPDYLAY_ERR_CALLBACK_FAILURE return cspdylay.SPDYLAY_ERR_CALLBACK_FAILURE
if read_ctrl.flags & READ_EOF:
eof[0] = 1
if res == cspdylay.SPDYLAY_ERR_DEFERRED: if res == cspdylay.SPDYLAY_ERR_DEFERRED:
return res return res
elif res: elif res:
@ -447,7 +460,6 @@ cdef ssize_t read_callback(cspdylay.spdylay_session *session,
memcpy(buf, <char*>res, len(res)) memcpy(buf, <char*>res, len(res))
return len(res) return len(res)
else: else:
eof[0] = 1
return 0 return 0
cdef class Session: cdef class Session:
@ -816,6 +828,9 @@ ERR_OK = 0 # Not defined in <spdylay/spdylay.h>
ERR_EOF = cspdylay.SPDYLAY_ERR_EOF ERR_EOF = cspdylay.SPDYLAY_ERR_EOF
ERR_DEFERRED = cspdylay.SPDYLAY_ERR_DEFERRED ERR_DEFERRED = cspdylay.SPDYLAY_ERR_DEFERRED
# Read Callback Flags
READ_EOF = 1
# The status code for RST_STREAM # The status code for RST_STREAM
OK = cspdylay.SPDYLAY_OK OK = cspdylay.SPDYLAY_OK
PROTOCOL_ERROR = cspdylay.SPDYLAY_PROTOCOL_ERROR PROTOCOL_ERROR = cspdylay.SPDYLAY_PROTOCOL_ERROR

9
python/spdylay_tests.py
View File

@ -44,8 +44,11 @@ def send_cb(session, data):
iob.outputs.add_buffer(io.BytesIO(data)) iob.outputs.add_buffer(io.BytesIO(data))
return len(data) return len(data)
def read_cb(session, stream_id, length, source): def read_cb(session, stream_id, length, read_ctrl, source):
return source.read(length) data = source.read(length)
if not data:
read_ctrl.flags = spdylay.READ_EOF
return data
def on_data_chunk_recv_cb(session, flags, stream_id, data): def on_data_chunk_recv_cb(session, flags, stream_id, data):
session.user_data.recv_data.write(data) session.user_data.recv_data.write(data)
@ -191,7 +194,7 @@ class SpdylayTests(unittest.TestCase):
self.assertFalse(self.client_session.want_write()) self.assertFalse(self.client_session.want_write())
def test_deferred_data(self): def test_deferred_data(self):
def deferred_read_cb(session, stream_id, length, source): def deferred_read_cb(session, stream_id, length, read_ctrl, source):
return spdylay.ERR_DEFERRED return spdylay.ERR_DEFERRED
data_prd = spdylay.DataProvider(io.BytesIO(b'Hello World'), data_prd = spdylay.DataProvider(io.BytesIO(b'Hello World'),

7
python/spdyserv.py
View File

@ -22,8 +22,11 @@ def send_cb(session, data):
ssctrl.sock.sendall(data) ssctrl.sock.sendall(data)
return len(data) return len(data)
def read_cb(session, stream_id, length, source): def read_cb(session, stream_id, length, read_ctrl, source):
return source.read(length) data = source.read(length)
if not data:
read_ctrl.flags = spdylay.READ_EOF
return data
def on_ctrl_recv_cb(session, frame): def on_ctrl_recv_cb(session, frame):
ssctrl = session.user_data ssctrl = session.user_data