Type: improvement
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Ibbe438aa6f2fe6d9f55c56ca6d3aec1a29b32cad
u8 peek)
{
vcl_worker_t *wrk = vcl_worker_get_current ();
u8 peek)
{
vcl_worker_t *wrk = vcl_worker_get_current ();
- int n_read = 0, is_nonblocking;
+ int rv, n_read = 0, is_nonblocking;
vcl_session_t *s = 0;
svm_fifo_t *rx_fifo;
svm_msg_q_msg_t msg;
vcl_session_t *s = 0;
svm_fifo_t *rx_fifo;
svm_msg_q_msg_t msg;
- n_read = app_recv_dgram_raw (rx_fifo, buf, n, &s->transport, 0, peek);
+ rv = app_recv_dgram_raw (rx_fifo, buf, n, &s->transport, 0, peek);
- n_read = app_recv_stream_raw (rx_fifo, buf, n, 0, peek);
+ rv = app_recv_stream_raw (rx_fifo, buf, n, 0, peek);
+
+ ASSERT (rv >= 0);
+ n_read += rv;
if (svm_fifo_is_empty_cons (rx_fifo))
{
if (svm_fifo_is_empty_cons (rx_fifo))
{
if (!svm_fifo_is_empty_cons (rx_fifo)
&& svm_fifo_set_event (s->rx_fifo) && is_nonblocking)
{
if (!svm_fifo_is_empty_cons (rx_fifo)
&& svm_fifo_set_event (s->rx_fifo) && is_nonblocking)
{
vec_add2 (wrk->unhandled_evts_vector, e, 1);
e->event_type = SESSION_IO_EVT_RX;
e->session_index = s->session_index;
}
}
vec_add2 (wrk->unhandled_evts_vector, e, 1);
e->event_type = SESSION_IO_EVT_RX;
e->session_index = s->session_index;
}
}
+ else if (PREDICT_FALSE (rv < n))
+ {
+ /* More data enqueued while reading. Try to drain it
+ * or fill the buffer */
+ buf += rv;
+ n -= rv;
+ goto read_again;
+ }
if (PREDICT_FALSE (svm_fifo_needs_deq_ntf (rx_fifo, n_read)))
{
if (PREDICT_FALSE (svm_fifo_needs_deq_ntf (rx_fifo, n_read)))
{