sessiond: client: use common payload send fds util
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Fri, 24 Jul 2020 17:48:00 +0000 (13:48 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Mon, 27 Jul 2020 20:32:18 +0000 (16:32 -0400)
Use lttcomm_send_payload_view_fds_unix_sock instead of an open-coded
version of the same functionality.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I36627423287a059e8b2ab1cc5cb42ca0db53e144

src/bin/lttng-sessiond/client.c

index 1bf55f60b7f415afa81274b20af8c54bc09ef9d6..84a177b9cc814ee868168a40719ed2a02a6763f3 100644 (file)
@@ -735,32 +735,10 @@ static int send_unix_sock(int sock, struct lttng_payload_view *view)
        }
 
        if (fd_count > 0) {
-               int i;
-               struct lttng_dynamic_array raw_fds;
-
-               /*
-                * Never holds ownership of the FDs; this is just used
-                * to put the FDs in a contiguous array.
-                */
-               lttng_dynamic_array_init(&raw_fds, sizeof(int), NULL);
-
-               for (i = 0; i < fd_count; i++) {
-                       struct fd_handle *handle =
-                               lttng_payload_view_pop_fd_handle(view);
-                       const int raw_fd = fd_handle_get_fd(handle);
-
-                       ret = lttng_dynamic_array_add_element(&raw_fds, &raw_fd);
-                       fd_handle_put(handle);
-                       if (ret) {
-                               lttng_dynamic_array_reset(&raw_fds);
-                               goto end;
-                       }
+               ret = lttcomm_send_payload_view_fds_unix_sock(sock, view);
+               if (ret < 0) {
+                       goto end;
                }
-
-               ret = lttcomm_send_fds_unix_sock(sock,
-                               (const int *) raw_fds.buffer.data,
-                               fd_count);
-               lttng_dynamic_array_reset(&raw_fds);
        }
 
 end:
This page took 0.034608 seconds and 4 git commands to generate.