stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

patch: TCP buffering

Browse source
This commit is contained in:
Alfred E. Heggestad 2012-08-04 20:09:18 +00:00
parent df35dc9610
commit 316c3fc600
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/tcp/tcp.c
View file

@ -178,13 +178,14 @@ static void qent_destructor(void *arg)
} }
static int enqueue(struct tcp_conn *tc, struct mbuf *mb, size_t skip) static int enqueue(struct tcp_conn *tc, struct mbuf *mb)
{ {
const size_t n = mbuf_get_left(mb);
struct tcp_qent *qe; struct tcp_qent *qe;
int err; int err;
if (tc->txqsz >= tc->txqsz_max) if (tc->txqsz + n > tc->txqsz_max)
return ENOMEM; return ENOSPC;
if (!tc->sendq.head && !tc->sendh) { if (!tc->sendq.head && !tc->sendh) {
@ -202,10 +203,8 @@ static int enqueue(struct tcp_conn *tc, struct mbuf *mb, size_t skip)
mbuf_init(&qe->mb); mbuf_init(&qe->mb);
mb->pos += skip; err = mbuf_write_mem(&qe->mb, mbuf_buf(mb), n);
err = mbuf_write_mem(&qe->mb, mbuf_buf(mb), mbuf_get_left(mb));
qe->mb.pos = 0; qe->mb.pos = 0;
mb->pos -= skip;
if (err) if (err)
mem_deref(qe); mem_deref(qe);
@ -1088,17 +1087,17 @@ static int tcp_send_internal(struct tcp_conn *tc, struct mbuf *mb,
} }
if (tc->sendq.head) if (tc->sendq.head)
return enqueue(tc, mb, 0); return enqueue(tc, mb);
n = send(tc->fdc, BUF_CAST mbuf_buf(mb), mb->end - mb->pos, flags); n = send(tc->fdc, BUF_CAST mbuf_buf(mb), mb->end - mb->pos, flags);
if (n < 0) { if (n < 0) {
if (EAGAIN == errno) if (EAGAIN == errno)
return enqueue(tc, mb, 0); return enqueue(tc, mb);
#ifdef WIN32 #ifdef WIN32
if (WSAEWOULDBLOCK == WSAGetLastError()) if (WSAEWOULDBLOCK == WSAGetLastError())
return enqueue(tc, mb, 0); return enqueue(tc, mb);
#endif #endif
err = errno; err = errno;
@ -1112,8 +1111,14 @@ static int tcp_send_internal(struct tcp_conn *tc, struct mbuf *mb,
return err; return err;
} }
if ((size_t)n < mb->end - mb->pos) if ((size_t)n < mb->end - mb->pos) {
return enqueue(tc, mb, n);
mb->pos += n;
err = enqueue(tc, mb);
mb->pos -= n;
return err;
}
return 0; return 0;
} }