lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

net/tcp/sendfile: swapped the location of TCP_DISCONN_EVENTS and TCP_ACKDATA conditions towards tcp_send_unbuffered.c unification

Browse source
This commit is contained in:
Alexander Lunev 2022-01-18 17:14:21 +03:00 committed by Xiang Xiao
parent a9e3a5c233
commit 79e609a8c8
2 changed files with 44 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/tcp/tcp_send_unbuffered.c
View file

@ -209,6 +209,8 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
/* If this packet contains an acknowledgement, then update the count of
* acknowledged bytes.
* This condition is located here for performance reasons
* (TCP_ACKDATA is the most frequent event).
*/
if ((flags & TCP_ACKDATA) != 0)
@ -291,7 +293,10 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
pstate->snd_prev_wnd = conn->snd_wnd;
}
/* Check if we are being asked to retransmit data */
/* Check if we are being asked to retransmit data.
* This condition is located here after TCP_ACKDATA for performance reasons
* (TCP_REXMIT is less frequent than TCP_ACKDATA).
*/
if ((flags & TCP_REXMIT) != 0)
{
@ -332,7 +337,10 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
return flags;
}
/* Check for a loss of connection */
/* Check for a loss of connection.
* This condition is located here after both the TCP_ACKDATA and TCP_REXMIT
* because TCP_DISCONN_EVENTS is the least frequent event.
*/
else if ((flags & TCP_DISCONN_EVENTS) != 0)
{

60
net/tcp/tcp_sendfile.c
View file

@ -199,35 +199,13 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev,
ninfo("flags: %04x acked: %" PRId32 " sent: %zd\n",
flags, pstate->snd_acked, pstate->snd_sent);
/* Check for a loss of connection */
if ((flags & TCP_DISCONN_EVENTS) != 0)
{
nwarn("WARNING: Lost connection\n");
/* We could get here recursively through the callback actions of
* tcp_lost_connection(). So don't repeat that action if we have
* already been disconnected.
*/
if (_SS_ISCONNECTED(psock->s_flags))
{
/* Report not connected */
tcp_lost_connection(psock, pstate->snd_cb, flags);
}
/* Report not connected */
pstate->snd_sent = -ENOTCONN;
goto end_wait;
}
/* If this packet contains an acknowledgement, then update the count of
* acknowledged bytes.
* This condition is located here for performance reasons
* (TCP_ACKDATA is the most frequent event).
*/
else if ((flags & TCP_ACKDATA) != 0)
if ((flags & TCP_ACKDATA) != 0)
{
FAR struct tcp_hdr_s *tcp;
@ -278,7 +256,10 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev,
/* No. Fall through to send more data if necessary */
}
/* Check if we are being asked to retransmit data */
/* Check if we are being asked to retransmit data.
* This condition is located here after TCP_ACKDATA for performance reasons
* (TCP_REXMIT is less frequent than TCP_ACKDATA).
*/
else if ((flags & TCP_REXMIT) != 0)
{
@ -294,6 +275,33 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev,
#endif
}
/* Check for a loss of connection.
* This condition is located here after both the TCP_ACKDATA and TCP_REXMIT
* because TCP_DISCONN_EVENTS is the least frequent event.
*/
else if ((flags & TCP_DISCONN_EVENTS) != 0)
{
nwarn("WARNING: Lost connection\n");
/* We could get here recursively through the callback actions of
* tcp_lost_connection(). So don't repeat that action if we have
* already been disconnected.
*/
if (_SS_ISCONNECTED(psock->s_flags))
{
/* Report not connected */
tcp_lost_connection(psock, pstate->snd_cb, flags);
}
/* Report not connected */
pstate->snd_sent = -ENOTCONN;
goto end_wait;
}
/* We get here if (1) not all of the data has been ACKed, (2) we have been
* asked to retransmit data, (3) the connection is still healthy, and (4)
* the outgoing packet is available for our use. In this case, we are