sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TCP write buffering: This corrects some of the basic transfer problems. But there are more

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-23 17:31:30 -06:00
parent eccefc6ef1
commit 718d9993e6
2 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/iob/iob_copyin.c
View File

@ -188,7 +188,7 @@ int iob_copyin(FAR struct iob_s *iob, FAR const uint8_t *src,
/* Copy from the user buffer to the I/O buffer. */ /* Copy from the user buffer to the I/O buffer. */
memcpy(dest, src, ncopy); memcpy(dest, src, ncopy);
nllvdbg("iob=%p, Copy %u bytes, new len=%u\n", nllvdbg("iob=%p Copy %u bytes new len=%u\n",
iob, ncopy, iob->io_len); iob, ncopy, iob->io_len);
/* Adjust the total length of the copy and the destination address in /* Adjust the total length of the copy and the destination address in

23
net/net_send_buffered.c
View File

@ -82,7 +82,7 @@
#ifdef CONFIG_NET_TCP_WRBUFFER_DUMP #ifdef CONFIG_NET_TCP_WRBUFFER_DUMP
# define BUF_DUMP(msg,buf,len) lib_dumpbuffer(msg,buf,len) # define BUF_DUMP(msg,buf,len) lib_dumpbuffer(msg,buf,len)
#else #else
# define BUF_DUMP(msg,buf,len,offset) # define BUF_DUMP(msg,buf,len)
# undef WRB_DUMP # undef WRB_DUMP
# define WRB_DUMP(msg,wrb,len,offset) # define WRB_DUMP(msg,wrb,len,offset)
#endif #endif
@ -573,15 +573,9 @@ static uint16_t send_interrupt(FAR struct uip_driver_s *dev, FAR void *pvconn,
nllvdbg("SEND: wrb=%p pktlen=%u sent=%u sndlen=%u\n", nllvdbg("SEND: wrb=%p pktlen=%u sent=%u sndlen=%u\n",
wrb, WRB_PKTLEN(wrb), WRB_SENT(wrb), sndlen); wrb, WRB_PKTLEN(wrb), WRB_SENT(wrb), sndlen);
/* Is this the first we have tried to send from this /* Set the sequence number for this segment. If we are
* write buffer? * retransmitting, then the sequence number will already
*/ * be set for this write buffer.
if (WRB_SENT(wrb) == 0)
{
/* Yes.. Set the sequence number for this segment. If
* we are retransmitting, then the sequence number will
* already be set for this write buffer.
*/ */
if (WRB_SEQNO(wrb) == (unsigned)-1) if (WRB_SEQNO(wrb) == (unsigned)-1)
@ -596,8 +590,7 @@ static uint16_t send_interrupt(FAR struct uip_driver_s *dev, FAR void *pvconn,
* before the packet is sent. * before the packet is sent.
*/ */
uip_tcpsetsequence(conn->sndseq, WRB_SEQNO(wrb)); uip_tcpsetsequence(conn->sndseq, WRB_SEQNO(wrb) + WRB_SENT(wrb));
}
/* Then set-up to send that amount of data with the offset /* Then set-up to send that amount of data with the offset
* corresponding to the amount of data already sent. (this * corresponding to the amount of data already sent. (this
@ -608,8 +601,8 @@ static uint16_t send_interrupt(FAR struct uip_driver_s *dev, FAR void *pvconn,
/* Remember how much data we send out now so that we know /* Remember how much data we send out now so that we know
* when everything has been acknowledged. Just increment * when everything has been acknowledged. Just increment
* the amount of data sent. This will be needed in * the amount of data sent. This will be needed in sequence
* sequence number calculations. * number calculations.
*/ */
conn->unacked += sndlen; conn->unacked += sndlen;
@ -634,7 +627,7 @@ static uint16_t send_interrupt(FAR struct uip_driver_s *dev, FAR void *pvconn,
{ {
FAR struct tcp_wrbuffer_s *tmp; FAR struct tcp_wrbuffer_s *tmp;
nllvdbg("ACK: wrb=%p Move to unacked_q\n", wrb); nllvdbg("SEND: wrb=%p Move to unacked_q\n", wrb);
tmp = (FAR struct tcp_wrbuffer_s *)sq_remfirst(&conn->write_q); tmp = (FAR struct tcp_wrbuffer_s *)sq_remfirst(&conn->write_q);
DEBUGASSERT(tmp == wrb); DEBUGASSERT(tmp == wrb);