2019-05-21 20:06:11

by Steve Brown

Subject: [PATCH v2] meshctl: Retry recvmsg if data is not ready

Commit d6eec1b67d6d ("meshctl: Switch from write to sendmsg for Acquire*")
causes a regression by returning an error if recvmsg has no data available.
Fix it by retrying until data is received.
---
Changes in v2:
* Reword commit message
tools/mesh/gatt.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/mesh/gatt.c b/tools/mesh/gatt.c
index 2269a20cf..0a942d4eb 100644
--- a/tools/mesh/gatt.c
+++ b/tools/mesh/gatt.c
@@ -415,8 +415,11 @@ static bool sock_read(struct io *io, bool prov, void *user_data)
msg.msg_iovlen = 1;

while ((len = recvmsg(fd, &msg, MSG_DONTWAIT))) {
- if (len <= 0)
+ if (len <= 0) {
+ if (errno == EAGAIN)
+ break;
return false;
+ }

res = buf;
len_sar = mesh_gatt_sar(&res, len);
--
2.20.1

2019-05-24 08:50:55

by Luiz Augusto von Dentz

Subject: Re: [PATCH v2] meshctl: Retry recvmsg if data is not ready

Hi Steve,

On Tue, May 21, 2019 at 11:29 PM Steve Brown <[email protected]> wrote:
>
> Commit d6eec1b67d6d ("meshctl: Switch from write to sendmsg for Acquire*")
> causes a regression by returning an error if recvmsg has no data available.
> Fix it by retrying until data is received.
> ---
> Changes in v2:
> * Reword commit message
> tools/mesh/gatt.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/mesh/gatt.c b/tools/mesh/gatt.c
> index 2269a20cf..0a942d4eb 100644
> --- a/tools/mesh/gatt.c
> +++ b/tools/mesh/gatt.c
> @@ -415,8 +415,11 @@ static bool sock_read(struct io *io, bool prov, void *user_data)
> msg.msg_iovlen = 1;
>
> while ((len = recvmsg(fd, &msg, MSG_DONTWAIT))) {
> - if (len <= 0)
> + if (len <= 0) {
> + if (errno == EAGAIN)
> + break;
> return false;
> + }
>
> res = buf;
> len_sar = mesh_gatt_sar(&res, len);
> --
> 2.20.1

Applied, thanks.


--
Luiz Augusto von Dentz