mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-05 22:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

lwip_sendmsg: small performance improvement: netbuf can be allocated on the stack as it is used internally only (see lwip_sendto)

Browse Source
This commit is contained in:
goldsimon 2017-03-07 21:43:23 +01:00
parent 270fdfff07
commit c9d0192b4a
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/api/sockets.c
View File

@ -1163,7 +1163,7 @@ lwip_sendmsg(int s, const struct msghdr *msg, int flags)
/* else, UDP and RAW NETCONNs */ /* else, UDP and RAW NETCONNs */
#if LWIP_UDP || LWIP_RAW #if LWIP_UDP || LWIP_RAW
{ {
struct netbuf *chain_buf; struct netbuf chain_buf;
LWIP_UNUSED_ARG(flags); LWIP_UNUSED_ARG(flags);
LWIP_ERROR("lwip_sendmsg: invalid msghdr name", (((msg->msg_name == NULL) && (msg->msg_namelen == 0)) || LWIP_ERROR("lwip_sendmsg: invalid msghdr name", (((msg->msg_name == NULL) && (msg->msg_namelen == 0)) ||
@ -1171,36 +1171,31 @@ lwip_sendmsg(int s, const struct msghdr *msg, int flags)
sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;); sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
/* initialize chain buffer with destination */ /* initialize chain buffer with destination */
chain_buf = netbuf_new(); memset(&chain_buf, 0, sizeof(struct netbuf));
if (!chain_buf) {
sock_set_errno(sock, err_to_errno(ERR_MEM));
done_socket(sock);
return -1;
}
if (msg->msg_name) { if (msg->msg_name) {
u16_t remote_port; u16_t remote_port;
SOCKADDR_TO_IPADDR_PORT((const struct sockaddr *)msg->msg_name, &chain_buf->addr, remote_port); SOCKADDR_TO_IPADDR_PORT((const struct sockaddr *)msg->msg_name, &chain_buf.addr, remote_port);
netbuf_fromport(chain_buf) = remote_port; netbuf_fromport(&chain_buf) = remote_port;
} }
#if LWIP_NETIF_TX_SINGLE_PBUF #if LWIP_NETIF_TX_SINGLE_PBUF
for (i = 0; i < msg->msg_iovlen; i++) { for (i = 0; i < msg->msg_iovlen; i++) {
size += msg->msg_iov[i].iov_len; size += msg->msg_iov[i].iov_len;
} }
/* Allocate a new netbuf and copy the data into it. */ /* Allocate a new netbuf and copy the data into it. */
if (netbuf_alloc(chain_buf, (u16_t)size) == NULL) { if (netbuf_alloc(&chain_buf, (u16_t)size) == NULL) {
err = ERR_MEM; err = ERR_MEM;
} else { } else {
/* flatten the IO vectors */ /* flatten the IO vectors */
size_t offset = 0; size_t offset = 0;
for (i = 0; i < msg->msg_iovlen; i++) { for (i = 0; i < msg->msg_iovlen; i++) {
MEMCPY(&((u8_t*)chain_buf->p->payload)[offset], msg->msg_iov[i].iov_base, msg->msg_iov[i].iov_len); MEMCPY(&((u8_t*)chain_buf.p->payload)[offset], msg->msg_iov[i].iov_base, msg->msg_iov[i].iov_len);
offset += msg->msg_iov[i].iov_len; offset += msg->msg_iov[i].iov_len;
} }
#if LWIP_CHECKSUM_ON_COPY #if LWIP_CHECKSUM_ON_COPY
{ {
/* This can be improved by using LWIP_CHKSUM_COPY() and aggregating the checksum for each IO vector */ /* This can be improved by using LWIP_CHKSUM_COPY() and aggregating the checksum for each IO vector */
u16_t chksum = ~inet_chksum_pbuf(chain_buf->p); u16_t chksum = ~inet_chksum_pbuf(chain_buf.p);
netbuf_set_chksum(chain_buf, chksum); netbuf_set_chksum(&chain_buf, chksum);
} }
#endif /* LWIP_CHECKSUM_ON_COPY */ #endif /* LWIP_CHECKSUM_ON_COPY */
err = ERR_OK; err = ERR_OK;
@ -1218,34 +1213,34 @@ lwip_sendmsg(int s, const struct msghdr *msg, int flags)
LWIP_ASSERT("iov_len < u16_t", msg->msg_iov[i].iov_len <= 0xFFFF); LWIP_ASSERT("iov_len < u16_t", msg->msg_iov[i].iov_len <= 0xFFFF);
p->len = p->tot_len = (u16_t)msg->msg_iov[i].iov_len; p->len = p->tot_len = (u16_t)msg->msg_iov[i].iov_len;
/* netbuf empty, add new pbuf */ /* netbuf empty, add new pbuf */
if (chain_buf->p == NULL) { if (chain_buf.p == NULL) {
chain_buf->p = chain_buf->ptr = p; chain_buf.p = chain_buf.ptr = p;
/* add pbuf to existing pbuf chain */ /* add pbuf to existing pbuf chain */
} else { } else {
pbuf_cat(chain_buf->p, p); pbuf_cat(chain_buf.p, p);
} }
} }
/* save size of total chain */ /* save size of total chain */
if (err == ERR_OK) { if (err == ERR_OK) {
size = netbuf_len(chain_buf); size = netbuf_len(&chain_buf);
} }
#endif /* LWIP_NETIF_TX_SINGLE_PBUF */ #endif /* LWIP_NETIF_TX_SINGLE_PBUF */
if (err == ERR_OK) { if (err == ERR_OK) {
#if LWIP_IPV4 && LWIP_IPV6 #if LWIP_IPV4 && LWIP_IPV6
/* Dual-stack: Unmap IPv4 mapped IPv6 addresses */ /* Dual-stack: Unmap IPv4 mapped IPv6 addresses */
if (IP_IS_V6_VAL(chain_buf->addr) && ip6_addr_isipv4mappedipv6(ip_2_ip6(&chain_buf->addr))) { if (IP_IS_V6_VAL(chain_buf-addr) && ip6_addr_isipv4mappedipv6(ip_2_ip6(&chain_buf.addr))) {
unmap_ipv4_mapped_ipv6(ip_2_ip4(&chain_buf->addr), ip_2_ip6(&chain_buf->addr)); unmap_ipv4_mapped_ipv6(ip_2_ip4(&chain_buf.addr), ip_2_ip6(&chain_buf.addr));
IP_SET_TYPE_VAL(chain_buf->addr, IPADDR_TYPE_V4); IP_SET_TYPE_VAL(chain_buf.addr, IPADDR_TYPE_V4);
} }
#endif /* LWIP_IPV4 && LWIP_IPV6 */ #endif /* LWIP_IPV4 && LWIP_IPV6 */
/* send the data */ /* send the data */
err = netconn_send(sock->conn, chain_buf); err = netconn_send(sock->conn, &chain_buf);
} }
/* deallocated the buffer */ /* deallocated the buffer */
netbuf_delete(chain_buf); netbuf_free(&chain_buf);
sock_set_errno(sock, err_to_errno(err)); sock_set_errno(sock, err_to_errno(err));
done_socket(sock); done_socket(sock);