gerrit.automotivelinux Code Review - AGL/meta-agl-devel.git/blob

   1 From 1b739247dcab62d1da45109cf805b8a840307ccc Mon Sep 17 00:00:00 2001
   2 From: Wim Taymans <wtaymans@redhat.com>
   3 Date: Tue, 1 Oct 2019 10:43:48 +0200
   4 Subject: [PATCH] connection: move remaining data and fds
   5
   6 If we can't send all of the data, move the remaining data to the
   7 start of the buffer so that we can send it again later.
   8
   9 See #111
  10
  11 Upstream-Status: Backport [3d48ba8394396fc8d8cadb1bff3514217ddd70e6]
  12 ---
  13  .../module-protocol-native/connection.c       | 23 +++++++++++--------
  14  1 file changed, 14 insertions(+), 9 deletions(-)
  15
  16 diff --git a/src/modules/module-protocol-native/connection.c b/src/modules/module-protocol-native/connection.c
  17 index f51129df..7b6cf112 100644
  18 --- a/src/modules/module-protocol-native/connection.c
  19 +++ b/src/modules/module-protocol-native/connection.c
  20 @@ -500,8 +500,12 @@ int pw_protocol_native_connection_flush(struct pw_protocol_native_connection *co
  21                         if (sent < 0) {
  22                                 if (errno == EINTR)
  23                                         continue;
  24 -                               else
  25 -                                       goto send_error;
  26 +                               else {
  27 +                                       res = -errno;
  28 +                                       pw_log_error("could not sendmsg on fd:%d n_fds:%d: %s",
  29 +                                                       conn->fd, n_fds, spa_strerror(res));
  30 +                                       goto exit;
  31 +                               }
  32                         }
  33                         break;
  34                 }
  35 @@ -513,15 +517,16 @@ int pw_protocol_native_connection_flush(struct pw_protocol_native_connection *co
  36                 n_fds -= outfds;
  37                 fds += outfds;
  38         }
  39 -       buf->buffer_size = size;
  40 -       buf->n_fds = n_fds;
  41
  42 -       return 0;
  43 +       res = 0;
  44
  45 -       /* ERRORS */
  46 -send_error:
  47 -       res = -errno;
  48 -       pw_log_error("could not sendmsg on fd:%d n_fds:%d: %s", conn->fd, n_fds, strerror(errno));
  49 +exit:
  50 +       if (size > 0)
  51 +               memmove(buf->buffer_data, data, size);
  52 +       buf->buffer_size = size;
  53 +       if (n_fds > 0)
  54 +               memmove(buf->fds, fds, n_fds * sizeof(int));
  55 +       buf->n_fds = n_fds;
  56         return res;
  57  }
  58
  59 --
  60 2.23.0
  61