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

usrsock: Don't clear recv and send available flag

Browse Source 
Don't clear available flag if the response indicate there is more data

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
This commit is contained in:
zhanghongyu 2022-03-29 17:12:46 +08:00 committed by Xiang Xiao
parent ab5e7496d5
commit b80ef1df87
1 changed files with 62 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
View File

@ -55,10 +55,14 @@ struct usrsock_rpmsg_s
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
static bool usrsock_rpmsg_available(struct socket *psock, int cmd);
static int usrsock_rpmsg_send_ack(struct rpmsg_endpoint *ept, static int usrsock_rpmsg_send_ack(struct rpmsg_endpoint *ept,
uint16_t events,
uint64_t xid, int32_t result); uint64_t xid, int32_t result);
static int usrsock_rpmsg_send_data_ack(struct rpmsg_endpoint *ept, static int usrsock_rpmsg_send_data_ack(struct rpmsg_endpoint *ept,
struct usrsock_message_datareq_ack_s *ack, struct usrsock_message_datareq_ack_s *ack,
uint16_t events,
uint64_t xid, int32_t result, uint64_t xid, int32_t result,
uint16_t valuelen, uint16_t valuelen,
uint16_t valuelen_nontrunc); uint16_t valuelen_nontrunc);
@ -146,14 +150,30 @@ static const rpmsg_ept_cb g_usrsock_rpmsg_handler[] =
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
static bool usrsock_rpmsg_available(struct socket *psock, int cmd)
{
int len;
if (psock_ioctl(psock, cmd, &len, sizeof(len)) == 0)
{
if (len > 0)
{
return true;
}
}
return false;
}
static int usrsock_rpmsg_send_ack(struct rpmsg_endpoint *ept, static int usrsock_rpmsg_send_ack(struct rpmsg_endpoint *ept,
uint16_t events,
uint64_t xid, int32_t result) uint64_t xid, int32_t result)
{ {
struct usrsock_message_req_ack_s ack; struct usrsock_message_req_ack_s ack;
ack.head.msgid = USRSOCK_MESSAGE_RESPONSE_ACK; ack.head.msgid = USRSOCK_MESSAGE_RESPONSE_ACK;
ack.head.flags = (result == -EINPROGRESS); ack.head.flags = (result == -EINPROGRESS);
ack.head.events = 0; ack.head.events = events;
ack.xid = xid; ack.xid = xid;
ack.result = result; ack.result = result;
@ -163,13 +183,14 @@ static int usrsock_rpmsg_send_ack(struct rpmsg_endpoint *ept,
static int usrsock_rpmsg_send_data_ack(struct rpmsg_endpoint *ept, static int usrsock_rpmsg_send_data_ack(struct rpmsg_endpoint *ept,
struct usrsock_message_datareq_ack_s *ack, struct usrsock_message_datareq_ack_s *ack,
uint16_t events,
uint64_t xid, int32_t result, uint64_t xid, int32_t result,
uint16_t valuelen, uint16_t valuelen,
uint16_t valuelen_nontrunc) uint16_t valuelen_nontrunc)
{ {
ack->reqack.head.msgid = USRSOCK_MESSAGE_RESPONSE_DATA_ACK; ack->reqack.head.msgid = USRSOCK_MESSAGE_RESPONSE_DATA_ACK;
ack->reqack.head.flags = 0; ack->reqack.head.flags = 0;
ack->reqack.head.events = 0; ack->reqack.head.events = events;
ack->reqack.xid = xid; ack->reqack.xid = xid;
ack->reqack.result = result; ack->reqack.result = result;
@ -235,7 +256,7 @@ static int usrsock_rpmsg_socket_handler(struct rpmsg_endpoint *ept,
pthread_mutex_unlock(&priv->mutex); pthread_mutex_unlock(&priv->mutex);
} }
retr = usrsock_rpmsg_send_ack(ept, req->head.xid, ret); retr = usrsock_rpmsg_send_ack(ept, 0, req->head.xid, ret);
if (retr >= 0 && ret >= 0 && if (retr >= 0 && ret >= 0 &&
req->type != SOCK_STREAM && req->type != SOCK_SEQPACKET) req->type != SOCK_STREAM && req->type != SOCK_SEQPACKET)
{ {
@ -276,7 +297,7 @@ static int usrsock_rpmsg_close_handler(struct rpmsg_endpoint *ept,
ret = psock_close(&priv->socks[req->usockid]); ret = psock_close(&priv->socks[req->usockid]);
} }
return usrsock_rpmsg_send_ack(ept, req->head.xid, ret); return usrsock_rpmsg_send_ack(ept, 0, req->head.xid, ret);
} }
static int usrsock_rpmsg_connect_handler(struct rpmsg_endpoint *ept, static int usrsock_rpmsg_connect_handler(struct rpmsg_endpoint *ept,
@ -301,7 +322,7 @@ static int usrsock_rpmsg_connect_handler(struct rpmsg_endpoint *ept,
} }
} }
retr = usrsock_rpmsg_send_ack(ept, req->head.xid, ret); retr = usrsock_rpmsg_send_ack(ept, 0, req->head.xid, ret);
if (retr >= 0 && ret >= 0 && priv->pfds[req->usockid].ptr == NULL) if (retr >= 0 && ret >= 0 && priv->pfds[req->usockid].ptr == NULL)
{ {
pthread_mutex_lock(&priv->mutex); pthread_mutex_lock(&priv->mutex);
@ -330,6 +351,7 @@ static int usrsock_rpmsg_sendto_handler(struct rpmsg_endpoint *ept,
{ {
struct usrsock_request_sendto_s *req; struct usrsock_request_sendto_s *req;
struct usrsock_rpmsg_s *priv = priv_; struct usrsock_rpmsg_s *priv = priv_;
uint16_t events = 0;
ssize_t ret = -EBADF; ssize_t ret = -EBADF;
size_t total; size_t total;
int retr; int retr;
@ -423,15 +445,14 @@ static int usrsock_rpmsg_sendto_handler(struct rpmsg_endpoint *ept,
out: out:
retr = usrsock_rpmsg_send_ack(ept, req->head.xid, ret); if (ret > 0 &&
if (retr >= 0 && ret >= 0) usrsock_rpmsg_available(&priv->socks[req->usockid], FIONSPACE))
{ {
/* Assume the new buffer can be accepted until return -EAGAIN */ events |= USRSOCK_EVENT_SENDTO_READY;
retr = usrsock_rpmsg_send_event(ept,
req->usockid, USRSOCK_EVENT_SENDTO_READY);
} }
else if (ret == -EAGAIN)
retr = usrsock_rpmsg_send_ack(ept, events, req->head.xid, ret);
if (retr >= 0 && events == 0)
{ {
pthread_mutex_lock(&priv->mutex); pthread_mutex_lock(&priv->mutex);
priv->pfds[req->usockid].events |= POLLOUT; priv->pfds[req->usockid].events |= POLLOUT;
@ -468,6 +489,7 @@ static int usrsock_rpmsg_recvfrom_handler(struct rpmsg_endpoint *ept,
socklen_t inaddrlen = req->max_addrlen; socklen_t inaddrlen = req->max_addrlen;
size_t buflen = req->max_buflen; size_t buflen = req->max_buflen;
ssize_t ret = -EBADF; ssize_t ret = -EBADF;
uint16_t events = 0;
uint32_t len; uint32_t len;
int retr; int retr;
@ -484,16 +506,24 @@ static int usrsock_rpmsg_recvfrom_handler(struct rpmsg_endpoint *ept,
(void *)(ack + 1) + inaddrlen, buflen, req->flags, (void *)(ack + 1) + inaddrlen, buflen, req->flags,
outaddrlen ? (struct sockaddr *)(ack + 1) : NULL, outaddrlen ? (struct sockaddr *)(ack + 1) : NULL,
outaddrlen ? &outaddrlen : NULL); outaddrlen ? &outaddrlen : NULL);
if (ret > 0 && outaddrlen < inaddrlen) if (ret > 0)
{ {
memcpy((void *)(ack + 1) + outaddrlen, if (outaddrlen < inaddrlen)
(void *)(ack + 1) + inaddrlen, ret); {
memcpy((void *)(ack + 1) + outaddrlen,
(void *)(ack + 1) + inaddrlen, ret);
}
if (usrsock_rpmsg_available(&priv->socks[req->usockid], FIONREAD))
{
events |= USRSOCK_EVENT_RECVFROM_AVAIL;
}
} }
} }
retr = usrsock_rpmsg_send_data_ack(ept, retr = usrsock_rpmsg_send_data_ack(ept,
ack, req->head.xid, ret, inaddrlen, outaddrlen); ack, events, req->head.xid, ret, inaddrlen, outaddrlen);
if (retr >= 0 && (ret >= 0 || ret == -EAGAIN)) if (retr >= 0 && events == 0)
{ {
pthread_mutex_lock(&priv->mutex); pthread_mutex_lock(&priv->mutex);
priv->pfds[req->usockid].events |= POLLIN; priv->pfds[req->usockid].events |= POLLIN;
@ -519,7 +549,7 @@ static int usrsock_rpmsg_setsockopt_handler(struct rpmsg_endpoint *ept,
req->level, req->option, req + 1, req->valuelen); req->level, req->option, req + 1, req->valuelen);
} }
return usrsock_rpmsg_send_ack(ept, req->head.xid, ret); return usrsock_rpmsg_send_ack(ept, 0, req->head.xid, ret);
} }
static int usrsock_rpmsg_getsockopt_handler(struct rpmsg_endpoint *ept, static int usrsock_rpmsg_getsockopt_handler(struct rpmsg_endpoint *ept,
@ -542,7 +572,7 @@ static int usrsock_rpmsg_getsockopt_handler(struct rpmsg_endpoint *ept,
} }
return usrsock_rpmsg_send_data_ack(ept, return usrsock_rpmsg_send_data_ack(ept,
ack, req->head.xid, ret, optlen, optlen); ack, 0, req->head.xid, ret, optlen, optlen);
} }
static int usrsock_rpmsg_getsockname_handler(struct rpmsg_endpoint *ept, static int usrsock_rpmsg_getsockname_handler(struct rpmsg_endpoint *ept,
@ -566,7 +596,7 @@ static int usrsock_rpmsg_getsockname_handler(struct rpmsg_endpoint *ept,
} }
return usrsock_rpmsg_send_data_ack(ept, return usrsock_rpmsg_send_data_ack(ept,
ack, req->head.xid, ret, inaddrlen, outaddrlen); ack, 0, req->head.xid, ret, inaddrlen, outaddrlen);
} }
static int usrsock_rpmsg_getpeername_handler(struct rpmsg_endpoint *ept, static int usrsock_rpmsg_getpeername_handler(struct rpmsg_endpoint *ept,
@ -590,7 +620,7 @@ static int usrsock_rpmsg_getpeername_handler(struct rpmsg_endpoint *ept,
} }
return usrsock_rpmsg_send_data_ack(ept, return usrsock_rpmsg_send_data_ack(ept,
ack, req->head.xid, ret, inaddrlen, outaddrlen); ack, 0, req->head.xid, ret, inaddrlen, outaddrlen);
} }
static int usrsock_rpmsg_bind_handler(struct rpmsg_endpoint *ept, static int usrsock_rpmsg_bind_handler(struct rpmsg_endpoint *ept,
@ -608,7 +638,7 @@ static int usrsock_rpmsg_bind_handler(struct rpmsg_endpoint *ept,
(const struct sockaddr *)(req + 1), req->addrlen); (const struct sockaddr *)(req + 1), req->addrlen);
} }
return usrsock_rpmsg_send_ack(ept, req->head.xid, ret); return usrsock_rpmsg_send_ack(ept, 0, req->head.xid, ret);
} }
static int usrsock_rpmsg_listen_handler(struct rpmsg_endpoint *ept, static int usrsock_rpmsg_listen_handler(struct rpmsg_endpoint *ept,
@ -626,7 +656,7 @@ static int usrsock_rpmsg_listen_handler(struct rpmsg_endpoint *ept,
ret = psock_listen(&priv->socks[req->usockid], req->backlog); ret = psock_listen(&priv->socks[req->usockid], req->backlog);
} }
retr = usrsock_rpmsg_send_ack(ept, req->head.xid, ret); retr = usrsock_rpmsg_send_ack(ept, 0, req->head.xid, ret);
if (retr >= 0 && ret >= 0) if (retr >= 0 && ret >= 0)
{ {
pthread_mutex_lock(&priv->mutex); pthread_mutex_lock(&priv->mutex);
@ -696,7 +726,7 @@ static int usrsock_rpmsg_accept_handler(struct rpmsg_endpoint *ept,
} }
retr = usrsock_rpmsg_send_data_ack(ept, retr = usrsock_rpmsg_send_data_ack(ept,
ack, req->head.xid, ret, inaddrlen, outaddrlen); ack, 0, req->head.xid, ret, inaddrlen, outaddrlen);
if (retr >= 0 && ret >= 0) if (retr >= 0 && ret >= 0)
{ {
pthread_mutex_lock(&priv->mutex); pthread_mutex_lock(&priv->mutex);
@ -756,7 +786,7 @@ static int usrsock_rpmsg_ioctl_handler(struct rpmsg_endpoint *ept,
} }
return usrsock_rpmsg_send_data_ack(ept, return usrsock_rpmsg_send_data_ack(ept,
ack, req->head.xid, ret, req->arglen, req->arglen); ack, 0, req->head.xid, ret, req->arglen, req->arglen);
} }
static int usrsock_rpmsg_dns_handler(struct rpmsg_endpoint *ept, void *data, static int usrsock_rpmsg_dns_handler(struct rpmsg_endpoint *ept, void *data,
@ -976,6 +1006,13 @@ static bool usrsock_rpmsg_process_poll(struct usrsock_rpmsg_s *priv,
{ {
events |= USRSOCK_EVENT_REMOTE_CLOSED; events |= USRSOCK_EVENT_REMOTE_CLOSED;
/* Check data that has not been recv */
if (usrsock_rpmsg_available(&priv->socks[j], FIONREAD))
{
events |= USRSOCK_EVENT_RECVFROM_AVAIL;
}
/* Stop poll at all */ /* Stop poll at all */
pfds[i].ptr = NULL; pfds[i].ptr = NULL;